Commit b36fb736a3cadcaec536e03c2bc415e2c3f48b6d
1 parent
050e84c49c
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 23 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
b36fb73
... | ... | @@ -14,6 +14,7 @@ |
14 | 14 | import com.lyms.platform.pojo.*; |
15 | 15 | import com.lyms.platform.query.LisReportQuery; |
16 | 16 | import com.lyms.platform.query.PatientsQuery; |
17 | +import org.apache.commons.collections.CollectionUtils; | |
17 | 18 | import org.apache.commons.dbutils.DbUtils; |
18 | 19 | import org.apache.commons.dbutils.QueryRunner; |
19 | 20 | import org.apache.commons.dbutils.handlers.BeanListHandler; |
20 | 21 | |
21 | 22 | |
22 | 23 | |
23 | 24 | |
... | ... | @@ -385,16 +386,31 @@ |
385 | 386 | public Map<String,Object> queryHisBabyDiagnosis(String blNo) { |
386 | 387 | |
387 | 388 | Map<String,Object> map = new HashMap<>(); |
389 | + StringBuffer sb = new StringBuffer(); | |
388 | 390 | if (StringUtils.isNotBlank(blNo)) { |
389 | - Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); | |
391 | + Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeFmConnection(); | |
390 | 392 | QueryRunner queryRunner = new QueryRunner(); |
393 | + | |
391 | 394 | try { |
392 | - List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class)); | |
393 | - if (list.size() > 0) { | |
394 | - for (DiagnosisInfo info:list) { | |
395 | + // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class)); | |
396 | + List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class)); | |
397 | + if (CollectionUtils.isNotEmpty(list)) { | |
398 | +// for (DiagnosisInfo info:list) { | |
399 | +// map.put("diagnosisItem", info.getDiagnosisItem()); | |
400 | +// break; | |
401 | +// } | |
395 | 402 | |
396 | - map.put("diagnosisItem", info.getDiagnosisItem()); | |
397 | - break; | |
403 | + for (int i = 0 ; i < list.size() ; i++) | |
404 | + { | |
405 | + if (i < list.size() -1) | |
406 | + { | |
407 | + sb.append(list.get(i).getDiagnosisItem()); | |
408 | + sb.append(", "); | |
409 | + } | |
410 | + else | |
411 | + { | |
412 | + sb.append(list.get(i).getDiagnosisItem()); | |
413 | + } | |
398 | 414 | } |
399 | 415 | } |
400 | 416 | DbUtils.closeQuietly(conn); |
... | ... | @@ -403,6 +419,7 @@ |
403 | 419 | e.printStackTrace(); |
404 | 420 | } |
405 | 421 | } |
422 | + map.put("diagnosisItem", sb.toString()); | |
406 | 423 | return map; |
407 | 424 | } |
408 | 425 | } |