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 fa9344a..004ca0c 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 @@ -942,7 +942,7 @@ public class BabyBookbuildingFacade { public synchronized void setRiskCode(BabyModel model) { //高危儿童才设置编号 - if (model.getHighRisk() != null && model.getHighRisk() == 1) + if ("216".equals(model.getHospitalId()) && model.getHighRisk() != null && model.getHighRisk() == 1) { Long result = Long.valueOf(DateUtil.getYearStr()+"1"); BabyModelQuery babyQuery = new BabyModelQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index b453fb9..6fb79df 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -17,10 +17,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.DischargeAbstractBabyQuery; -import com.lyms.platform.query.DischargeAbstractMotherQuery; -import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +50,8 @@ public class DischargeAbstractFacade extends BaseServiceImpl { @Autowired private AutoMatchFacade autoMatchFacade; - + @Autowired + private BasicConfigService basicConfigService; @Autowired private BabyService babyService; @@ -77,8 +75,22 @@ public class DischargeAbstractFacade extends BaseServiceImpl { @Autowired private MongoTemplate mongoTemplate; - @Autowired - private OrganizationGroupsFacade groupsFacade; + static Map datas = new HashMap<>(); + static { + datas.put("zce",""); + datas.put("zdyybl",""); + datas.put("xzb",""); + datas.put("hxdgr",""); + datas.put("dcstze",""); + datas.put("gl",""); + datas.put("xsedxt",""); + datas.put("zdpx",""); + datas.put("fp",""); + datas.put("zx",""); + datas.put("qt",""); + } + + public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest, Integer userId) { @@ -250,9 +262,66 @@ public class DischargeAbstractFacade extends BaseServiceImpl { } + if(babyModel.getHighRisk() == null && dabm.getIsHighRisk() != null){ //是否是高危儿童 + if ("yes".equals(dabm.getIsHighRisk())) + { + babyModel.setHighRisk(1); + if (dabm.getHighRiskResult() != null && dabm.getHighRiskResult().size() > 0) + { + Map riskMap = dabm.getHighRiskResult(); + babyModel.setHighRiskInfo(getRiskId(riskMap)); + } + } + else if ("no".equals(dabm.getIsHighRisk())) + { + babyModel.setHighRisk(0); + } + } + + return babyModel; } + + private List getRiskId(Map riskMap) + { + List risks = new ArrayList<>(); + for (String key : datas.keySet()) + { + Object value = riskMap.get(key); + if (value != null && "true".equals(value.toString())) + { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setEnable(1); + basicConfigQuery.setTypeId("5b18f8a7422b03d4ad2bf913"); + //处理其他自己填写的情况 + if ("qt".equals(key)) + { + Object qtText = riskMap.get("qtText"); + if (qtText != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(qtText.toString())) + { + basicConfigQuery.setName(qtText.toString()); + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigList)) { + risks.add(basicConfigList.get(0).getId()); + } + } + } + else + { + basicConfigQuery.setName(datas.get(key)); + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigList)) { + risks.add(basicConfigList.get(0).getId()); + } + } + } + } + return risks; + } + public DischargeAbstractQueryResult query(DischargeAbstractQueryRequest dischargeAbstractSaveRequest) { DischargeAbstractQueryResult dischargeAbstractQueryResult = new DischargeAbstractQueryResult(); dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index e9226e0..e96d31e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -189,7 +189,8 @@ public class BabyListTask implements Callable { result.setFmHospitalName(fmHospitalName); result.setOpenDisease(model.getOpenDisease() == null || "1".equals(model.getOpenDisease()) ? "未开通" : "开通"); - + result.setCardNo(model.getCardNo()); + result.setVcCardNo(model.getVcCardNo()); list.add(result); } }