jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9781aaba194d78db6aaf177d2cb44a4be42711dc

Authored by jiangjiazhi
1 parent db8702635e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

设置修改分娩时间

Showing 1 changed file with 11 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 9781aab
... ... @@ -1099,7 +1099,7 @@
1099 1099 Organization organization = null;
1100 1100 String pid = "";
1101 1101 List listData = new ArrayList();
1102   -
  1102 + Date lastMenses=null;//上一次的末次月经
1103 1103 while (iterator.hasNext()) {
1104 1104 Patients patients = iterator.next();
1105 1105  
1106 1106  
... ... @@ -1120,9 +1120,9 @@
1120 1120 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
1121 1121 }
1122 1122  
1123   - if (null == dueDate && null != patients.getFmDate()) {
  1123 +// if (null == dueDate && null != patients.getFmDate()) {
1124 1124 dueDate = patients.getFmDate();
1125   - }
  1125 +// }
1126 1126  
1127 1127  
1128 1128 //初诊记录
... ... @@ -1169,8 +1169,8 @@
1169 1169 listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
1170 1170 }
1171 1171 }
1172   -
1173   - /*if (null != map) {
  1172 +/*
  1173 + if (null != map) {
1174 1174 Object obj = map.get(listDate.get(i).getId());
1175 1175 if (obj instanceof MaternalDeliverModel) {
1176 1176 MaternalDeliverModel model = (MaternalDeliverModel) obj;
1177 1177  
1178 1178  
... ... @@ -1181,17 +1181,19 @@
1181 1181 listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
1182 1182 }
1183 1183 }*/
1184   - if (null != map) {
  1184 + if (null != map) {
1185 1185 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
1186 1186 matDeliverQuery.setYn(YnEnums.YES.getId());
1187 1187 matDeliverQuery.setPid(pid);
1188   - matDeliverQuery.setNeStart(true);
  1188 +// matDeliverQuery.setNeStart(true);
1189 1189 // matDeliverQuery.setNeEnd(true);
1190 1190 matDeliverQuery.setCreatedStart(dueDate);
1191 1191 if (CollectionUtils.isNotEmpty(listDate)) {
1192 1192 //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
1193 1193 if (listDate.size() > 1 && i > 1) {
1194 1194 matDeliverQuery.setEndStart(listDate.get(i - 1).getDate());
  1195 + }else{
  1196 + matDeliverQuery.setEndStart(lastMenses);
1195 1197 }
1196 1198 }
1197 1199 List<MaternalDeliverModel> l= matDeliverService.query(matDeliverQuery);
... ... @@ -1201,7 +1203,7 @@
1201 1203 organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
1202 1204 }
1203 1205  
1204   - listData.add(new AntData((MaternalDeliverModel) model, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
  1206 + listData.add(new AntData(model, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
1205 1207 }
1206 1208 }
1207 1209  
... ... @@ -1287,7 +1289,7 @@
1287 1289 }
1288 1290 }
1289 1291 }
1290   -
  1292 + lastMenses=patients.getLastMenses();
1291 1293 iterator.remove();
1292 1294 if (CollectionUtils.isNotEmpty(listData)) {
1293 1295 sort(listData);