Commit 2b35b538a47ef44b254b1a19f7591a5d09913d7b
1 parent
42e6153088
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 1 changed file with 8 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
2b35b53
| ... | ... | @@ -9,6 +9,7 @@ |
| 9 | 9 | import com.lyms.platform.common.utils.JsonUtil; |
| 10 | 10 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
| 11 | 11 | import com.lyms.platform.operate.web.request.MatDeliverQueryRequest; |
| 12 | +import com.lyms.platform.operate.web.result.HighScoreResult; | |
| 12 | 13 | import com.lyms.platform.operate.web.result.MatDeliverListResult; |
| 13 | 14 | import com.lyms.platform.operate.web.result.MaternalDeliverResult; |
| 14 | 15 | import com.lyms.platform.permission.model.Organization; |
| 15 | 16 | |
| ... | ... | @@ -268,14 +269,15 @@ |
| 268 | 269 | antExQuery.setParentId(patients.getId()); |
| 269 | 270 | antExQuery.setYn(YnEnums.YES.getId()); |
| 270 | 271 | List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
| 272 | + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId()); | |
| 271 | 273 | try { |
| 272 | 274 | String tTireNumber = ""; |
| 273 | 275 | List data = new ArrayList(); |
| 274 | 276 | if (CollectionUtils.isNotEmpty(examinationModel)) { |
| 275 | 277 | if (null != examinationModel && StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())) { |
| 276 | 278 | tTireNumber = examinationModel.get(0).getTireNumber(); |
| 277 | - List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(), List.class); | |
| 278 | - findBasicConfig(l,data); | |
| 279 | + /* List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(), List.class); | |
| 280 | + findBasicConfig(l,data);*/ | |
| 279 | 281 | } |
| 280 | 282 | } else { |
| 281 | 283 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 282 | 284 | |
| ... | ... | @@ -284,12 +286,13 @@ |
| 284 | 286 | List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 285 | 287 | if (CollectionUtils.isNotEmpty(antExChuModels)) { |
| 286 | 288 | tTireNumber = antExChuModels.get(0).getTireNumber(); |
| 287 | - List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class); | |
| 288 | - findBasicConfig(l,data); | |
| 289 | + /* List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class); | |
| 290 | + findBasicConfig(l,data);*/ | |
| 289 | 291 | } |
| 290 | 292 | } |
| 291 | 293 | |
| 292 | - matDeliverListResult.setRiskFactor(data); | |
| 294 | + matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk()); | |
| 295 | + matDeliverListResult.setRiskScore(highScoreResult.getScore()+""); | |
| 293 | 296 | matDeliverListResult.setTireNumber1(tTireNumber); |
| 294 | 297 | } catch (Exception e) { |
| 295 | 298 | } |