jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 96a956de40458195116a86b09131220fa44d7752

Authored by hujiaqi
1 parent 7e5d4b4f61
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

孕周*7

Showing 1 changed file with 9 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 96a956d
... ... @@ -969,21 +969,21 @@
969 969 patientsQuery.setLimit(childbirthManagerRequest.getLimit());
970 970 patientsQuery.setPage(childbirthManagerRequest.getPage());
971 971 patientsQuery.setNeed("need");
972   - patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId())?null:childbirthManagerRequest.getRegisterProvinceId());
973   - patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId())?null:childbirthManagerRequest.getRegisterCityId());
974   - patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId())?null:childbirthManagerRequest.getRegisterAreaId());
975   - patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getLivingProvinceId())?null:childbirthManagerRequest.getLivingProvinceId());
976   - patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId())?null:childbirthManagerRequest.getLivingCityId());
977   - patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId())?null:childbirthManagerRequest.getLivingAreaId());
  972 + patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId());
  973 + patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
  974 + patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId()) ? null : childbirthManagerRequest.getRegisterAreaId());
  975 + patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getLivingProvinceId()) ? null : childbirthManagerRequest.getLivingProvinceId());
  976 + patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId()) ? null : childbirthManagerRequest.getLivingCityId());
  977 + patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId());
978 978 patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
979   - patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())?null:childbirthManagerRequest.getQueryNo());
  979 + patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo());
980 980 patientsQuery.setFmHospitalList(hospitalList);
981 981 String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
982 982 patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
983 983 patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge()));
984 984 patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge()));
985   - patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()));
986   - patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()));
  985 + patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7);
  986 + patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7);
987 987 // 分娩方式去另外一张表查
988 988 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
989 989 List<String> parentIdList = new ArrayList<>();