jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2ad735421f04e42754bbc4b13589fdc5475f6cec

Authored by jiangjiazhi
2 parents 028c062589 add4fe5e67
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 2ad7354
... ... @@ -912,8 +912,12 @@
912 912 {
913 913 for(BabyModel build: builds)
914 914 {
915   - if (build != null && StringUtils.isNotEmpty(build.getHospitalId()) && build.getHospitalId().equals(param.getHospitalId()))
  915 + if (build != null || StringUtils.isEmpty(build.getHospitalId()))
916 916 {
  917 + continue;
  918 + }
  919 + if (build.getHospitalId().equals(param.getHospitalId()))
  920 + {
917 921 isCurrentHosp = true;
918 922 buildInfo = build;
919 923 }
... ... @@ -922,7 +926,7 @@
922 926 Map<String, String> buildRecords = new HashMap<>();
923 927 buildRecords.put("id", build.getId());
924 928 buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
925   -
  929 + buildRecords.put("hospitalId",build.getHospitalId());
926 930 //查询建档医院
927 931 Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));
928 932 if (org != null) {
... ... @@ -1197,7 +1201,7 @@
1197 1201 result.setMommyName(StringUtils.emptyDeal(model.getMname()));
1198 1202 result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone()));
1199 1203 result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone()));
1200   - result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()));
  1204 + result.setServiceStatus(StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
1201 1205 result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
1202 1206 result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
1203 1207 result.setPatientId(model.getParentId());