Commit a96d517f23ee7894a664e7a138036adb980eb072
1 parent
19c2d8c07b
Exists in
master
and in
1 other branch
增加设置parentid
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
a96d517
| ... | ... | @@ -436,8 +436,8 @@ |
| 436 | 436 | //初诊记录 |
| 437 | 437 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 438 | 438 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 439 | -// antExChuQuery.setStart(patients.getBookbuildingDate()); | |
| 440 | -// antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); | |
| 439 | + antExChuQuery.setStart(patients.getBookbuildingDate()); | |
| 440 | + antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); | |
| 441 | 441 | antExChuQuery.setParentId(patients.getId()); |
| 442 | 442 | List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 443 | 443 | if (CollectionUtils.isNotEmpty(antExChuModels)) { |
| ... | ... | @@ -453,8 +453,8 @@ |
| 453 | 453 | AntExQuery antExQuery = new AntExQuery(); |
| 454 | 454 | antExQuery.setYn(YnEnums.YES.getId()); |
| 455 | 455 | antExQuery.setParentId(patients.getId()); |
| 456 | -// antExQuery.setStart(patients.getBookbuildingDate()); | |
| 457 | -// antExQuery.setEnd(new Date(date.getTime() + 86398000)); | |
| 456 | + antExQuery.setStart(patients.getBookbuildingDate()); | |
| 457 | + antExQuery.setEnd(new Date(date.getTime() + 86398000)); | |
| 458 | 458 | List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
| 459 | 459 | if (CollectionUtils.isNotEmpty(list1)) { |
| 460 | 460 | for (AntenatalExaminationModel an : list1) { |
| ... | ... | @@ -470,7 +470,7 @@ |
| 470 | 470 | postReviewQuery.setStart(date); |
| 471 | 471 | //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 |
| 472 | 472 | // postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); |
| 473 | - postReviewQuery.setEnd(list.get(i).getCreated()); | |
| 473 | + postReviewQuery.setEnd(list.get(i).getBookbuildingDate()); | |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | postReviewQuery.setParentId(patients.getId()); |