Commit 55f284bc8d94d3e0d0b33cba932138087a9ec7c7
1 parent
f0e6ff572f
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 7 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
55f284b
| ... | ... | @@ -1942,7 +1942,6 @@ |
| 1942 | 1942 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 1943 | 1943 | patientsQuery.setSource(patients.getId()); |
| 1944 | 1944 | patientsQuery.setBuildType(1); |
| 1945 | - System.out.println("查询条件：" + patientsQuery.convertToQuery().convertToMongoQuery()); | |
| 1946 | 1945 | List<Patients> patients1 = patientsService.queryPatient(patientsQuery); |
| 1947 | 1946 | if (CollectionUtils.isNotEmpty(patients1)) { |
| 1948 | 1947 | for (Patients ps : patients1) { |
| ... | ... | @@ -1996,11 +1995,13 @@ |
| 1996 | 1995 | //出院小结 |
| 1997 | 1996 | DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); |
| 1998 | 1997 | dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); |
| 1999 | - if (patients2 != null) { | |
| 2000 | - dischargeAbstractMotherQuery.setPatientId(patients2.getId()); | |
| 2001 | - } else { | |
| 2002 | - dischargeAbstractMotherQuery.setPatientId(patientId); | |
| 2003 | - } | |
| 1998 | +// if (patients2 != null) { | |
| 1999 | +// dischargeAbstractMotherQuery.setPatientId(patients2.getId()); | |
| 2000 | +// } else { | |
| 2001 | +// dischargeAbstractMotherQuery.setPatientId(patientId); | |
| 2002 | +// } | |
| 2003 | + //解决转诊后 再分娩再出院小结 电子病历中没有出院小结 | |
| 2004 | + dischargeAbstractMotherQuery.setPid(patients.getPid()); | |
| 2004 | 2005 | |
| 2005 | 2006 | List<DischargeAbstractMotherModel> dischargeAbstractMotherModels = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); |
| 2006 | 2007 |