From b6637152ba941914abeb1ce194f400e07fe0b9a8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 13 Jul 2016 17:09:15 +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 | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 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 43e4c86..d684fcf 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 @@ -129,7 +129,7 @@ public class AntenatalExaminationFacade { model = list.get(0); } try { - if(null!=model){ + if(null!=model&&StringUtils.isNotEmpty(model.getRiskFactor())){ List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); return queryRisk(list1); } @@ -144,7 +144,7 @@ public class AntenatalExaminationFacade { antExChuModel = list1.get(0); } try { - if(null!=antExChuModel){ + if(null!=antExChuModel &&StringUtils.isNotEmpty(antExChuModel.getHighrisk())){ List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); return queryRisk(list2); } @@ -375,13 +375,17 @@ public class AntenatalExaminationFacade { AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult(); antenatalExaminationResult.convertToResult(examinationModel); try { - List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class); - antenatalExaminationResult.setRiskFactor(queryRisk(list1)); + if(StringUtils.isNotEmpty(examinationModel.getRiskFactor())){ + List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class); + antenatalExaminationResult.setRiskFactor(queryRisk(list1)); + } } catch (Exception e) { } try { - List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class); - antenatalExaminationResult.setDiagnosis(queryRisk(list)); + if(StringUtils.isNotEmpty(examinationModel.getDiagnosis())) { + List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class); + antenatalExaminationResult.setDiagnosis(queryRisk(list)); + } } catch (Exception e) { } ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); @@ -405,13 +409,17 @@ public class AntenatalExaminationFacade { } antexChuResult.convertToResult(antExChuModel); try { - List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); - antexChuResult.setDiagnosis(queryRisk(list)); + if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){ + List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); + antexChuResult.setDiagnosis(queryRisk(list)); + } } catch (Exception e) { } try { - List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - antexChuResult.setHighrisk(queryRisk(list1)); + if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { + List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); + antexChuResult.setHighrisk(queryRisk(list1)); + } } catch (Exception e) { } ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); -- 1.8.3.1