shiyang / regional-platform

Download as
Browse Code »

Commit 715623d56169938bea6d45b63ba5ab49f4e0da41

Authored by jiangjiazhi
1 parent 17c73df26d
Exists in master and in 1 other branch nobuildprocess

增加是否通知

Showing 1 changed file with 35 additions and 24 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 715623d
... ... @@ -176,8 +176,11 @@
176 176 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
177 177 matDeliverQuery.setYn(YnEnums.YES.getId());
178 178 matDeliverQuery.setParentId(patients.getId());
  179 + Organization organization=null;
179 180 //建档记录
180   - Organization organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
  181 + if(null!=patients.getHospitalId()){
  182 + organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
  183 + }
181 184 data.add(new AntData(patients, null != organization ? organization.getName() : ""));
182 185 //分娩记录
183 186 List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery);
... ... @@ -198,7 +201,9 @@
198 201 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
199 202 if (CollectionUtils.isNotEmpty(antExChuModels)) {
200 203 for (AntExChuModel an : antExChuModels) {
201   - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
  204 + if(null!=an.getHospitalId()) {
  205 + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
  206 + }
202 207 data.add(new AntData(an, null != organization ? organization.getName() : ""));
203 208 }
204 209 }
... ... @@ -211,7 +216,9 @@
211 216 List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
212 217 if (CollectionUtils.isNotEmpty(list1)) {
213 218 for (AntenatalExaminationModel an : list1) {
214   - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
  219 + if(null!=an.getHospitalId()) {
  220 + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
  221 + }
215 222 data.add(new AntData(an, null != organization ? organization.getName() : ""));
216 223 }
217 224 }
... ... @@ -236,7 +243,9 @@
236 243 List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
237 244 if (CollectionUtils.isNotEmpty(reviewModels)) {
238 245 for (PostReviewModel postReviewModel : reviewModels) {
239   - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  246 + if(null!=postReviewModel.getHospitalId()) {
  247 + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  248 + }
240 249 data.add(new AntData(postReviewModel, null != organization ? organization.getName() : ""));
241 250 }
242 251 }
243 252  
244 253  
245 254  
... ... @@ -407,29 +416,31 @@
407 416 if (CollectionUtils.isNotEmpty(antExChuModels)) {
408 417 antExChuModel = antExChuModels.get(0);
409 418 }
410   - antexChuResult.convertToResult(antExChuModel);
411   - try {
412   - if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){
413   - List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class);
414   - antexChuResult.setDiagnosis(queryRisk(list));
  419 + if(null!=antExChuModel){
  420 + antexChuResult.convertToResult(antExChuModel);
  421 + try {
  422 + if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){
  423 + List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class);
  424 + antexChuResult.setDiagnosis(queryRisk(list));
  425 + }
  426 + } catch (Exception e) {
415 427 }
416   - } catch (Exception e) {
417   - }
418   - try {
419   - if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {
420   - List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
421   - antexChuResult.setHighrisk(queryRisk(list1));
  428 + try {
  429 + if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {
  430 + List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
  431 + antexChuResult.setHighrisk(queryRisk(list1));
  432 + }
  433 + } catch (Exception e) {
422 434 }
423   - } catch (Exception e) {
  435 + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
  436 + referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
  437 + antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
  438 + SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
  439 + applyOrderQuery.setParentId(antExChuModel.getParentId());
  440 + applyOrderQuery.setYn(YnEnums.YES.getId());
  441 + antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
  442 + object = antexChuResult;
424 443 }
425   - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
426   - referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
427   - antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
428   - SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
429   - applyOrderQuery.setParentId(antExChuModel.getParentId());
430   - applyOrderQuery.setYn(YnEnums.YES.getId());
431   - antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
432   - object = antexChuResult;
433 444 }
434 445  
435 446 return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");