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 af07ecb..5bc2171 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 @@ -7951,7 +7951,8 @@ public class ViewFacade { //产检基本信息 - map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); + map.put("userName", patients.getUsername()); + map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); map.put("checkWeek", DateUtil.getWeekDesc(patients.getLastMenses(),data.getCheckDate())); // 血压 String ssy = ""; @@ -7961,7 +7962,7 @@ public class ViewFacade { ssy = chBpMap.get("ssy"); szy = chBpMap.get("szy"); } - map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); + map.put("bp", ssy + "/" + szy); map.put("weight", data.getWeight()); map.put("urineProtein", data.getUrineProtein()); //尿蛋白 map.put("hemoglobin", data.getHemoglobin()); //血红蛋白 @@ -7982,7 +7983,7 @@ public class ViewFacade { gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()); } } else if (StringUtils.isNotEmpty(data.getGongGao())) { - gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM); + gongGao = data.getGongGao() ==null ? "" : data.getGongGao(); } map.put("gf", gongGao+(data.getAbdominalCircumference() == null ? "" : "/"+data.getAbdominalCircumference())); @@ -7995,8 +7996,8 @@ public class ViewFacade { Map tire = (Map) temp; if (tire != null) { heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate")); - fetalPosition = tire.get("fetalPosition") == null ? "" : String.valueOf(tire.get("fetalPosition")); - fetalPresentation = tire.get("fetalPresentation") == null ? "" : String.valueOf(tire.get("fetalPresentation")); + fetalPosition = tire.get("fetalPosition") == null ? "" : FetalPositionEnums.getTitle(String.valueOf(tire.get("fetalPosition"))); + fetalPresentation = tire.get("fetalPresentation") == null ? "" : FetalEnums.getTitle(String.valueOf(tire.get("fetalPresentation"))); } } }