Commit fa3f0555cbc2e86f0c456c35193cb38ced695596
1 parent
d6e00c666f
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 12 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
fa3f055
| ... | ... | @@ -990,16 +990,14 @@ |
| 990 | 990 | Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); |
| 991 | 991 | QueryRunner queryRunner = new QueryRunner(); |
| 992 | 992 | String sql = "select syxh from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "' and cyrq is not null and ksdm ='2545' and bqdm = '206' "; |
| 993 | - logger.info("----1-----VW_LYMS_XSE_BRSYK---------"+sql); | |
| 994 | 993 | try { |
| 995 | 994 | List<BabyDischargeDiagnosisModel> list = queryRunner.query(conn,sql , new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class)); |
| 996 | 995 | if (CollectionUtils.isNotEmpty(list)) { |
| 997 | 996 | for (BabyDischargeDiagnosisModel info : list) { |
| 998 | - if(info!=null && StringUtils.isNotEmpty(info.getSyxh())){ | |
| 997 | + if(info == null && StringUtils.isEmpty(info.getSyxh())){ | |
| 999 | 998 | continue; |
| 1000 | 999 | } |
| 1001 | 1000 | String sqlstr = "select ZDMC as cyzdmc from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc "; |
| 1002 | - logger.info("----2-----hemr.V_DIAGNOSIS_LYMS---------"+sqlstr); | |
| 1003 | 1001 | Connection conn2 = null; |
| 1004 | 1002 | try { |
| 1005 | 1003 | conn2 = ConnTools.qhdzdConnection(); |
| ... | ... | @@ -1009,7 +1007,11 @@ |
| 1009 | 1007 | for (int j = 0; j < listxq.size(); j++) { |
| 1010 | 1008 | BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j); |
| 1011 | 1009 | if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){ |
| 1012 | - cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; | |
| 1010 | + if((listxq.size()-1) != j){ | |
| 1011 | + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+"，"; | |
| 1012 | + }else { | |
| 1013 | + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; | |
| 1014 | + } | |
| 1013 | 1015 | } |
| 1014 | 1016 | } |
| 1015 | 1017 | if(StringUtils.isNotEmpty(cyzdxq)){ |
| 1016 | 1018 | |
| ... | ... | @@ -1246,8 +1248,13 @@ |
| 1246 | 1248 | for (int j = 0; j < listxq.size(); j++) { |
| 1247 | 1249 | BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j); |
| 1248 | 1250 | if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){ |
| 1249 | - cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; | |
| 1251 | + if((listxq.size()-1) != j){ | |
| 1252 | + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+"，"; | |
| 1253 | + }else { | |
| 1254 | + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" "; | |
| 1255 | + } | |
| 1250 | 1256 | } |
| 1257 | + | |
| 1251 | 1258 | } |
| 1252 | 1259 | if(StringUtils.isNotEmpty(cyzdxq)){ |
| 1253 | 1260 | babyDischargeDiagnosisModel.setCyzdmc(cyzdxq);//将诊断详情覆盖以前的主要诊断 |