jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f73e6eeafa8bc0ec6b210fa041e0a16f86a052e6

Authored by wtt
1 parent c2b518e5ab
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 6 changed files with 68 additions and 21 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyAutoDiagnoseRiskFacade.java View file @ f73e6ee
... ... @@ -74,7 +74,7 @@
74 74 * @Author: 武涛涛
75 75 * @Date: 2020/8/31 13:52
76 76 */
77   - public void autoBabyRisk(BabyAutoRiskRequest babyAutoRiskRequest, Integer userId, Integer type, String id) throws NoSuchFieldException, IllegalAccessException {
  77 + public void autoBabyRisk(BabyAutoRiskRequest babyAutoRiskRequest, Integer userId, Integer type, String id, Integer i) throws NoSuchFieldException, IllegalAccessException {
78 78 AutoBabyRiskRecord autoBabyRiskRecord = new AutoBabyRiskRecord();
79 79 //分娩中获取
80 80 autoBabyRiskRecord.setHospitalId(babyAutoRiskRequest.getHospitalId());
... ... @@ -94,7 +94,7 @@
94 94 autoBabyRiskRecord.setType(type);//必填项
95 95  
96 96 //自动诊断高危
97   - List <Map <String, String>> riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), type);
  97 + List <Map <String, String>> riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), type,i);
98 98 autoBabyRiskRecord.setDiagnosis(riskList);
99 99 List <String> list = new ArrayList <>();
100 100 getDiagnosisId(autoBabyRiskRecord, list);
... ... @@ -117,7 +117,7 @@
117 117 String hospitalId = autoMatchFacade.getHospitalId(userId);
118 118 babyAutoRiskRequest.setHospitalId(hospitalId);
119 119 //自动诊断高危
120   - List <Map <String, String>> riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), babyAutoRiskInfoRequest.getType());
  120 + List <Map <String, String>> riskList = autoRisk(babyAutoRiskRequest, babyAutoRiskRequest.getHospitalId(), babyAutoRiskInfoRequest.getType(),0);
121 121  
122 122 return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
123 123  
... ... @@ -131,7 +131,7 @@
131 131 * @Author: 武涛涛
132 132 * @Date: 2020/8/31 14:56
133 133 */
134   - private List <Map <String, String>> autoRisk(BabyAutoRiskRequest babyAutoRiskRequest, String hospitalId, Integer type) throws NoSuchFieldException, IllegalAccessException {
  134 + private List <Map <String, String>> autoRisk(BabyAutoRiskRequest babyAutoRiskRequest, String hospitalId, Integer type, Integer ii) throws NoSuchFieldException, IllegalAccessException {
135 135 Set <String> list = new HashSet <>();
136 136 List <Map <String, String>> riskList = new ArrayList <>();
137 137  
138 138  
139 139  
... ... @@ -196,21 +196,41 @@
196 196 }
197 197  
198 198 /*孕母存在高危因素*/
199   - if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId()) && type == 0) {
200   - Patients patients = patientsService.findOnePatientById(babyAutoRiskRequest.getParentId());
201   - if (patients != null && CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
202   - List <String> riskFactorId = patients.getRiskFactorId();//孕妇存在的高危
203   - //诊断项
204   - List <DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId());
205   - if (CollectionUtils.isNotEmpty(items) && CollectionUtils.isNotEmpty(riskFactorId)) {
206   - for (DiagnoseItemModel item : items) {
207   - if (ymczgwys(riskFactorId, item)) {
208   - list.addAll(item.getRiskIds());//item.getRiskIds() 诊断项,高危儿诊断项目
  199 + if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId())) {
  200 + //分娩时
  201 + if(StringUtils.isNotEmpty(babyAutoRiskRequest.getParentId())){
  202 + Patients patients = patientsService.findOnePatientById(babyAutoRiskRequest.getParentId());
  203 + if (patients != null && CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
  204 + List <String> riskFactorId = patients.getRiskFactorId();//孕妇存在的高危
  205 + //诊断项
  206 + List <DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId());
  207 + if (CollectionUtils.isNotEmpty(items) && CollectionUtils.isNotEmpty(riskFactorId)) {
  208 + for (DiagnoseItemModel item : items) {
  209 + if (ymczgwys(riskFactorId, item)) {
  210 + list.addAll(item.getRiskIds());//item.getRiskIds() 诊断项,高危儿诊断项目
  211 + }
209 212 }
210 213 }
211 214 }
212 215 }
  216 + //儿童建档和儿童检查时
  217 + if(CollectionUtils.isNotEmpty(babyAutoRiskRequest.getRiskFactorId())){
  218 + List <String> riskFactorId = babyAutoRiskRequest.getRiskFactorId();//孕妇存在的高危
  219 + //诊断项
  220 + List <DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.ymczgwys.getId());
  221 + if (CollectionUtils.isNotEmpty(items) && CollectionUtils.isNotEmpty(riskFactorId)) {
  222 + for (DiagnoseItemModel item : items) {
  223 + if (ymczgwys(riskFactorId, item)) {
  224 + list.addAll(item.getRiskIds());//item.getRiskIds() 诊断项,高危儿诊断项目
  225 + }
  226 + }
  227 + }
  228 + }
  229 +
213 230 }
  231 +
  232 +
  233 +
