diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/DzfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/DzfyHisService.java
index 235c453..3c6805f 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/DzfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/DzfyHisService.java
@@ -1,19 +1,88 @@
 package com.lyms.hospitalapi.zcfy;
 
 import com.lyms.hospitalapi.pojo.DzReplace;
+import com.lyms.platform.common.utils.ExceptionUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.dbutils.DbUtils;
+import org.apache.commons.dbutils.QueryRunner;
+import org.apache.commons.dbutils.handlers.BeanListHandler;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.sql.Connection;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Created by Administrator on 2017/12/18.
  */
-@Service("dzfyHisService")
+@Service("zcfyHisService")
 public class DzfyHisService {
 
+
+    /**
+     * 查询病人的换卡记录
+     * @param vcCardNo
+     * @return
+     */
     public List<DzReplace> findAllVcCarddNo(String vcCardNo){
 
-        return null;
+        List<DzReplace> allCardNoList = new ArrayList<DzReplace>();
+        if (StringUtils.isNotBlank(vcCardNo))
+        {
+            System.out.println("vcCardNo = " + vcCardNo);
+            Connection conn = com.lyms.hospitalapi.zcfy.ConnTools.makeHisConnection();
+            QueryRunner queryRunner = new QueryRunner(true);
+            String sql = "select ID as id from userzcfy.lyms_v_patientinfo where CARDNO =  '"+vcCardNo+"'";
+            try
+            {
+                List<DzReplace> hisDzReplaceList = queryRunner.query(conn,sql,new BeanListHandler<DzReplace>(DzReplace.class));
+                if (CollectionUtils.isNotEmpty(hisDzReplaceList))
+                {
+                    String jzkSql = "select ID as id,VCCARDNO as cardNo from userzcfy.lyms_jiuzhenka 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, "zc 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 zc : list)
+            {
+                if (zc != null && StringUtils.isNotEmpty(zc.getCardNo()))
+                {
+                    vcCardNos.add(zc.getCardNo());
+                }
+            }
+        }
+        else
+        {
+            vcCardNos.add(vcCardNo);
+        }
+        return vcCardNos;
     }
 
 }