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 d2dfbb6..99a085d 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 @@ -1138,7 +1138,7 @@ public class ViewFacade { map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI)); map.put("phone",patients.getPhone()); - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek())); + map.put("fmWeek",checkWeek(patients)); map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark",patients.getMremark()); //高危因素 @@ -1148,7 +1148,7 @@ public class ViewFacade { } map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); - map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); /* 复查信息 */ map.put("checkTime",DateUtil.getyyyy_MM_dd(data.getCheckTime())); map.put("day",data.getDay()); @@ -1271,7 +1271,7 @@ public class ViewFacade { map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI)); map.put("phone",patients.getPhone()); - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek())); + map.put("fmWeek",checkWeek(patients)); map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark",patients.getMremark()); //高危因素 @@ -1280,9 +1280,15 @@ public class ViewFacade { highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(),true,basicConfigService); } map.put("riskFactor",ResolveUtils.queryHighRisk(highScoreResult)); - map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); + map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(data.getLeaveHospitalDate())); - map.put("afterMakeBabyDays", data.getAfterMakeBabyDays()==null?"":"产后"+data.getAfterMakeBabyDays()+"天"); + + String afterMakeBabyDays = ""; + if (patients.getFmDate()!=null && data.getLeaveHospitalDate() != null){ + afterMakeBabyDays = "产后" + DateUtil.daysBetween(patients.getFmDate(), data.getLeaveHospitalDate()) + "天"; + } + map.put("afterMakeBabyDays", afterMakeBabyDays); String inputMan = ""; if (StringUtils.isNotEmpty(data.getInputMan()) && FunvCommonUtil.isNumeric(data.getInputMan())){ Users users = usersService.getUsers(Integer.parseInt(data.getInputMan()));