214 234 /*分娩孕周*/
215 235 if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.fmyz.getId()) && StringUtils.isNotEmpty(maternalDeliverModel.getDueWeek()) && type != 2) {
216 236 String dueWeek = com.lyms.platform.common.utils.StringUtils.dueWeekSwitchDays(maternalDeliverModel.getDueWeek());
... ... @@ -310,7 +330,7 @@
310 330 if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tejx.getId()) && maternalDeliverModel.getBaby() != null && type != 2) {
311 331 List <MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
312 332 if (CollectionUtils.isNotEmpty(baby)) {
313   - MaternalDeliverModel.Baby baby1 = baby.get(0);
  333 + MaternalDeliverModel.Baby baby1 = baby.get(ii);
314 334 if (baby1 != null) {
315 335 List <DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tejx.getId());
316 336 if (CollectionUtils.isNotEmpty(items)) {
... ... @@ -330,7 +350,7 @@
330 350 if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.pf.getId()) && maternalDeliverModel.getBaby() != null && type != 2) {
331 351 List <MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
332 352 if (CollectionUtils.isNotEmpty(baby)) {
333   - MaternalDeliverModel.Baby baby1 = baby.get(0);
  353 + MaternalDeliverModel.Baby baby1 = baby.get(ii);
334 354 if (baby1 != null) {
335 355 String[] strings = new String[3];
336 356 Map <String, String> m = JsonUtil.getMap(baby1.getApgarScore());
... ... @@ -359,7 +379,7 @@
359 379 if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.zxfz.getId()) && maternalDeliverModel.getBaby() != null && type != 2) {
360 380 List <MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
361 381 if (CollectionUtils.isNotEmpty(baby)) {
362   - MaternalDeliverModel.Baby baby1 = baby.get(0);
  382 + MaternalDeliverModel.Baby baby1 = baby.get(ii);
363 383 if (baby1 != null) {
364 384 String asphyxiaM = baby1.getAsphyxiaM();
365 385 List <DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.zxfz.getId());
... ... @@ -393,7 +413,7 @@
393 413 if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.tz.getId()) && maternalDeliverModel.getBaby() != null) {
394 414 List <MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
395 415 if (CollectionUtils.isNotEmpty(baby)) {
396   - MaternalDeliverModel.Baby baby1 = baby.get(0);
  416 + MaternalDeliverModel.Baby baby1 = baby.get(ii);
397 417 if (baby1 != null) {
398 418 //配置是g，儿童建档和检查是kg
399 419 String babyWeight = baby1.getBabyWeight();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ f73e6ee
... ... @@ -532,6 +532,8 @@
532 532 Map map = new HashMap();
533 533 map.put("fmfs", model.getDueType());
534 534 babyAutoRiskRequest.setDeliveryMode(map);
  535 + babyAutoRiskRequest.setRiskFactorId(model.getmHighRiskReason());
  536 +
535 537 List babys = new ArrayList();
536 538 MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
537 539 baby.setJxWn(model.isJxWn());
... ... @@ -887,7 +889,7 @@
887 889 BabyAutoRiskRequest babyAutoRiskRequest = new BabyAutoRiskRequest();
888 890 babyConvertMaternalDeliver(model, babyAutoRiskRequest);
889 891  
890   - babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 1,"");
  892 + babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 1,"",0);
891 893 } catch (Exception e) {
892 894 e.printStackTrace();
893 895 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ f73e6ee
... ... @@ -642,11 +642,12 @@
642 642 babyAutoRiskRequest.setName(babyModel.getName());
643 643 babyAutoRiskRequest.setEncoded(babyModel.getEncoded());
644 644 babyAutoRiskRequest.setCardNo(babyModel.getCardNo());
  645 + babyAutoRiskRequest.setRiskFactorId(babyModel.getmHighRiskReason());
645 646 if(babyModel.getBirth()!=null && model.getCreated()!=null){
646 647 babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
647 648  
648 649 }
649   - babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 2,"");
  650 + babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 2,"",0);
650 651 }
651 652 } catch (Exception e) {
652 653 e.printStackTrace();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ f73e6ee
... ... @@ -465,7 +465,7 @@
465 465 babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
466 466  
467 467 }
468   - babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 0, "");
  468 + babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 0, "",i);
