Commit 3779d17a4c3952c42f5f3af500b13f207df30748
1 parent
37fcbf8706
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
3779d17
| ... | ... | @@ -423,7 +423,7 @@ |
| 423 | 423 | //排序集合 |
| 424 | 424 | sortList(listDate); |
| 425 | 425 | |
| 426 | - //TODO 需要过滤掉建档就分娩的情况 | |
| 426 | + //需要过滤掉建档就分娩的情况 | |
| 427 | 427 | Date dueDate = new Date(); |
| 428 | 428 | if (CollectionUtils.isNotEmpty(listDate)) { |
| 429 | 429 | String pid=""; |
| 430 | 430 | |
| 431 | 431 | |
| ... | ... | @@ -432,16 +432,17 @@ |
| 432 | 432 | List listData = new ArrayList(); |
| 433 | 433 | Organization organization = null; |
| 434 | 434 | PatientsQuery patientsQuery1 = new PatientsQuery(); |
| 435 | - patientsQuery1.setBookbuildingDateEnd(new Date(listDate.get(i).getDate().getTime()+i)); | |
| 435 | + patientsQuery1.setBookbuildingDateEnd(new Date(listDate.get(i).getDate().getTime()+i*2200)); | |
| 436 | 436 | if (listDate.size() > i + 1) { |
| 437 | 437 | patientsQuery1.setBookbuildingDateStart(listDate.get(i + 1).getDate()); |
| 438 | 438 | }else if(listDate.size()>1){ |
| 439 | 439 | patientsQuery1.setBookbuildingDateStart(new Date()); |
| 440 | - }else{ | |
| 440 | + } | |
| 441 | + /* else{ | |
| 441 | 442 | Date end = patientsQuery1.getBookbuildingDateEnd(); |
| 442 | 443 | patientsQuery1.setBookbuildingDateEnd(new Date()); |
| 443 | 444 | patientsQuery1.setBookbuildingDateStart(end); |
| 444 | - } | |
| 445 | + }*/ | |
| 445 | 446 | pid=list.get(0).getPid(); |
| 446 | 447 | patientsQuery1.setPid(pid); |
| 447 | 448 | List<Patients> patientses = patientsService.queryPatient1(patientsQuery1); |