jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 63992a3017f5dfbaf96bab7b081519cec52124cd

Authored by jiangjiazhi
2 parents 5f308597b9 67491cd7c8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 63992a3
... ... @@ -1138,7 +1138,7 @@
1138 1138 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
1139 1139 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
1140 1140 map.put("phone",patients.getPhone());
1141   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  1141 + map.put("fmWeek",checkWeek(patients));
1142 1142 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1143 1143 map.put("mremark",patients.getMremark());
1144 1144 //高危因素
... ... @@ -1148,7 +1148,7 @@
1148 1148 }
1149 1149  
1150 1150 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
1151   - map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  1151 + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
1152 1152 /* 复查信息 */
1153 1153 map.put("checkTime",DateUtil.getyyyy_MM_dd(data.getCheckTime()));
1154 1154 map.put("day",data.getDay());
... ... @@ -1271,7 +1271,7 @@
1271 1271 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
1272 1272 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
1273 1273 map.put("phone",patients.getPhone());
1274   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  1274 + map.put("fmWeek",checkWeek(patients));
1275 1275 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1276 1276 map.put("mremark",patients.getMremark());
1277 1277 //高危因素
1278 1278  
... ... @@ -1280,9 +1280,15 @@
1280 1280 highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(),true,basicConfigService);
1281 1281 }
1282 1282 map.put("riskFactor",ResolveUtils.queryHighRisk(highScoreResult));
1283   - map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  1283 + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  1284 +
1284 1285 map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(data.getLeaveHospitalDate()));
1285   - map.put("afterMakeBabyDays", data.getAfterMakeBabyDays()==null?"":"产后"+data.getAfterMakeBabyDays()+"天");
  1286 +
  1287 + String afterMakeBabyDays = "";
  1288 + if (patients.getFmDate()!=null && data.getLeaveHospitalDate() != null){
  1289 + afterMakeBabyDays = "产后" + DateUtil.daysBetween(patients.getFmDate(), data.getLeaveHospitalDate()) + "天";
  1290 + }
  1291 + map.put("afterMakeBabyDays", afterMakeBabyDays);
1286 1292 String inputMan = "";
1287 1293 if (StringUtils.isNotEmpty(data.getInputMan()) && FunvCommonUtil.isNumeric(data.getInputMan())){
1288 1294 Users users = usersService.getUsers(Integer.parseInt(data.getInputMan()));