From 915fb27ae0683b96bf9ee5ccf158bc47a5408f59 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 11 May 2018 17:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java    | 12 +++++++++++-
 .../java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java     | 13 +++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java
index 7eeddd9..2dd17fd 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java
@@ -9,7 +9,8 @@ public class FmItem {
     private String syxh;	//	病人唯一标识
     private String yexh;  // //0		传入‘0’
     private String jlrq;	//	格式如下：2016071122:15:57
-    private String ssrq;////出生日期	char（16）	格式如下：2016071122:15:57
+    private String ssrq;
+    private String csrq;////出生日期	char（16）	格式如下：2016071122:15:57
     private String  ssj;////婴儿序号		前台填写的婴儿序号
     private String  yexb;////婴儿性别		传入‘男’或‘女’汉字
     private String  rc;//妊娠	妊娠几周
@@ -42,6 +43,14 @@ public class FmItem {
     private String srks;//输入科室
     private String jsz;//接生者
 
+    public String getCsrq() {
+        return csrq;
+    }
+
+    public void setCsrq(String csrq) {
+        this.csrq = csrq;
+    }
+
     public String getSyxh() {
         return trim(syxh);
     }
@@ -338,6 +347,7 @@ public class FmItem {
                 ", yexh='" + yexh + '\'' +
                 ", jlrq='" + jlrq + '\'' +
                 ", ssrq='" + ssrq + '\'' +
+                ", csrq='" + csrq + '\'' +
                 ", ssj='" + ssj + '\'' +
                 ", yexb='" + yexb + '\'' +
                 ", rc='" + rc + '\'' +
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
index b629a7b..ae1b2ed 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
@@ -189,7 +189,8 @@ public class QhdfyFmService {
 
         String cloumns = "  SYXH     as      syxh,\n" +
                 "     YEXH     as      yexh,\n" +
-                "     JLRQ     as      jlrq,\t\n" +
+                "     JLRQ     as      jlrq,\n" +
+                "     CSRQ     as      csrq,\n" +
                 "     SSRQ     as      ssrq,\n" +
                 "     SSJ      as      ssj,\n" +
                 "     yexb     as      yexb,\n" +
@@ -229,9 +230,9 @@ public class QhdfyFmService {
         SimpleDateFormat fmt2 = new SimpleDateFormat("yyyyMMdd");
         SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             try {
-                String sql ="select "+cloumns+" from JHMK_FMJL   where " +
+                String sql ="select "+cloumns+" from JHMK_FMJL_LYMS   where " +
                         " CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) >  CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) <=  CONVERT(DATETIME,'"+end+"', 120)" +
-                        " and SYXH not in (select SYXH from JHMK_FMJL   where  JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and CCQK is not null and CCQK <> ''  " +
+                        " and SYXH not in (select SYXH from JHMK_FMJL_LYMS   where  JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and CCQK is not null and CCQK <> ''  " +
                         " and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ')) ";
 
                 if (StringUtils.isNotEmpty(syxh))
@@ -265,10 +266,10 @@ public class QhdfyFmService {
 
                             Date dueTime = null;
                             try{
-                                dueTime = fmt.parse(item.getJlrq());
+                                dueTime = fmt.parse(item.getCsrq());
                             }catch (Exception e)
                             {
-                                dueTime = fmt2.parse(item.getJlrq());
+                                dueTime = fmt2.parse(item.getCsrq());
                             }
 
 
@@ -417,7 +418,7 @@ public class QhdfyFmService {
                     }
                 }
 
-                String sql1="select  "+cloumns+" from JHMK_FMJL   where  JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> ''   " +
+                String sql1="select  "+cloumns+" from JHMK_FMJL_LYMS   where  JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> ''   " +
                         " and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ') and " +
                         " CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) >  CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) <=  CONVERT(DATETIME,'"+end+"', 120)";
 
-- 
1.8.3.1