From bf1c9213597fd8f6a8724e0613705eb92f941f32 Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 9 Jul 2020 17:18:09 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/BabyCheckModel.java | 38 +++++++++++++-- .../operate/web/facade/BabyCheckFacade.java | 57 ++++++++++++++-------- .../platform/operate/web/facade/ViewFacade.java | 25 ++++++++++ .../operate/web/result/BabyCheckPageResult.java | 9 ++++ .../operate/web/result/BabyCheckResult.java | 10 ++-- 5 files changed, 110 insertions(+), 29 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 f1fdfec..cf99fc1 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 @@ -26,8 +26,7 @@ public class BabyCheckModel extends BaseModel { private Integer yn; private String buildId; - //其它诊断 - private List otherDiagnose; + //儿保检查时间 private Date checkDate; @@ -181,6 +180,8 @@ public class BabyCheckModel extends BaseModel { //诊断 private String diagnose; + //其它诊断 + private String otherDiagnose; //处理意见 private String handlSuggest; @@ -472,11 +473,11 @@ public class BabyCheckModel extends BaseModel { //精细运动 private String fineExercise ; - public List getOtherDiagnose() { + public String getOtherDiagnose() { return otherDiagnose; } - public void setOtherDiagnose(List otherDiagnose) { + public void setOtherDiagnose(String otherDiagnose) { this.otherDiagnose = otherDiagnose; } @@ -1945,11 +1946,11 @@ public class BabyCheckModel extends BaseModel { ", head='" + head + '\'' + ", heightWeight='" + heightWeight + '\'' + ", chestw='" + chestw + '\'' + + ", bregma='" + bregma + '\'' + ", growthEvaluate='" + growthEvaluate + '\'' + ", bilirubinHead='" + bilirubinHead + '\'' + ", bilirubinChest='" + bilirubinChest + '\'' + ", bilirubinBelly='" + bilirubinBelly + '\'' + - ", bregma='" + bregma + '\'' + ", tooth='" + tooth + '\'' + ", faceColor='" + faceColor + '\'' + ", skin='" + skin + '\'' + @@ -1978,11 +1979,15 @@ public class BabyCheckModel extends BaseModel { ", hematuria='" + hematuria + '\'' + ", otherUrine='" + otherUrine + '\'' + ", diagnose='" + diagnose + '\'' + + ", otherDiagnose='" + otherDiagnose + '\'' + ", handlSuggest='" + handlSuggest + '\'' + ", guideSuggest='" + guideSuggest + '\'' + ", checkDoctor='" + checkDoctor + '\'' + ", nextDate=" + nextDate + ", highRisk=" + highRisk + + ", highRiskInfo=" + highRiskInfo + + ", waskSon=" + waskSon + + ", waskSonInfo=" + waskSonInfo + ", modified=" + modified + ", created=" + created + ", hospitalId='" + hospitalId + '\'' + @@ -2001,6 +2006,7 @@ public class BabyCheckModel extends BaseModel { ", mtcnNum='" + mtcnNum + '\'' + ", xbNum='" + xbNum + '\'' + ", dbNum='" + dbNum + '\'' + + ", dbDayNum='" + dbDayNum + '\'' + ", qdtlTime='" + qdtlTime + '\'' + ", pfhrTime='" + pfhrTime + '\'' + ", wssAd='" + wssAd + '\'' + @@ -2066,6 +2072,28 @@ public class BabyCheckModel extends BaseModel { ", zlsc='" + zlsc + '\'' + ", qtfz='" + qtfz + '\'' + ", correctAge='" + correctAge + '\'' + + ", eyeAppearance='" + eyeAppearance + '\'' + + ", eyeRedReflex='" + eyeRedReflex + '\'' + + ", eyeDioptroscopy='" + eyeDioptroscopy + '\'' + + ", eyeAdvice='" + eyeAdvice + '\'' + + ", eyeGuideSuggestions='" + eyeGuideSuggestions + '\'' + + ", abnormalSize=" + abnormalSize + + ", okSize=" + okSize + + ", exerciseIA='" + exerciseIA + '\'' + + ", exerciseDQ='" + exerciseDQ + '\'' + + ", movementIA='" + movementIA + '\'' + + ", movementDQ='" + movementDQ + '\'' + + ", adaptationIA='" + adaptationIA + '\'' + + ", adaptationDQ='" + adaptationDQ + '\'' + + ", languageIA='" + languageIA + '\'' + + ", languageDQ='" + languageDQ + '\'' + + ", socialContactIA='" + socialContactIA + '\'' + + ", socialContactDQ='" + socialContactDQ + '\'' + + ", exercise='" + exercise + '\'' + + ", language='" + language + '\'' + + ", socialContact='" + socialContact + '\'' + + ", alotExercise='" + alotExercise + '\'' + + ", fineExercise='" + fineExercise + '\'' + '}'; } } \ No newline at end of file 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 2fc060a..cdfef56 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 @@ -114,7 +114,6 @@ public class BabyCheckFacade extends BaseServiceImpl { private BabyAfterVisitService babyAfterVisitService; public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); - public static final String NORMAL= "正常"; /** * 更新检查 * @@ -214,7 +213,6 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setEndCaseTime(new Date()); }*/ //新加字段 - model.setOtherDiagnose(request.getOtherDiagnose()); model.setCorrectAge(request.getCorrectAge()); model.setTcType(request.getTcType()); model.setCnqk(request.getCnqk()); @@ -371,6 +369,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setHematuria(request.getHematuria()); model.setOtherUrine(request.getOtherUrine()); + model.setOtherDiagnose(JsonUtil.array2JsonString(request.getOtherDiagnose())); model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose())); model.setHandlSuggest(request.getHandlSuggest()); model.setGuideSuggest(request.getGuideSuggest()); @@ -1538,7 +1537,6 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setOutcome(babyMode.getOutcome()); } } - model.setOtherDiagnose(checkModel.getOtherDiagnose()); model.setTcType(checkModel.getTcType()); model.setCnqk(checkModel.getCnqk()); model.setMtcnNum(checkModel.getMtcnNum()); @@ -1711,9 +1709,30 @@ public class BabyCheckFacade extends BaseServiceImpl { } } model.setDiagnose(list); + String otherDiagnoseStr = checkModel.getOtherDiagnose(); + if (!StringUtils.isEmpty(otherDiagnoseStr)) { + List otherDiagnoses = JsonUtil.toList(otherDiagnoseStr, List.class); + for (Object obj : otherDiagnoses) { + if (obj != null) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setId(String.valueOf(obj)); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(datas)) { + Map map = new HashMap<>(); + map.put("id", datas.get(0).getId()); + map.put("name", datas.get(0).getName()); + list.add(map); + } + } + + } + } + model.setOtherDiagnose(list); + model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); - if (StringUtils.isNotEmpty(checkModel.getCheckDoctor())) { Users users = usersService.getUsers(Integer.parseInt(checkModel.getCheckDoctor())); if (users != null) { @@ -1837,7 +1856,7 @@ public class BabyCheckFacade extends BaseServiceImpl { } else if (model.getPtwoDs() >= weight && weight > model.getPoneDs()) { res = "中+"; } else if (model.getPoneDs() >= weight && weight >= model.getRoneDs()) { - res = "中"; + res = "正常"; } else if (model.getRoneDs() > weight && weight >= model.getRtwoDs()) { res = "中-"; } else if (model.getRtwoDs() > weight && weight >= model.getRthreeDs()) { @@ -2194,15 +2213,15 @@ public class BabyCheckFacade extends BaseServiceImpl { if (model.getPthreeDs() <= value) { res = "上"; } else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) { - res = NORMAL+"上"; + res = "中上"; } else if (model.getPtwoDs() > value && value >= model.getPoneDs()) { - res = NORMAL+"+"; + res = "中+"; } else if (model.getPoneDs() > value && value > model.getRoneDs()) { res = "正常"; } else if (model.getRoneDs() >= value && value > model.getRtwoDs()) { - res = NORMAL+"-"; + res = "中-"; } else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) { - res = NORMAL+"下"; + res = "中下"; } else if (model.getRtwoDs() >= value) { res = "下"; } @@ -2234,15 +2253,15 @@ public class BabyCheckFacade extends BaseServiceImpl { if (model.getPthreeDs() < value) { res = "上"; } else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) { - res = NORMAL+"上"; + res = "中上"; } else if (model.getPtwoDs() >= value && value > model.getPoneDs()) { - res = NORMAL+"+"; + res = "中+"; } else if (model.getPoneDs() >= value && value >= model.getRoneDs()) { res = "正常"; } else if (model.getRoneDs() > value && value >= model.getRtwoDs()) { - res = NORMAL+"-"; + res = "中-"; } else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) { - res = NORMAL+"下"; + res = "中下"; } else if (model.getRtwoDs() > value) { res = "下"; } @@ -2279,15 +2298,15 @@ public class BabyCheckFacade extends BaseServiceImpl { if (model.getPthreeDs() < value) { res = "上"; } else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) { - res = NORMAL+"上"; + res = "中上"; } else if (model.getPtwoDs() >= value && value > model.getPoneDs()) { - res = NORMAL+"+"; + res = "中+"; } else if (model.getPoneDs() >= value && value >= model.getRoneDs()) { - res = NORMAL; + res = "正常"; } else if (model.getRoneDs() > value && value >= model.getRtwoDs()) { - res = NORMAL+"-"; + res = "中-"; } else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) { - res = NORMAL+"下"; + res = "中下"; } else if (model.getRtwoDs() > value) { res = "下"; } @@ -2329,7 +2348,7 @@ public class BabyCheckFacade extends BaseServiceImpl { } else if (model.getPtwoDs() >= value && value > model.getPoneDs()) { res = "中+"; } else if (model.getPoneDs() >= value && value >= model.getRoneDs()) { - res = "中"; + res = "正常"; } else if (model.getRoneDs() > value && value >= model.getRtwoDs()) { res = "中-"; } else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) { 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 d838152..5181641 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 @@ -5260,6 +5260,31 @@ public class ViewFacade { model.setBuildDiagnose(buildDiagnose); + String checkOtherDiagnose = ""; + String checkOtherDiagnoseStr = babyModel.getDiagnose(); + if (!com.lyms.platform.common.utils.StringUtils.isEmpty(checkOtherDiagnoseStr)) { + List checkOthers = JsonUtil.toList(checkOtherDiagnoseStr, List.class); + for (int i = 0; i < checkOthers.size(); i++) { + if (checkOthers.get(i) != null) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setId(String.valueOf(checkOthers.get(i))); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(datas)) { + if (i != checkOthers.size() - 1) { + checkOtherDiagnose += datas.get(0).getName() + ","; + } else { + checkOtherDiagnose += datas.get(0).getName(); + } + } + } + + } + } + model.setCheckOtherDiagnose(checkOtherDiagnose); + + //母亲是否高危 if (!com.lyms.platform.common.utils.StringUtils.isEmpty(babyModel.getMcertNo())) { 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 24eeb1e..2b98d40 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 @@ -36,6 +36,7 @@ public class BabyCheckPageResult { //建档诊断 private String buildDiagnose; + private String checkOtherDiagnose; //备注 private String remark; @@ -512,6 +513,14 @@ public class BabyCheckPageResult { private List messages; + public String getCheckOtherDiagnose() { + return checkOtherDiagnose; + } + + public void setCheckOtherDiagnose(String checkOtherDiagnose) { + this.checkOtherDiagnose = checkOtherDiagnose; + } + public List getMessages() { return messages; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 97a3918..2b1a94c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -8,8 +8,7 @@ import java.util.Map; */ public class BabyCheckResult { private String id; - //其它诊断 - private List otherDiagnose; + // 血红蛋白券 private String hemoglobinCoupon; @@ -183,7 +182,8 @@ public class BabyCheckResult { //诊断 private List> diagnose; - + //其它诊断 + private List> otherDiagnose; //处理意见 private String handlSuggest; @@ -438,11 +438,11 @@ public class BabyCheckResult { private Integer okSize; private Integer abnormalSize; - public List getOtherDiagnose() { + public List> getOtherDiagnose() { return otherDiagnose; } - public void setOtherDiagnose(List otherDiagnose) { + public void setOtherDiagnose(List> otherDiagnose) { this.otherDiagnose = otherDiagnose; } -- 1.8.3.1