From cbd78ff93ecce0ebf3a19814c488f66915c9f4df Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 30 Aug 2017 11:07:39 +0800
Subject: [PATCH] update code

---
 .../com/lyms/hospitalapi/dzfy/DzfyHisService.java  | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
index ea63e19..2861a1a 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
@@ -454,22 +454,32 @@ public class DzfyHisService {
      * @param vcCardNo  就诊卡号
      * @return
      */
-    public List<DzReplace> findAllVcCarddNo(String vcCardNo){
+    public List<DzReplace> findAllVcCarddNo(String vcCardNo)
+    {
         List<DzReplace> allCardNoList = new ArrayList<DzReplace>();
-        if (StringUtils.isNotBlank(vcCardNo)) {
+        if (StringUtils.isNotBlank(vcCardNo))
+        {
             System.out.println("vcCardNo = " + vcCardNo);
             Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection();
             QueryRunner queryRunner = new QueryRunner(true);
             String sql = "select id as id from zlhis.v_patientinfo where cardno =  '"+vcCardNo+"'";
-            try{
+            try
+            {
                 List<DzReplace> hisDzReplaceList = queryRunner.query(conn,sql,new BeanListHandler<DzReplace>(DzReplace.class));
-                String jzkSql = "select 病人ID as id,卡号 as cardNo,登记记录 as combTime from zlhis.jzkghjl where 病人ID = '"+hisDzReplaceList.get(0).getId()+"'";
-                allCardNoList = queryRunner.query(conn,jzkSql,new BeanListHandler<DzReplace>(DzReplace.class));
-                System.out.println("vcCardNo  list   " + allCardNoList);
-            }catch (Exception e){
+                if (CollectionUtils.isNotEmpty(hisDzReplaceList))
+                {
+                    String jzkSql = "select 病人ID as id,卡号 as cardNo,登记记录 as combTime from zlhis.jzkghjl where 病人ID = '"+hisDzReplaceList.get(0).getId()+"'";
+                    allCardNoList = queryRunner.query(conn,jzkSql,new BeanListHandler<DzReplace>(DzReplace.class));
+                    System.out.println("vcCardNo  list   " + allCardNoList);
+                }
+            }
+            catch (Exception e)
+            {
                 DbUtils.closeQuietly(conn);
                 ExceptionUtils.catchException(e, "dz his exception ");
-            }finally {
+            }
+            finally
+            {
                 DbUtils.closeQuietly(conn);
             }
         }
-- 
1.8.3.1