Commit d4bb649f150c9f6ebc0747a6bbcf0c42313c9c18
1 parent
fcfc626f45
Exists in
master
and in
6 other branches
产前检查，冗余高危因数到patient
Showing 1 changed file with 13 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
d4bb649
| ... | ... | @@ -828,7 +828,7 @@ |
| 828 | 828 | } else if (null != date) { |
| 829 | 829 | antExQuery.setEnd(date); |
| 830 | 830 | } |
| 831 | - List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate")); | |
| 831 | + List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate").addOrder(Sort.Direction.DESC,"created")); | |
| 832 | 832 | HighScoreResult highScoreResult = new HighScoreResult(); |
| 833 | 833 | boolean next = true; |
| 834 | 834 | if (CollectionUtils.isNotEmpty(list)) { |
| ... | ... | @@ -1467,12 +1467,12 @@ |
| 1467 | 1467 | //初诊记录 |
| 1468 | 1468 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 1469 | 1469 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 1470 | - antExChuQuery.setStart(patients.getBookbuildingDate()); | |
| 1471 | - if (null == patients.getFmDate()) { | |
| 1472 | - antExChuQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); | |
| 1473 | - } else { | |
| 1474 | - antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); | |
| 1475 | - } | |
| 1470 | + // antExChuQuery.setStart(patients.getBookbuildingDate()); | |
| 1471 | + // if (null == patients.getFmDate()) { | |
| 1472 | + // antExChuQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); | |
| 1473 | + // } else { | |
| 1474 | + // antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); | |
| 1475 | + // } | |
| 1476 | 1476 | if (patients2 != null) { |
| 1477 | 1477 | antExChuQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); |
| 1478 | 1478 | } else { |
| ... | ... | @@ -1491,12 +1491,12 @@ |
| 1491 | 1491 | //复诊记录 |
| 1492 | 1492 | AntExQuery antExQuery = new AntExQuery(); |
| 1493 | 1493 | antExQuery.setYn(YnEnums.YES.getId()); |
| 1494 | - antExQuery.setStart(patients.getBookbuildingDate()); | |
| 1495 | - if (null == patients.getFmDate()) { | |
| 1496 | - antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); | |
| 1497 | - } else { | |
| 1498 | - antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); | |
| 1499 | - } | |
| 1494 | + // antExQuery.setStart(patients.getBookbuildingDate()); | |
| 1495 | + // if (null == patients.getFmDate()) { | |
| 1496 | + // antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); | |
| 1497 | + // } else { | |
| 1498 | + // antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); | |
| 1499 | + // } | |
| 1500 | 1500 | if (patients2 != null) { |
| 1501 | 1501 | antExQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); |
| 1502 | 1502 | } else { |