clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:aaeffe52ee13ff908ef4bf6aa5f99ca73265080b
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
..
compare: clinic-v2:301a93d226828782942dab6de53dcb62835f8482
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

No commits in common. "aaeffe52ee13ff908ef4bf6aa5f99ca73265080b" and "301a93d226828782942dab6de53dcb62835f8482" have entirely different histories.
aaeffe52ee ... 301a93d226

5 changed files with 23 additions and 23 deletions
Show Stats Expand all files Collapse all files

4
src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java
View File

@ -82,7 +82,7 @@ public class SocialDirectoryController extends BaseController {
}
@ApiOperation("下载目录")
@RequestMapping("download")
@PostMapping("download")
public Result<Object> download() {
Map<String, Object> parms = getParms();
String ver = (String) parms.get("ver");
@ -178,7 +178,7 @@ public class SocialDirectoryController extends BaseController {
}
@ApiOperation("同步到MongoDB")
@RequestMapping("syncToMongo")
@PostMapping("syncToMongo")
public Result<Object> syncToMongo() {
return success(socialDirectoryService.syncSocialDirectoryCache(parmsUtil.getInteger("page","请输入page")));
}

6
src/main/java/com/syjiaer/clinic/server/entity/item/Item.java
View File

@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author NiuZiYuan
* @since 2025-05-29
* @since 2025-05-21
*/
@Getter
@Setter
@ -45,10 +45,10 @@ public class Item implements Serializable {
private String updateBy;
@ApiModelProperty("项目名称")
private String name;
private String itemName;
@ApiModelProperty("项目医保目录编码")
private String socialCode;
private String itemSocialCode;
@ApiModelProperty("单位")
private String unit;

4
src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java
View File

@ -166,8 +166,8 @@ public class DiagnosisService extends BaseService {
DiagnosisMedicalItemList itemDetail = new DiagnosisMedicalItemList();
itemDetail.setDiagnosisCode(code);
itemDetail.setItemId(item.getId());
itemDetail.setName(dbItem.getName());
itemDetail.setSocialCode(dbItem.getSocialCode());
itemDetail.setName(dbItem.getItemName());
itemDetail.setSocialCode(dbItem.getItemSocialCode());
itemDetail.setUnit(dbItem.getUnit());
itemDetail.setUnitPrice(dbItem.getUnitPrice());
if (item.getSelectedNum() == null || item.getSelectedNum() <= 0) {

4
src/main/java/com/syjiaer/clinic/server/service/item/ItemGroupService.java
View File

@ -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.getName());
jsonObject.put("name", item.getItemName());
jsonObject.put("unit", item.getUnit());
jsonObject.put("itemSocialCode", item.getSocialCode());
jsonObject.put("itemSocialCode", item.getItemSocialCode());
jsonObject.put("unitPrice", item.getUnitPrice());
jsonObject.put("purchaseUnitPrice", item.getPurchaseUnitPrice());
unitPrice = unitPrice.add(item.getUnitPrice());

28
src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java
View File

@ -94,10 +94,10 @@ public class ItemService extends BaseService {
if (item == null) {
throw new MessageException("item参数为空");
}
if (item.getName() == null || item.getName().isEmpty()) {
if (item.getItemName() == null || item.getItemName().isEmpty()) {
throw new MessageException("项目名称不能为空");
}
if (item.getSocialCode() == null || item.getSocialCode().isEmpty()) {
if (item.getItemSocialCode() == null || item.getItemSocialCode().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.getName());
String pinyin_full = PinYinUtil.getPinyinFull(item.getItemName());
pinyin_full = pinyin_full.toUpperCase();
item.setPinyinFull(pinyin_full);
item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase());
item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getItemName()).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("name", upperKeyword);
queryWrapper.like("item_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.getSocialCode());
SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(item.getItemSocialCode());
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.getName() == null || item.getName().isEmpty()) {
if (item.getItemName() == null || item.getItemName().isEmpty()) {
throw new MessageException("项目名称不能为空");
}
if (item.getSocialCode() == null || item.getSocialCode().isEmpty()) {
if (item.getItemSocialCode() == null || item.getItemSocialCode().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.getName());
String pinyin_full = PinYinUtil.getPinyinFull(item.getItemName());
pinyin_full = pinyin_full.toUpperCase();
item.setPinyinFull(pinyin_full);
item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase());
item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getItemName()).toUpperCase());
itemMapper.updateById(item);
}
@ -232,17 +232,17 @@ public class ItemService extends BaseService {
if(itemInfo==null){
itemInfo=new Item();
}
itemInfo.setName(itemParam.getName());
itemInfo.setItemName(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.getName());
String pinyinFull = PinYinUtil.getPinyinFull(itemInfo.getItemName());
pinyinFull = pinyinFull.toUpperCase();
itemInfo.setPinyinFull(pinyinFull);
itemInfo.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(itemInfo.getName()).toUpperCase());
itemInfo.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(itemInfo.getItemName()).toUpperCase());
itemInfo.setIsGroup(true);
if(itemInfo.getId()!= null && itemInfo.getId()>0){
UpdateWrapper<ItemGroupList> updateWrapper = new UpdateWrapper<>();
@ -338,7 +338,7 @@ public class ItemService extends BaseService {
//设置结果json中info字段
HashMap<String,Object> infoMap = new HashMap<>();
infoMap.put("name",itemInfo.getName());
infoMap.put("name",itemInfo.getItemName());
infoMap.put("unit",itemInfo.getUnit());
infoMap.put("id",itemInfo.getId());
resultMap.put("info",infoMap);