Commit 1a84b1781d4e4038768c9fc95a13c5d9cceee6d4
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
1a84b17
| ... | ... | @@ -1076,42 +1076,44 @@ |
| 1076 | 1076 | patientsQuery.setCardNo(cardNo); |
| 1077 | 1077 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 1078 | 1078 | |
| 1079 | - | |
| 1080 | - List listHighRisk = new ArrayList(); | |
| 1081 | 1079 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 1082 | 1080 | Patients patients = null; |
| 1081 | + List resutls = null; | |
| 1083 | 1082 | if (CollectionUtils.isNotEmpty(list)) { |
| 1084 | 1083 | patients = list.get(0); |
| 1085 | 1084 | |
| 1086 | - AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 1087 | - antExChuQuery.setParentId(patients.getId()); | |
| 1088 | - antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 1089 | - //查询产前检查记录 | |
| 1090 | - List checkList = antenatalExaminationService.findAllByParentId(patients.getId()); | |
| 1091 | - | |
| 1092 | - String highRisk = ""; | |
| 1093 | - if (CollectionUtils.isNotEmpty(checkList)) { | |
| 1094 | - AntenatalExaminationModel model = (AntenatalExaminationModel) checkList.get(0); | |
| 1095 | - highRisk = model.getRiskFactor(); | |
| 1096 | - } else { | |
| 1097 | - | |
| 1098 | - //获取初诊记录 | |
| 1099 | - List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 1100 | - AntExChuModel antExChuModel = null; | |
| 1101 | - if (CollectionUtils.isNotEmpty(antExChulist)) { | |
| 1102 | - antExChuModel = antExChulist.get(0); | |
| 1103 | - } | |
| 1104 | - if (antExChuModel != null) { | |
| 1105 | - highRisk = antExChuModel.getHighrisk(); | |
| 1106 | - } | |
| 1107 | - | |
| 1108 | - } | |
| 1109 | - | |
| 1110 | - if (!StringUtils.isEmpty(highRisk)) { | |
| 1111 | - listHighRisk = JsonUtil.toList(highRisk, List.class); | |
| 1112 | - } | |
| 1085 | + HighScoreResult res = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); | |
| 1086 | + resutls = res.getHighRisk(); | |
| 1113 | 1087 | } |
| 1114 | - List resutls = queryRisk(listHighRisk); | |
| 1088 | +// AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 1089 | +// antExChuQuery.setParentId(patients.getId()); | |
| 1090 | +// antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 1091 | +// //查询产前检查记录 | |
| 1092 | +// List checkList = antenatalExaminationService.findAllByParentId(patients.getId()); | |
| 1093 | +// | |
| 1094 | +// String highRisk = ""; | |
| 1095 | +// if (CollectionUtils.isNotEmpty(checkList)) { | |
| 1096 | +// AntenatalExaminationModel model = (AntenatalExaminationModel) checkList.get(0); | |
| 1097 | +// highRisk = model.getRiskFactor(); | |
| 1098 | +// } else { | |
| 1099 | +// | |
| 1100 | +// //获取初诊记录 | |
| 1101 | +// List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 1102 | +// AntExChuModel antExChuModel = null; | |
| 1103 | +// if (CollectionUtils.isNotEmpty(antExChulist)) { | |
| 1104 | +// antExChuModel = antExChulist.get(0); | |
| 1105 | +// } | |
| 1106 | +// if (antExChuModel != null) { | |
| 1107 | +// highRisk = antExChuModel.getHighrisk(); | |
| 1108 | +// } | |
| 1109 | +// | |
| 1110 | +// } | |
| 1111 | +// | |
| 1112 | +// if (!StringUtils.isEmpty(highRisk)) { | |
| 1113 | +// listHighRisk = JsonUtil.toList(highRisk, List.class); | |
| 1114 | +// } | |
| 1115 | +// } | |
| 1116 | +// List resutls = queryRisk(listHighRisk); | |
| 1115 | 1117 | |
| 1116 | 1118 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 1117 | 1119 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |