From 0bb804549e56b71159e3e109f251da7ec74c6c06 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 16 Jul 2021 14:41:07 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/BabyCheckModel.java | 10 ++++++++ .../java/com/lyms/platform/pojo/BasicConfig.java | 11 +++++++++ .../operate/web/facade/BabyCheckFacade.java | 28 ++++++++++++++++++++++ .../operate/web/facade/BasicConfigFacade.java | 1 + .../platform/operate/web/facade/ViewFacade.java | 11 +++++++++ .../operate/web/request/BasicConfigAddRequest.java | 11 +++++++++ .../web/request/BasicConfigUpdateRequest.java | 10 ++++++++ .../operate/web/result/BabyCheckPageResult.java | 8 +++++++ .../operate/web/result/BasicConfigResult.java | 10 ++++++++ .../web/service/impl/TrackDownServiceImpl.java | 4 ++-- 10 files changed, 102 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 06c6e8d..b3c8879 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -211,6 +211,8 @@ public class BabyCheckModel extends BaseModel { //诊断 private String diagnose; + //诊断等级 + private List diagnoseLevel; //其它诊断 private String otherDiagnose; @@ -532,6 +534,14 @@ public class BabyCheckModel extends BaseModel { //髋关节 右 private String yhipJoint; + public List getDiagnoseLevel() { + return diagnoseLevel; + } + + public void setDiagnoseLevel(List diagnoseLevel) { + this.diagnoseLevel = diagnoseLevel; + } + public String getZhipJoint() { return zhipJoint; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index c2d0899..64bb332 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -46,6 +46,17 @@ public class BasicConfig extends BaseModel { private Integer type; + + private String level; + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + public Integer getType() { return type; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 0275a58..3f9c6a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -474,6 +474,12 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setOtherDiagnose(JsonUtil.array2JsonString(request.getOtherDiagnose())); model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose())); + + if (CollectionUtils.isNotEmpty(request.getDiagnose())) + { + model.setDiagnoseLevel(getBabyDiagnoseLevel(request.getDiagnose())); + } + model.setHandlSuggest(request.getHandlSuggest()); model.setGuideSuggest(request.getGuideSuggest()); model.setCheckDoctor(request.getCheckDoctor()); @@ -572,6 +578,26 @@ public class BabyCheckFacade extends BaseServiceImpl { return model; } + + public List getBabyDiagnoseLevel(List diagnoses) + { + if (CollectionUtils.isNotEmpty(diagnoses)) + { + List list = new ArrayList<>(); + + for (String dia : diagnoses) + { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(dia); + if (basicConfig != null && StringUtils.isNotEmpty(basicConfig.getLevel())) + { + list.add(basicConfig.getLevel()); + } + } + } + return null; + } + + /** * 添加儿保检查 * @@ -2108,6 +2134,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Map map = new HashMap <>(); map.put("id", datas.get(0).getId()); map.put("name", datas.get(0).getName()); + map.put("level", datas.get(0).getLevel()); list.add(map); } else if (CollectionUtils.isEmpty(datas)) {//秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容 BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); @@ -2118,6 +2145,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Map map = new HashMap <>(); map.put("id", datas2.get(0).getId()); map.put("name", datas2.get(0).getName()); + map.put("level", datas2.get(0).getLevel()); list.add(map); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 6e21f63..b5f2c30 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -243,6 +243,7 @@ public class BasicConfigFacade { obj.setTypeId(basicConfigUpdateRequest.getTypeId()); obj.setScore(basicConfigUpdateRequest.getScore()); obj.setDescribe(basicConfigUpdateRequest.getDesc()); + obj.setLevel(basicConfigUpdateRequest.getLevel()); BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setId(basicConfigUpdateRequest.getId()); basicConfigQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 698eb58..e3c0a82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6121,10 +6121,14 @@ public class ViewFacade { model.setOtherUrine(checkModel.getOtherUrine()); String diagnoseStr = checkModel.getDiagnose(); String diagnoseValue = ""; + List diagnoseList = new ArrayList<>(); if (!com.lyms.platform.common.utils.StringUtils.isEmpty(diagnoseStr)) { List diagnoses = JsonUtil.toList(diagnoseStr, List.class); for (int i = 0; i < diagnoses.size(); i++) { if (diagnoses.get(i) != null) { + + Map data = new HashMap(); + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); @@ -6136,6 +6140,9 @@ public class ViewFacade { } else { diagnoseValue += datas.get(0).getName(); } + data.put("name",datas.get(0).getName()); + data.put("level",datas.get(0).getLevel()); + diagnoseList.add(data); } else if (CollectionUtils.isEmpty(datas)) { BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery(); basicConfigQuery2.setYn(YnEnums.YES.getId()); @@ -6147,6 +6154,9 @@ public class ViewFacade { } else { diagnoseValue += datas2.get(0).getName(); } + data.put("name",datas2.get(0).getName()); + data.put("level",datas2.get(0).getLevel()); + diagnoseList.add(data); } } } @@ -6154,6 +6164,7 @@ public class ViewFacade { } } model.setCheckDiagnose(diagnoseValue); + model.setCheckDiagnoseLevel(diagnoseList); model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java index c64aac1..56c3e00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java @@ -24,6 +24,16 @@ public class BasicConfigAddRequest implements IBasicRequestConvert{ private Integer score; private String describe; + private String level; + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + public Integer getWeight() { return weight; } @@ -101,6 +111,7 @@ public class BasicConfigAddRequest implements IBasicRequestConvert{ basicConfig.setParentId(parentId); basicConfig.setYn(YnEnums.YES.getId()); basicConfig.setEnable(1); + basicConfig.setLevel(level); return basicConfig; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java index 316cd9a..73b001b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java @@ -19,10 +19,20 @@ public class BasicConfigUpdateRequest { private String leastUse; + private String level; + //权重 private Integer weight; private List childConfigs; + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + public String getLeastUse() { return leastUse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 5b1c2c8..6d8c81d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -414,6 +414,7 @@ public class BabyCheckPageResult { //检查诊断 private String checkDiagnose; + private List checkDiagnoseLevel; //处理意见 private String handlSuggest; @@ -702,6 +703,13 @@ public class BabyCheckPageResult { //髋关节 右 private String yhipJoint; + public List getCheckDiagnoseLevel() { + return checkDiagnoseLevel; + } + + public void setCheckDiagnoseLevel(List checkDiagnoseLevel) { + this.checkDiagnoseLevel = checkDiagnoseLevel; + } public String getZhipJoint() { return zhipJoint; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java index c5bcca9..f184dcc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java @@ -14,11 +14,20 @@ public class BasicConfigResult implements IBasicResultConvert basicConfigs = new ArrayList<>(); public List getBasicConfigs() { @@ -114,6 +123,7 @@ public class BasicConfigResult implements IBasicResultConvert examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()). -- 1.8.3.1