Commit b38593c3591179709f54d2a98f31cfbbde4fb008
1 parent
1161d411cd
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 6 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
b38593c
| ... | ... | @@ -2322,11 +2322,11 @@ |
| 2322 | 2322 | //出院小结 |
| 2323 | 2323 | DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); |
| 2324 | 2324 | dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); |
| 2325 | -// if (patients2 != null) { | |
| 2326 | -// dischargeAbstractMotherQuery.setPatientId(patients2.getId()); | |
| 2327 | -// } else { | |
| 2328 | -// dischargeAbstractMotherQuery.setPatientId(patientId); | |
| 2329 | -// } | |
| 2325 | + if (patients2 != null) { | |
| 2326 | + dischargeAbstractMotherQuery.setPatientId(patients2.getId()); | |
| 2327 | + } else { | |
| 2328 | + dischargeAbstractMotherQuery.setPatientId(patientId); | |
| 2329 | + } | |
| 2330 | 2330 | //解决转诊后 再分娩再出院小结 电子病历中没有出院小结 |
| 2331 | 2331 | dischargeAbstractMotherQuery.setPid(patients.getPid()); |
| 2332 | 2332 | |
| ... | ... | @@ -2334,10 +2334,7 @@ |
| 2334 | 2334 | |
| 2335 | 2335 | if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) { |
| 2336 | 2336 | for (DischargeAbstractMotherModel model : dischargeAbstractMotherModels) { |
| 2337 | - if (model.getPatientId().equals(patientId) || model.getPatientId().equals(patients.getSource()) || model.getPatientId().equals(patients2.getSource())) | |
| 2338 | - { | |
| 2339 | - listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate())); | |
| 2340 | - } | |
| 2337 | + listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate())); | |
| 2341 | 2338 | } |
| 2342 | 2339 | } |
| 2343 | 2340 |