Commit 64ab69548c1608fa310f7ccc24f9fa30499ef5a7
1 parent
45b28399e4
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
64ab695
| ... | ... | @@ -450,7 +450,9 @@ |
| 450 | 450 | List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery); |
| 451 | 451 | if (CollectionUtils.isNotEmpty(modelList)) { |
| 452 | 452 | for (MaternalDeliverModel model : modelList) { |
| 453 | - listDate.add(new SortIn(model)); | |
| 453 | + if(null!=model.getDueDate()){ | |
| 454 | + listDate.add(new SortIn(model)); | |
| 455 | + } | |
| 454 | 456 | } |
| 455 | 457 | } |
| 456 | 458 | |
| ... | ... | @@ -461,7 +463,9 @@ |
| 461 | 463 | List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query); |
| 462 | 464 | if (CollectionUtils.isNotEmpty(stopPregs)) { |
| 463 | 465 | for (StopPregModel stopPregModel : stopPregs) { |
| 464 | - listDate.add(new SortIn(stopPregModel)); | |
| 466 | + if(null!=stopPregModel.getStopDate()){ | |
| 467 | + listDate.add(new SortIn(stopPregModel)); | |
| 468 | + } | |
| 465 | 469 | } |
| 466 | 470 | } |
| 467 | 471 | PatientsQuery patientsQuery = new PatientsQuery(); |