diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index ef0f583..49e7da8 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -990,16 +990,14 @@ public class QhdfyHisService { Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); QueryRunner queryRunner = new QueryRunner(); String sql = "select syxh from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "' and cyrq is not null and ksdm ='2545' and bqdm = '206' "; - logger.info("----1-----VW_LYMS_XSE_BRSYK---------"+sql); try { List list = queryRunner.query(conn,sql , new BeanListHandler(BabyDischargeDiagnosisModel.class)); if (CollectionUtils.isNotEmpty(list)) { for (BabyDischargeDiagnosisModel info : list) { - if(info!=null && StringUtils.isNotEmpty(info.getSyxh())){ + if(info == null && StringUtils.isEmpty(info.getSyxh())){ continue; } String sqlstr = "select ZDMC as cyzdmc from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc "; - logger.info("----2-----hemr.V_DIAGNOSIS_LYMS---------"+sqlstr); Connection conn2 = null; try { conn2 = ConnTools.qhdzdConnection(); @@ -1009,7 +1007,11 @@ public class QhdfyHisService { for (int j = 0; j < listxq.size(); j++) { BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j); if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){ - cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; + if((listxq.size()-1) != j){ + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+","; + }else { + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; + } } } if(StringUtils.isNotEmpty(cyzdxq)){ @@ -1246,8 +1248,13 @@ public class QhdfyHisService { for (int j = 0; j < listxq.size(); j++) { BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j); if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){ - cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; + if((listxq.size()-1) != j){ + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+","; + }else { + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; + } } + } if(StringUtils.isNotEmpty(cyzdxq)){ babyDischargeDiagnosisModel.setCyzdmc(cyzdxq);//将诊断详情覆盖以前的主要诊断