diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 1dc3970..c7b5be6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1645,7 +1645,8 @@ public class AntExRecordFacade { * @param doctorId * @return */ - public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid, String hospitalId, String nextTime, String doctorId) { + public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid, + String hospitalId, String nextTime, String doctorId) { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); boolean falg = true; if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { @@ -1812,6 +1813,7 @@ public class AntExRecordFacade { yumInfosMap.put("fuh", fuh); yumInfosMap.put("abdominalGirth", abdominalGirth); yumInfosMap.put("fhr", fhr); + yumInfosMap.put("edema", edema); yumInfosMap.put("nextTime", nextTime); WxMeasureInfoModel wxMeasure = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("1")), WxMeasureInfoModel.class); if (null == wxMeasure) { @@ -1842,6 +1844,9 @@ public class AntExRecordFacade { if (null == yumInfosMap.get("fhr") || "" == yumInfosMap.get("fhr")) { yumInfosMap.put("fhr", map.get("fhr")); } + if (null == yumInfosMap.get("edema") || "" == yumInfosMap.get("edema")) { + yumInfosMap.put("edema", map.get("edema")); + } if (null == yumInfosMap.get("nextTime") || "" == yumInfosMap.get("nextTime")) { yumInfosMap.put("nextTime", map.get("nextTime")); } 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 1838927..52f4c9d 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 @@ -2738,10 +2738,17 @@ public class ViewFacade { map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM)); // 宫高 map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM));//腹围 String edema = ""; - if (StringUtils.isNotEmpty(data.getEdema())) { - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { - if (data.getEdema().equals(fuZhongEnums.getId())) { - edema = fuZhongEnums.getName(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) { + if (Integer.parseInt(data.getEdema()) > 3) + { + edema = "4".equals(data.getEdema()) ? "有" : "无"; + } + else + { + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { + if (data.getEdema().equals(fuZhongEnums.getId())) { + edema = fuZhongEnums.getName(); + } } } } @@ -3157,9 +3164,16 @@ public class ViewFacade { map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM)); String edema = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) { - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { - if (data.getEdema().equals(fuZhongEnums.getId())) { - edema = fuZhongEnums.getName(); + if (Integer.parseInt(data.getEdema()) > 3) + { + edema = "4".equals(data.getEdema()) ? "有" : "无"; + } + else + { + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { + if (data.getEdema().equals(fuZhongEnums.getId())) { + edema = fuZhongEnums.getName(); + } } } } @@ -3458,10 +3472,17 @@ public class ViewFacade { map.put("gongGao", gongGao);//宫高 map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));//腹围 String edema = ""; - if (StringUtils.isNotEmpty(data.getEdema())) { - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { - if (data.getEdema().equals(fuZhongEnums.getId())) { - edema = fuZhongEnums.getName(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) { + if (Integer.parseInt(data.getEdema()) > 3) + { + edema = "4".equals(data.getEdema()) ? "有" : "无"; + } + else + { + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { + if (data.getEdema().equals(fuZhongEnums.getId())) { + edema = fuZhongEnums.getName(); + } } } } @@ -8384,10 +8405,17 @@ public class ViewFacade { map.put("urineProtein", data.getUrineProtein()); //尿蛋白 map.put("hemoglobin", data.getHemoglobin()); //血红蛋白 String edema = ""; - if (StringUtils.isNotEmpty(data.getEdema())) { - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { - if (data.getEdema().equals(fuZhongEnums.getId())) { - edema = fuZhongEnums.getName(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) { + if (Integer.parseInt(data.getEdema()) > 3) + { + edema = "4".equals(data.getEdema()) ? "有" : "无"; + } + else + { + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { + if (data.getEdema().equals(fuZhongEnums.getId())) { + edema = fuZhongEnums.getName(); + } } } }