From ee90b85c0c931d9e55383b8a2be3a375a7db518e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 21 Nov 2021 19:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=AF=8D=E4=BA=B2=E9=AB=98?= =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyCheckFacade.java | 17 +++++++++-------- .../platform/operate/web/facade/MatDeliverFacade.java | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) 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 4aff5ad..2b8a0ac 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 @@ -1553,14 +1553,14 @@ public class BabyCheckFacade extends BaseServiceImpl { base.setHighRiskInfo(highRiskInfos);//儿童高危详情 } - if(CollectionUtils.isNotEmpty(model.getWeakSonInfo())){ - List weakSonInfos = basicConfigFacade.queryBaseInfoByMap(model.getWeakSonInfo()); - for (Map w : weakSonInfos) { - w.put("color", "risk_yellow"); - } - base.setWeakSonInfo(weakSonInfos);//体弱儿详情 - } - base.setWeakSon(model.getWeakSon()); +// if(CollectionUtils.isNotEmpty(model.getWeakSonInfo())){ +// List weakSonInfos = basicConfigFacade.queryBaseInfoByMap(model.getWeakSonInfo()); +// for (Map w : weakSonInfos) { +// w.put("color", "risk_yellow"); +// } +// base.setWeakSonInfo(weakSonInfos);//体弱儿详情 +// } +// base.setWeakSon(model.getWeakSon()); base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid())); base.setId(id); base.setSex(model.getSex()); @@ -1682,6 +1682,7 @@ public class BabyCheckFacade extends BaseServiceImpl { } else { base.setHighRisk(""); } + base.setHighRisk("sss"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 2098b11..17d6838 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -828,6 +828,10 @@ public class MatDeliverFacade { private BabyModel fillBaby(Patients patients, MatDeliverAddRequest deliverAddRequest) { BabyModel babyModel = new BabyModel(); if (null != patients) { + + //设置母亲高危因素到儿童档案 + babyModel.setmHighRiskReason(patients.getRiskFactorId()); + babyModel.setAreaId(patients.getAreaId()); babyModel.setProvinceId(patients.getProvinceId()); babyModel.setCityId(patients.getCityId()); -- 1.8.3.1