469 469 }
470 470  
471 471 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskInfoRequest.java View file @ f73e6ee
... ... @@ -29,6 +29,8 @@
29 29 //分娩方式
30 30 private Map deliveryMode;
31 31 private String fmfs;
  32 + //母亲高危风险id
  33 + private List<String> riskFactorId;
32 34  
33 35 //1 儿童建档，2儿童检查使用自动诊断
34 36 @NotNull(message = "type不能为空")
... ... @@ -91,6 +93,7 @@
91 93 @Override
92 94 public BabyAutoRiskRequest convertToDataModel() {
93 95 BabyAutoRiskRequest babyAutoRiskRequest = new BabyAutoRiskRequest();
  96 + babyAutoRiskRequest.setRiskFactorId(riskFactorId);
94 97 babyAutoRiskRequest.setDueWeek(dueWeek);
95 98 if(StringUtils.isNotEmpty(fmfs)){
96 99 Map map = new HashMap();
... ... @@ -129,6 +132,14 @@
129 132 babies.add(baby);
130 133 babyAutoRiskRequest.setBabies(babies);
131 134 return babyAutoRiskRequest;
  135 + }
  136 +
  137 + public List <String> getRiskFactorId() {
  138 + return riskFactorId;
  139 + }
  140 +
  141 + public void setRiskFactorId(List <String> riskFactorId) {
  142 + this.riskFactorId = riskFactorId;
132 143 }
133 144  
134 145 public String getFmfs() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAutoRiskRequest.java View file @ f73e6ee
... ... @@ -17,6 +17,10 @@
17 17 private String mname;
18 18 private String mphone;
19 19 private String mcertNo;
  20 + //母亲高危风险id
  21 + private List<String> riskFactorId;
  22 +
  23 +
20 24 //儿童档案id
21 25 private String babyId;
22 26 private String name;
... ... @@ -34,6 +38,15 @@
34 38 private Date diagnosisDate;
35 39 //状态 0 未确认 1已经确认
36 40 private Integer status;
  41 +
  42 +
  43 + public List <String> getRiskFactorId() {
  44 + return riskFactorId;
  45 + }
  46 +
  47 + public void setRiskFactorId(List <String> riskFactorId) {
  48 + this.riskFactorId = riskFactorId;
  49 + }
37 50  
38 51 public String getCardNo() {
39 52 return cardNo;