diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index a0ecddc..a533a85 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -114,6 +114,15 @@
         <if test="vcCardNo != null and vcCardNo != ''">
             AND VCCARDNO = #{vcCardNo}
         </if>
+
+        <if test="vcCardNos != null and vcCardNos.size() !=0 ">
+            AND VCCARDNO IN
+            <foreach collection="vcCardNos" item="vc"
+                     index="index" open="(" close=")" separator=",">
+                #{vc}
+            </foreach>
+        </if>
+
         <if test="phone != null and phone != ''">
             AND  PHONE = #{phone}
         </if>
@@ -132,6 +141,7 @@
                 #{title}
             </foreach>
         </if>
+
     </select>
 
 
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 dfa9b39..ea63e19 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
@@ -451,41 +451,58 @@ public class DzfyHisService {
 
     /**德州
      * 获取患者使用过的所有就诊卡号
-     * @param cardNo  就诊卡号
+     * @param vcCardNo  就诊卡号
      * @return
      */
-    public List<DzReplace> findAllCradNo(String cardNo){
+    public List<DzReplace> findAllVcCarddNo(String vcCardNo){
         List<DzReplace> allCardNoList = new ArrayList<DzReplace>();
-        if (StringUtils.isNotBlank(cardNo)) {
+        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 =  '"+cardNo+"'";
+            String sql = "select id as id from zlhis.v_patientinfo where cardno =  '"+vcCardNo+"'";
             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){
-
-                e.printStackTrace();
-
+                DbUtils.closeQuietly(conn);
+                ExceptionUtils.catchException(e, "dz his exception ");
+            }finally {
+                DbUtils.closeQuietly(conn);
             }
-
-
         }
-
         return allCardNoList;
     }
 
 
-
-
-
-
-
-
+    /**
+     * 通过就诊卡号查询到当前就诊卡号使用人的历史就诊卡号
+     * @param vcCardNo
+     * @return
+     */
+    public List<String> getDzVcCardNos(String vcCardNo)
+    {
+        List<String> vcCardNos = new ArrayList<>();
+        List<DzReplace> list = findAllVcCarddNo(vcCardNo);
+
+        if (CollectionUtils.isNotEmpty(list))
+        {
+            for (DzReplace dz : list)
+            {
+                if (dz != null && StringUtils.isNotEmpty(dz.getCardNo()))
+                {
+                    vcCardNos.add(dz.getCardNo());
+                }
+            }
+        }
+        else
+        {
+            vcCardNos.add(vcCardNo);
+        }
+        return vcCardNos;
+    }
 
 
     public static Date parseYmd(String s) {
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/DzReplace.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/DzReplace.java
index 4ca7000..38f3de8 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/DzReplace.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/DzReplace.java
@@ -32,4 +32,13 @@ public class DzReplace {
     public void setCombTime(String combTime) {
         this.combTime = combTime;
     }
+
+    @Override
+    public String toString() {
+        return "DzReplace{" +
+                "id='" + id + '\'' +
+                ", cardNo='" + cardNo + '\'' +
+                ", combTime='" + combTime + '\'' +
+                '}';
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index be05411..96da968 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -59,6 +59,9 @@ public class LisFacade {
     private QhdfyHisService qhdfyHisService;
 
     @Autowired
+    private DzfyHisService dzfyHisService;
+
+    @Autowired
     @Qualifier("commonThreadPool")
     private ThreadPoolTaskExecutor commonThreadPool;
 
@@ -464,7 +467,16 @@ public class LisFacade {
         //通过就诊卡号和医院id查询到医院下面的lis记录
         if (StringUtils.isNotEmpty(vcCardNo))
         {
-            model.setVcCardNo(vcCardNo);
+            //德州
+            if ("6".equals(HIS_VERSION))
+            {
+                model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
+            }
+            else
+            {
+                model.setVcCardNo(vcCardNo);
+            }
+
             List<LisReportModel> lises = lisService.queryLisDataByModel(model);
             if (CollectionUtils.isNotEmpty(lises))
             {