From f73e6eeafa8bc0ec6b210fa041e0a16f86a052e6 Mon Sep 17 00:00:00 2001 From: wtt Date: Sun, 6 Sep 2020 21:15:02 +0800 Subject: [PATCH] update --- .../web/facade/BabyAutoDiagnoseRiskFacade.java | 56 +++++++++++++++------- .../operate/web/facade/BabyBookbuildingFacade.java | 4 +- .../operate/web/facade/BabyCheckFacade.java | 3 +- .../operate/web/facade/MatDeliverFacade.java | 2 +- .../web/request/BabyAutoRiskInfoRequest.java | 11 +++++ .../operate/web/request/BabyAutoRiskRequest.java | 13 +++++ 6 files changed, 68 insertions(+), 21 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java index ce847ec..12c093f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java @@ -74,7 +74,7 @@ public class BabyAutoDiagnoseRiskFacade { * @Author: 武涛涛 * @Date: 2020/8/31 13:52 */ - public void autoBabyRisk(BabyAutoRiskRequest babyAutoRiskRequest, Integer userId, Integer type, String id) throws NoSuchFieldException, IllegalAccessException { + public void autoBabyRisk(BabyAutoRiskRequest babyAutoRiskRequest, Integer userId, Integer type, String id, Integer i) throws NoSuchFieldException, IllegalAccessException { AutoBabyRiskRecord autoBabyRiskRecord = new AutoBabyRiskRecord(); //分娩中获取 autoBabyRiskRecord.setHospitalId(babyAutoRiskRequest.getHospitalId()); @@ -94,7 +94,7 @@ public class BabyAutoDiagnoseRiskFacade { autoBabyRiskRecord.setType(type);//必填项 //自动诊断高危 - List > riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), type); + List > riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), type,i); autoBabyRiskRecord.setDiagnosis(riskList); List list = new ArrayList <>(); getDiagnosisId(autoBabyRiskRecord, list); @@ -117,7 +117,7 @@ public class BabyAutoDiagnoseRiskFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); babyAutoRiskRequest.setHospitalId(hospitalId); //自动诊断高危 - List > riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), babyAutoRiskInfoRequest.getType()); + List > riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), babyAutoRiskInfoRequest.getType(),0); return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -131,7 +131,7 @@ public class BabyAutoDiagnoseRiskFacade { * @Author: 武涛涛 * @Date: 2020/8/31 14:56 */ - private List > autoRisk(BabyAutoRiskRequest babyAutoRiskRequest, String hospitalId, Integer type) throws NoSuchFieldException, IllegalAccessException { + private List > autoRisk(BabyAutoRiskRequest babyAutoRiskRequest, String hospitalId, Integer type, Integer ii) throws NoSuchFieldException, IllegalAccessException { Set list = new HashSet <>(); List > riskList = new ArrayList <>(); @@ -196,21 +196,41 @@ public class BabyAutoDiagnoseRiskFacade { } /*孕母存在高危因素*/ - if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId()) && type == 0) { - Patients patients = patientsService.findOnePatientById(babyAutoRiskRequest.getParentId()); - if (patients != null && CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { - List riskFactorId = patients.getRiskFactorId();//孕妇存在的高危 - //诊断项 - List items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId()); - if (CollectionUtils.isNotEmpty(items) && CollectionUtils.isNotEmpty(riskFactorId)) { - for (DiagnoseItemModel item : items) { - if (ymczgwys(riskFactorId, item)) { - list.addAll(item.getRiskIds());//item.getRiskIds() 诊断项,高危儿诊断项目 + if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId())) { + //分娩时 + if(StringUtils.isNotEmpty(babyAutoRiskRequest.getParentId())){ + Patients patients = patientsService.findOnePatientById(babyAutoRiskRequest.getParentId()); + if (patients != null && CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { + List riskFactorId = patients.getRiskFactorId();//孕妇存在的高危 + //诊断项 + List items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId()); + if (CollectionUtils.isNotEmpty(items) && CollectionUtils.isNotEmpty(riskFactorId)) { + for (DiagnoseItemModel item : items) { + if (ymczgwys(riskFactorId, item)) { + list.addAll(item.getRiskIds());//item.getRiskIds() 诊断项,高危儿诊断项目 + } } } } } + //儿童建档和儿童检查时 + if(CollectionUtils.isNotEmpty(babyAutoRiskRequest.getRiskFactorId())){ + List riskFactorId = babyAutoRiskRequest.getRiskFactorId();//孕妇存在的高危 + //诊断项 + List items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId()); + if (CollectionUtils.isNotEmpty(items) && CollectionUtils.isNotEmpty(riskFactorId)) { + for (DiagnoseItemModel item : items) { + if (ymczgwys(riskFactorId, item)) { + list.addAll(item.getRiskIds());//item.getRiskIds() 诊断项,高危儿诊断项目 + } + } + } + } + } + + + /*分娩孕周*/ if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.fmyz.getId()) && StringUtils.isNotEmpty(maternalDeliverModel.getDueWeek()) && type != 2) { String dueWeek = com.lyms.platform.common.utils.StringUtils.dueWeekSwitchDays(maternalDeliverModel.getDueWeek()); @@ -310,7 +330,7 @@ public class BabyAutoDiagnoseRiskFacade { if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tejx.getId()) && maternalDeliverModel.getBaby() != null && type != 2) { List baby = maternalDeliverModel.getBaby(); if (CollectionUtils.isNotEmpty(baby)) { - MaternalDeliverModel.Baby baby1 = baby.get(0); + MaternalDeliverModel.Baby baby1 = baby.get(ii); if (baby1 != null) { List items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tejx.getId()); if (CollectionUtils.isNotEmpty(items)) { @@ -330,7 +350,7 @@ public class BabyAutoDiagnoseRiskFacade { if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.pf.getId()) && maternalDeliverModel.getBaby() != null && type != 2) { List baby = maternalDeliverModel.getBaby(); if (CollectionUtils.isNotEmpty(baby)) { - MaternalDeliverModel.Baby baby1 = baby.get(0); + MaternalDeliverModel.Baby baby1 = baby.get(ii); if (baby1 != null) { String[] strings = new String[3]; Map m = JsonUtil.getMap(baby1.getApgarScore()); @@ -359,7 +379,7 @@ public class BabyAutoDiagnoseRiskFacade { if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.zxfz.getId()) && maternalDeliverModel.getBaby() != null && type != 2) { List baby = maternalDeliverModel.getBaby(); if (CollectionUtils.isNotEmpty(baby)) { - MaternalDeliverModel.Baby baby1 = baby.get(0); + MaternalDeliverModel.Baby baby1 = baby.get(ii); if (baby1 != null) { String asphyxiaM = baby1.getAsphyxiaM(); List items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.zxfz.getId()); @@ -393,7 +413,7 @@ public class BabyAutoDiagnoseRiskFacade { if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tz.getId()) && maternalDeliverModel.getBaby() != null) { List baby = maternalDeliverModel.getBaby(); if (CollectionUtils.isNotEmpty(baby)) { - MaternalDeliverModel.Baby baby1 = baby.get(0); + MaternalDeliverModel.Baby baby1 = baby.get(ii); if (baby1 != null) { //配置是g，儿童建档和检查是kg String babyWeight = baby1.getBabyWeight(); 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 cdeae3a..fd266b4 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 @@ -532,6 +532,8 @@ public class BabyBookbuildingFacade { Map map = new HashMap(); map.put("fmfs", model.getDueType()); babyAutoRiskRequest.setDeliveryMode(map); + babyAutoRiskRequest.setRiskFactorId(model.getmHighRiskReason()); + List babys = new ArrayList(); MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); baby.setJxWn(model.isJxWn()); @@ -887,7 +889,7 @@ public class BabyBookbuildingFacade { BabyAutoRiskRequest babyAutoRiskRequest = new BabyAutoRiskRequest(); babyConvertMaternalDeliver(model, babyAutoRiskRequest); - babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 1,""); + babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 1,"",0); } catch (Exception e) { e.printStackTrace(); } 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 6879a71..cf2e949 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 @@ -642,11 +642,12 @@ public class BabyCheckFacade extends BaseServiceImpl { babyAutoRiskRequest.setName(babyModel.getName()); babyAutoRiskRequest.setEncoded(babyModel.getEncoded()); babyAutoRiskRequest.setCardNo(babyModel.getCardNo()); + babyAutoRiskRequest.setRiskFactorId(babyModel.getmHighRiskReason()); if(babyModel.getBirth()!=null && model.getCreated()!=null){ babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); } - babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 2,""); + babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 2,"",0); } } catch (Exception e) { e.printStackTrace(); 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 672c172..4b16849 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 @@ -465,7 +465,7 @@ public class MatDeliverFacade { babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); } - babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 0, ""); + babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 0, "",i); } } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java index 8c32c38..f3b1ce0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java @@ -29,6 +29,8 @@ public class BabyAutoRiskInfoRequest implements IBasicRequestConvert riskFactorId; //1 儿童建档，2儿童检查使用自动诊断 @NotNull(message = "type不能为空") @@ -91,6 +93,7 @@ public class BabyAutoRiskInfoRequest implements IBasicRequestConvert getRiskFactorId() { + return riskFactorId; + } + + public void setRiskFactorId(List riskFactorId) { + this.riskFactorId = riskFactorId; + } + public String getFmfs() { return fmfs; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskRequest.java index ed0c605..4ee1b19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskRequest.java @@ -17,6 +17,10 @@ public class BabyAutoRiskRequest extends MatDeliverAddRequest { private String mname; private String mphone; private String mcertNo; + //母亲高危风险id + private List riskFactorId; + + //儿童档案id private String babyId; private String name; @@ -35,6 +39,15 @@ public class BabyAutoRiskRequest extends MatDeliverAddRequest { //状态 0 未确认 1已经确认 private Integer status; + + public List getRiskFactorId() { + return riskFactorId; + } + + public void setRiskFactorId(List riskFactorId) { + this.riskFactorId = riskFactorId; + } + public String getCardNo() { return cardNo; } -- 1.8.3.1