jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2aa0e18e9220b29121aacc44184ccb52aebae17b

Authored by jiangjiazhi
1 parent 01753d2165
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改产检删除

Showing 1 changed file with 7 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 2aa0e18
... ... @@ -1028,6 +1028,7 @@
1028 1028 List listData = new ArrayList();
1029 1029 while (iterator.hasNext()) {
1030 1030 Patients patients = iterator.next();
  1031 +
1031 1032 //处理建档就分娩的情况
1032 1033 Date date = DateUtil.addWeek(patients.getLastMenses(), 42);
1033 1034  
... ... @@ -1038,7 +1039,9 @@
1038 1039 organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1039 1040 }
1040 1041 pid = patients.getPid();
1041   - listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
  1042 + if(!"0".equals(patients.getEnable())){
  1043 + listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
  1044 + }
1042 1045  
1043 1046  
1044 1047 if (null == dueDate && null != patients.getFmDate()) {
... ... @@ -1197,7 +1200,9 @@
1197 1200 organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1198 1201 }
1199 1202 pid = patients.getPid();
1200   - listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
  1203 + if(!"0".equals(patients.getEnable())) {
  1204 + listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
  1205 + }
1201 1206 }
1202 1207  
1203 1208