From 715623d56169938bea6d45b63ba5ab49f4e0da41 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 18 Jul 2016 08:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 59 +++++++++++++--------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index b6e59af..304740a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -176,8 +176,11 @@ public class AntenatalExaminationFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setParentId(patients.getId()); + Organization organization=null; //建档记录 - Organization organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); + if(null!=patients.getHospitalId()){ + organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); + } data.add(new AntData(patients, null != organization ? organization.getName() : "")); //分娩记录 List modelList = matDeliverService.query(matDeliverQuery); @@ -198,7 +201,9 @@ public class AntenatalExaminationFacade { List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel an : antExChuModels) { - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + if(null!=an.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + } data.add(new AntData(an, null != organization ? organization.getName() : "")); } } @@ -211,7 +216,9 @@ public class AntenatalExaminationFacade { List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list1)) { for (AntenatalExaminationModel an : list1) { - organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + if(null!=an.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + } data.add(new AntData(an, null != organization ? organization.getName() : "")); } } @@ -236,7 +243,9 @@ public class AntenatalExaminationFacade { List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + if(null!=postReviewModel.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + } data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "")); } } @@ -407,29 +416,31 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { antExChuModel = antExChuModels.get(0); } - antexChuResult.convertToResult(antExChuModel); - try { - if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){ - List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); - antexChuResult.setDiagnosis(queryRisk(list)); + if(null!=antExChuModel){ + antexChuResult.convertToResult(antExChuModel); + try { + if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){ + List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); + antexChuResult.setDiagnosis(queryRisk(list)); + } + } catch (Exception e) { } - } catch (Exception e) { - } - try { - if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { - List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - antexChuResult.setHighrisk(queryRisk(list1)); + try { + if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { + List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); + antexChuResult.setHighrisk(queryRisk(list1)); + } + } catch (Exception e) { } - } catch (Exception e) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(antExChuModel.getParentId()); + antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); + SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery(); + applyOrderQuery.setParentId(antExChuModel.getParentId()); + applyOrderQuery.setYn(YnEnums.YES.getId()); + antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); + object = antexChuResult; } - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); - referralApplyOrderQuery.setParentId(antExChuModel.getParentId()); - antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); - SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery(); - applyOrderQuery.setParentId(antExChuModel.getParentId()); - applyOrderQuery.setYn(YnEnums.YES.getId()); - antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); - object = antexChuResult; } return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); -- 1.8.3.1