jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 9f2c5f6466c445e0decc3c16e07d2c0b1e7b4e29

Authored by jiangjiazhi
2 parents b45fc2b610 78412f65e4
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 9f2c5f6
... ... @@ -1077,7 +1077,7 @@
1077 1077 patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId());
1078 1078 patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
1079 1079 patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo());
1080   - // patientsQuery.setFmHospitalQueryList(hospitalList);
  1080 + patientsQuery.setFmHospitalQueryList(hospitalList);
1081 1081 String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
1082 1082 patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
1083 1083 patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge()));
1084 1084  
... ... @@ -1173,10 +1173,15 @@
1173 1173 BabyModelQuery babyModelQuery = new BabyModelQuery();
1174 1174 babyModelQuery.setYn(YnEnums.YES.getId());
1175 1175 babyModelQuery.setParentId(patients.getId());
1176   - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
1177 1176 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
1178 1177 if (CollectionUtils.isNotEmpty(babyModelList)) {
1179   - childbirthManagerQueryModel.setLivingNumber(babyModelList.size());
  1178 + int i = 0;
  1179 + for (BabyModel babyModel : babyModelList) {
  1180 + if (RenShenJieJuEnums.O.getId().equals(babyModel.getPregnancyOut())) {
  1181 + i++;
  1182 + }
  1183 + }
  1184 + childbirthManagerQueryModel.setLivingNumber(i);
1180 1185 } else {
1181 1186 if (childbirthManagerQueryModel.getTireNumber() == null) {
1182 1187 childbirthManagerQueryModel.setLivingNumber(null);