From 2d6893148a45f08dae4a838fba6c5339cae7a4c4 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Thu, 29 May 2025 10:34:51 +0800 Subject: [PATCH] dev --- .../social/SocialDirectoryController.java | 4 +-- .../clinic/server/entity/item/Item.java | 6 ++-- .../service/diagnosis/DiagnosisService.java | 4 +-- .../server/service/item/ItemGroupService.java | 4 +-- .../server/service/item/ItemService.java | 28 +++++++++---------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index a8b44cd..892d959 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java @@ -82,7 +82,7 @@ public class SocialDirectoryController extends BaseController { } @ApiOperation("下载目录") - @PostMapping("download") + @RequestMapping("download") public Result download() { Map parms = getParms(); String ver = (String) parms.get("ver"); @@ -178,7 +178,7 @@ public class SocialDirectoryController extends BaseController { } @ApiOperation("同步到MongoDB") - @PostMapping("syncToMongo") + @RequestMapping("syncToMongo") public Result syncToMongo() { return success(socialDirectoryService.syncSocialDirectoryCache(parmsUtil.getInteger("page","请输入page"))); } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java b/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java index 891becf..a6fd643 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; *

* * @author NiuZiYuan - * @since 2025-05-21 + * @since 2025-05-29 */ @Getter @Setter @@ -45,10 +45,10 @@ public class Item implements Serializable { private String updateBy; @ApiModelProperty("项目名称") - private String itemName; + private String name; @ApiModelProperty("项目医保目录编码") - private String itemSocialCode; + private String socialCode; @ApiModelProperty("单位") private String unit; diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java index c248a4a..7bbe8f7 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java @@ -166,8 +166,8 @@ public class DiagnosisService extends BaseService { DiagnosisMedicalItemList itemDetail = new DiagnosisMedicalItemList(); itemDetail.setDiagnosisCode(code); itemDetail.setItemId(item.getId()); - itemDetail.setName(dbItem.getItemName()); - itemDetail.setSocialCode(dbItem.getItemSocialCode()); + itemDetail.setName(dbItem.getName()); + itemDetail.setSocialCode(dbItem.getSocialCode()); itemDetail.setUnit(dbItem.getUnit()); itemDetail.setUnitPrice(dbItem.getUnitPrice()); if (item.getSelectedNum() == null || item.getSelectedNum() <= 0) { diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java index aa7aa95..c4a0c5f 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java @@ -93,9 +93,9 @@ public class ItemGroupService extends BaseService { for (Item item : list) { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", item.getId()); - jsonObject.put("name", item.getItemName()); + jsonObject.put("name", item.getName()); jsonObject.put("unit", item.getUnit()); - jsonObject.put("itemSocialCode", item.getItemSocialCode()); + jsonObject.put("itemSocialCode", item.getSocialCode()); jsonObject.put("unitPrice", item.getUnitPrice()); jsonObject.put("purchaseUnitPrice", item.getPurchaseUnitPrice()); unitPrice = unitPrice.add(item.getUnitPrice()); diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java index 6f19a57..6e19098 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java @@ -94,10 +94,10 @@ public class ItemService extends BaseService { if (item == null) { throw new MessageException("item参数为空"); } - if (item.getItemName() == null || item.getItemName().isEmpty()) { + if (item.getName() == null || item.getName().isEmpty()) { throw new MessageException("项目名称不能为空"); } - if (item.getItemSocialCode() == null || item.getItemSocialCode().isEmpty()) { + if (item.getSocialCode() == null || item.getSocialCode().isEmpty()) { throw new MessageException("项目医保目录编码不能为空"); } if (item.getUnit() == null || item.getUnit().isEmpty()) { @@ -109,10 +109,10 @@ public class ItemService extends BaseService { ManagerUser managerUser = getManagerUser(); item.setCreateDatetime(LocalDateTime.now()); item.setCreateBy(managerUser.getName()); - String pinyin_full = PinYinUtil.getPinyinFull(item.getItemName()); + String pinyin_full = PinYinUtil.getPinyinFull(item.getName()); pinyin_full = pinyin_full.toUpperCase(); item.setPinyinFull(pinyin_full); - item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getItemName()).toUpperCase()); + item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase()); itemMapper.insertOrUpdate(item); } @@ -139,7 +139,7 @@ public class ItemService extends BaseService { queryWrapper.eq("del_flag", 0); if (keyword != null && !keyword.isEmpty()) { String upperKeyword = keyword.toUpperCase(); - queryWrapper.like("item_name", upperKeyword); + queryWrapper.like("name", upperKeyword); queryWrapper.or().like("pinyin_full", upperKeyword); queryWrapper.or().like("pinyin_first", upperKeyword); @@ -151,7 +151,7 @@ public class ItemService extends BaseService { for (Item item : items) { ItemSearchVo itemSearchVo = new ItemSearchVo(); BeanUtils.copyProperties(item, itemSearchVo); - SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(item.getItemSocialCode()); + SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(item.getSocialCode()); if (socialDirectoryUpinfo != null) { ChrgitmLvEnum chrgitmLvEnum = ChrgitmLvEnum.getChrgitmLvEnumByCode(socialDirectoryUpinfo.getChrgitmLv()); itemSearchVo.setChrgitmLv(chrgitmLvEnum == null ? null : chrgitmLvEnum.getName()); @@ -169,10 +169,10 @@ public class ItemService extends BaseService { if (item == null) { throw new MessageException("item参数为空"); } - if (item.getItemName() == null || item.getItemName().isEmpty()) { + if (item.getName() == null || item.getName().isEmpty()) { throw new MessageException("项目名称不能为空"); } - if (item.getItemSocialCode() == null || item.getItemSocialCode().isEmpty()) { + if (item.getSocialCode() == null || item.getSocialCode().isEmpty()) { throw new MessageException("项目医保目录编码不能为空"); } if (item.getUnit() == null || item.getUnit().isEmpty()) { @@ -183,10 +183,10 @@ public class ItemService extends BaseService { } item.setUpdateBy(getManagerUser().getName()); item.setUpdateDatetime(LocalDateTime.now()); - String pinyin_full = PinYinUtil.getPinyinFull(item.getItemName()); + String pinyin_full = PinYinUtil.getPinyinFull(item.getName()); pinyin_full = pinyin_full.toUpperCase(); item.setPinyinFull(pinyin_full); - item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getItemName()).toUpperCase()); + item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase()); itemMapper.updateById(item); } @@ -232,17 +232,17 @@ public class ItemService extends BaseService { if(itemInfo==null){ itemInfo=new Item(); } - itemInfo.setItemName(itemParam.getName()); + itemInfo.setName(itemParam.getName()); itemInfo.setUnit(itemParam.getUnit()); itemInfo.setIsGroup(true); itemInfo.setPurchaseUnitPrice(new BigDecimal(0)); itemInfo.setUnitPrice(new BigDecimal(0)); itemInfo.setCreateDatetime(LocalDateTime.now()); itemInfo.setCreateBy(managerUser.getName()); - String pinyinFull = PinYinUtil.getPinyinFull(itemInfo.getItemName()); + String pinyinFull = PinYinUtil.getPinyinFull(itemInfo.getName()); pinyinFull = pinyinFull.toUpperCase(); itemInfo.setPinyinFull(pinyinFull); - itemInfo.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(itemInfo.getItemName()).toUpperCase()); + itemInfo.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(itemInfo.getName()).toUpperCase()); itemInfo.setIsGroup(true); if(itemInfo.getId()!= null && itemInfo.getId()>0){ UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -338,7 +338,7 @@ public class ItemService extends BaseService { //设置结果json中info字段 HashMap infoMap = new HashMap<>(); - infoMap.put("name",itemInfo.getItemName()); + infoMap.put("name",itemInfo.getName()); infoMap.put("unit",itemInfo.getUnit()); infoMap.put("id",itemInfo.getId()); resultMap.put("info",infoMap);