diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index ca0ad51..7821bd8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -658,7 +658,7 @@ public class BabyBookbuildingFacade { bm.setBabyWeight(b.getBabyWeight()); bm.setHospitalId(b.getHospitalId()); - bm.setHighRisk(b.getHighRisk()); + //bm.setHighRiskReason(b.getHighRiskReason()); bm.setExpVip(b.getExpVip()); bm.setMremark(b.getMremark()); @@ -689,8 +689,16 @@ public class BabyBookbuildingFacade { bm.setHospitalId(b.getHospitalId()); bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); + if (b.getHighRisk() == null) { + bm.setLastHighRisk(0); + bm.setHighRisk(0); + } + else + { + bm.setLastHighRisk(b.getHighRisk()); + bm.setHighRisk(b.getHighRisk()); + } - bm.setLastHighRisk(b.getHighRisk()); return bm; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index e2cb62b..0b0989a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -160,12 +160,18 @@ public class BabyCheckFacade { model.setGuideSuggest(request.getGuideSuggest()); model.setCheckDoctor(request.getCheckDoctor()); model.setNextDate(DateUtil.parseYMD(request.getNextDate())); - model.setHighRisk(request.getHighRisk()); - model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic())); - model.setChestw(request.getChestw()); + if (request.getHighRisk() == null){ + model.setHighRisk(0); + } + else + { + model.setHighRisk(request.getHighRisk()); + } + model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic())); + model.setChestw(request.getChestw()); model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));