From 7fcb9fdbf0fe7f509b19c38f787cee1442e7735b Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 13 Dec 2016 13:56:57 +0800
Subject: [PATCH] =?UTF-8?q?his=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/hospitalapi/pojo/PregPatientinfo.java     |  8 ++++++++
 .../com/lyms/hospitalapi/qhdfy/QhdfyHisService.java    | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
index 6eeb056..be25bbf 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
@@ -26,10 +26,18 @@ public class PregPatientinfo {
     private String P_MOBILEPHONE;
     private String P_IDNUM;
     private Date P_BIRTHDAY;
+    private String BIRTH;
     private Date CREATED;
     //门诊或者是住院
     private String SICKTYPE;
 
+    public String getBIRTH() {
+        return BIRTH;
+    }
+
+    public void setBIRTH(String BIRTH) {
+        this.BIRTH = BIRTH;
+    }
 
     public String getSICKTYPE() {
         return SICKTYPE;
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index d05c676..f4dbab7 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -335,7 +336,7 @@ public class QhdfyHisService {
             Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
             QueryRunner queryRunner = new QueryRunner();
             try {
-                List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,cardno as P_CARDNO,hzxm as P_NAME, sex as P_SEX, birth as P_BIRTHDAY, sfzh as P_IDNUM, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
+                List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,hzxm as P_NAME, sex as P_SEX, birth as BIRTH, sfzh as P_CARDNO, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
                 if (list.size() > 0) {
                     for (PregPatientinfo info:list) {
                         Map<String,Object> map = new HashMap<>();
@@ -348,7 +349,7 @@ public class QhdfyHisService {
                         map.put("name", info.getP_NAME());
                         map.put("cardNo", info.getP_CARDNO());
                         map.put("phone", info.getP_MOBILEPHONE());
-                        map.put("birth", DateUtil.getyyyy_MM_dd(info.getP_BIRTHDAY()));
+                        map.put("birth", DateUtil.getyyyy_MM_dd(parseYmd(info.getBIRTH())));
                         result.add(map);
                     }
                 }
@@ -361,6 +362,19 @@ public class QhdfyHisService {
         return result;
     }
 
+
+    public static Date parseYmd(String s) {
+        SimpleDateFormat ymd = new SimpleDateFormat("yyyyMMdd");
+        if (s == null) {
+            return null;
+        }
+        try {
+            return ymd.parse(s);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     public List<Map<String,Object>> queryHisBabyDiagnosis(String blNo) {
 
         List<Map<String,Object>> result = new ArrayList<>();
-- 
1.8.3.1