jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5049aa15d679cefe519c3892c13933c344b5a835

Authored by yangfei
1 parent 2a3ed7ef7c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

健康管理模块列表高危因素显示自定义高危bug修改

Showing 4 changed files with 34 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java View file @ 5049aa1
... ... @@ -191,7 +191,16 @@
191 191 data.put("certeTypeId", patients.getPcerteTypeId());
192 192 data.put("status", null == tmp.getNow() ? "" : getTempStatus(Double.valueOf(tmp.getNow())));
193 193 data.put("level", commonService.findRiskLevel(patients.getRiskLevelId()));
194   - data.put("rFactor", commonService.resloveFactor(patients.getRiskFactorId()));
  194 + String rFactor = commonService.resloveFactor(patients.getRiskFactorId());
  195 + if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor()))
  196 + {
  197 + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)){
  198 + rFactor+=","+patients.getoRiskFactor();
  199 + }else{
  200 + rFactor = patients.getoRiskFactor();
  201 + }
  202 + }
  203 + data.put("rFactor", rFactor); // 高危因素
195 204 data.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
196 205 dataList.add(data);
197 206 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 5049aa1
... ... @@ -392,6 +392,8 @@
392 392 examinationModel.setRiskScore(riskScore);
393 393 if(CollectionUtils.isNotEmpty(otherRisk)){
394 394 examinationModel.setOtherRisk(JsonUtil.array2JsonString(otherRisk));
  395 + }else{
  396 + examinationModel.setOtherRisk("{}");
395 397 }
396 398 if(null!=diagnosis){
397 399 examinationModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 5049aa1
... ... @@ -148,7 +148,18 @@
148 148 temp.put("age", DateUtil.getAge(p.getBirth()));
149 149 temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
150 150 temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
151   - temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
  151 +
  152 + String rFactor = commonService.resloveFactor(p.getRiskFactorId());
  153 + if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor()))
  154 + {
  155 + if(StringUtils.isNotEmpty(rFactor)){
  156 + rFactor+=","+p.getoRiskFactor();
  157 + }else{
  158 + rFactor = p.getoRiskFactor();
  159 + }
  160 + }
  161 + temp.put("riskFactor", rFactor); // 高危因素
  162 +
152 163 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
153 164 temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg");
154 165 temp.put("pulse", bloodPressure.getPulse());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 5049aa1
... ... @@ -102,7 +102,16 @@
102 102 temp.put("age", DateUtil.getAge(p.getBirth()));
103 103 temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
104 104 temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
105   - temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
  105 + String rFactor = commonService.resloveFactor(p.getRiskFactorId());
  106 + if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor()))
  107 + {
  108 + if(StringUtils.isNotEmpty(rFactor)){
  109 + rFactor+=","+p.getoRiskFactor();
  110 + }else{
  111 + rFactor = p.getoRiskFactor();
  112 + }
  113 + }
  114 + temp.put("riskFactor", rFactor); // 高危因素
106 115 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
107 116 temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L");
108 117 temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));