From 2d349fae78f7998788138160c6479052f770f66e Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Mon, 28 Aug 2017 10:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E5=B7=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/hospitalapi/dzfy/DzfyHisService.java | 16 ++++++++--------
 .../main/java/com/lyms/hospitalapi/pojo/DzReplace.java | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 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 713e401..c2c38fa 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,21 +451,21 @@ public class DzfyHisService {
 
     /**德州
      * 获取患者使用过的所有就诊卡号
-     * @param CardNo  就诊卡号
+     * @param cardNo  就诊卡号
      * @return
      */
-    public List<DzReplace> FindAllCradnos(String CardNo){
-        List<DzReplace> allcardnoList = new ArrayList<DzReplace>();
-        if (StringUtils.isNotBlank(CardNo)) {
+    public List<DzReplace> findAllCradNo(String cardNo){
+        List<DzReplace> allCardNoList = new ArrayList<DzReplace>();
+        if (StringUtils.isNotBlank(cardNo)) {
             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 =  '"+cardNo+"'";
             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 B病人ID = '"+hisDzReplaceList.get(0).getId()+"'";
+                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));
+                allCardNoList = queryRunner.query(conn,jzkSql,new BeanListHandler<DzReplace>(DzReplace.class));
 
             }catch (Exception e){
 
@@ -476,7 +476,7 @@ public class DzfyHisService {
 
         }
 
-        return allcardnoList;
+        return allCardNoList;
     }
 
 
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 dd116d2..4ca7000 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
@@ -5,31 +5,31 @@ package com.lyms.hospitalapi.pojo;
  */
 public class DzReplace {
 
-    private String Id;//病人ID
-    private String CardNo;//就诊卡号
-    private String CombTime;//发卡时间
+    private String id;//病人ID
+    private String cardNo;//就诊卡号
+    private String combTime;//发卡时间
 
     public String getId() {
-        return Id;
+        return id;
     }
 
     public void setId(String id) {
-        Id = id;
+        this.id = id;
     }
 
     public String getCardNo() {
-        return CardNo;
+        return cardNo;
     }
 
     public void setCardNo(String cardNo) {
-        CardNo = cardNo;
+        this.cardNo = cardNo;
     }
 
     public String getCombTime() {
-        return CombTime;
+        return combTime;
     }
 
     public void setCombTime(String combTime) {
-        CombTime = combTime;
+        this.combTime = combTime;
     }
 }
-- 
1.8.3.1