Commit 84d8dd94e7cafbf10a34531c8028a2b8264a1995
1 parent
fd61d8c64f
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
84d8dd9
| ... | ... | @@ -390,7 +390,7 @@ |
| 390 | 390 | List<Patients> patientses = patientsService.queryPatient(patientsQuery); |
| 391 | 391 | if (CollectionUtils.isNotEmpty(patientses)) { |
| 392 | 392 | for (Patients patients : patientses) { |
| 393 | - listDate.add(new SortIn(patients, 1)); | |
| 393 | + listDate.add(new SortIn(patients, "1")); | |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | //排序集合 |
| ... | ... | @@ -404,7 +404,7 @@ |
| 404 | 404 | |
| 405 | 405 | Date min = null; |
| 406 | 406 | if (CollectionUtils.isNotEmpty(patientses1)) { |
| 407 | - min = patientses1.get(0).getBookbuildingDate(); | |
| 407 | + min = patientses1.get(0).getLastMenses(); | |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | Date max = null; |
| ... | ... | @@ -994,6 +994,12 @@ |
| 994 | 994 | public SortIn(Patients patients, int i) { |
| 995 | 995 | this.id = patients.getId(); |
| 996 | 996 | this.date = patients.getFmDate(); |
| 997 | + this.type = 2; | |
| 998 | + } | |
| 999 | + | |
| 1000 | + public SortIn(Patients patients, String i) { | |
| 1001 | + this.id = patients.getId(); | |
| 1002 | + this.date = patients.getLastMenses(); | |
| 997 | 1003 | this.type = 2; |
| 998 | 1004 | } |
| 999 | 1005 |