Commit 14215b3a2a9aadb12bd936b3944021369c264b16
1 parent
58adf87c07
Exists in
master
and in
1 other branch
高危因素
Showing 2 changed files with 22 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
14215b3
| ... | ... | @@ -231,9 +231,26 @@ |
| 231 | 231 | * @return |
| 232 | 232 | */ |
| 233 | 233 | public HighScoreResult findLastRisk(String pid, boolean needLevel) { |
| 234 | + HighScoreResult highScoreResult = getPatLastRiskByDate(pid,needLevel,null); | |
| 235 | + return highScoreResult; | |
| 236 | + } | |
| 237 | + | |
| 238 | + /** | |
| 239 | + * 查询当前产程孕妇高危因素 | |
| 240 | + * @param pid | |
| 241 | + * @param needLevel | |
| 242 | + * @param date | |
| 243 | + * @return | |
| 244 | + */ | |
| 245 | + public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel,Date date) | |
| 246 | + { | |
| 234 | 247 | AntExQuery antExQuery=new AntExQuery(); |
| 235 | 248 | antExQuery.setPid(pid); |
| 236 | 249 | antExQuery.setYn(YnEnums.YES.getId()); |
| 250 | + if (date != null) | |
| 251 | + { | |
| 252 | + antExQuery.setStart(date); | |
| 253 | + } | |
| 237 | 254 | List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); |
| 238 | 255 | HighScoreResult highScoreResult = new HighScoreResult(); |
| 239 | 256 | boolean next = true; |
| ... | ... | @@ -291,6 +308,10 @@ |
| 291 | 308 | //初诊 |
| 292 | 309 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 293 | 310 | antExChuQuery.setPid(pid); |
| 311 | + if (date != null) | |
| 312 | + { | |
| 313 | + antExChuQuery.setStart(date); | |
| 314 | + } | |
| 294 | 315 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 295 | 316 | List<AntExChuModel> list1 = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 296 | 317 | if (CollectionUtils.isNotEmpty(list1)) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
14215b3
| ... | ... | @@ -361,7 +361,7 @@ |
| 361 | 361 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 362 | 362 | if (CollectionUtils.isNotEmpty(list)) |
| 363 | 363 | { |
| 364 | - HighScoreResult res = antenatalExaminationFacade.findLastRisk(list.get(0).getPid(),false); | |
| 364 | + HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth()); | |
| 365 | 365 | List<String> listHighRisk = res.getHighRisk(); |
| 366 | 366 | |
| 367 | 367 | if (CollectionUtils.isNotEmpty(listHighRisk)) |