From 9fa470f6b01f1baba77a1831306670f9fd80c2b4 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Jun 2017 11:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=AB=98=E5=8D=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 47 ++++++++++++---------- 1 file changed, 25 insertions(+), 22 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 dab490c..0de8437 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 @@ -2219,31 +2219,34 @@ public class AntenatalExaminationFacade { } } } - AntExChuQuery antExChuQuery =new AntExChuQuery(); - antExChuQuery.setHospitalId(hospitalId); - antExChuQuery.setParentId(parentId); - antExChuQuery.setYn(YnEnums.YES.getId()); - List chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery); - if(CollectionUtils.isNotEmpty(chuModelList)){ - for(AntExChuModel chu:chuModelList){ - String zybd=chu.getZyqbd(); - String ntjc= chu.getNtjc(); - String cqsc= chu.getCjsc(); - String text= chu.getTextpjbc(); - String s75gdgtt= chu.getS75gdgtt(); - String jzxgn= chu.getJzxgn(); - if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| - StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75gdgtt)||StringUtils.isNotEmpty(jzxgn)){ - m.put("zybd",zybd); - m.put("ntjc",ntjc); - m.put("cjsc",cqsc); - m.put("textpjbc",text); - m.put("s75gdgtt",s75gdgtt); - m.put("jzxgn",jzxgn); - break; + if(CollectionUtils.isEmpty(examinationModelList)){ + AntExChuQuery antExChuQuery =new AntExChuQuery(); + antExChuQuery.setHospitalId(hospitalId); + antExChuQuery.setParentId(parentId); + antExChuQuery.setYn(YnEnums.YES.getId()); + List chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery); + if(CollectionUtils.isNotEmpty(chuModelList)){ + for(AntExChuModel chu:chuModelList){ + String zybd=chu.getZyqbd(); + String ntjc= chu.getNtjc(); + String cqsc= chu.getCjsc(); + String text= chu.getTextpjbc(); + String s75gdgtt= chu.getS75gdgtt(); + String jzxgn= chu.getJzxgn(); + if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75gdgtt)||StringUtils.isNotEmpty(jzxgn)){ + m.put("zybd",zybd); + m.put("ntjc",ntjc); + m.put("cjsc",cqsc); + m.put("textpjbc",text); + m.put("s75gdgtt",s75gdgtt); + m.put("jzxgn",jzxgn); + break; + } } } } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("").setData(m); } -- 1.8.3.1