From 8e066986db28f0799a30e88bbd8be65adf471539 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Sat, 1 Apr 2017 16:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/hospitalapi/pojo/CheckByDate.java     | 38 +++++++++++-----------
 .../lyms/hospitalapi/qhdfy/QhdfyHisService.java    |  6 ++--
 .../java/com/lyms/hospitalapi/v1/HisService.java   |  1 +
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckByDate.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckByDate.java
index 48ec246..4f51ae0 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckByDate.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckByDate.java
@@ -11,22 +11,22 @@ import java.util.List;
 public class CheckByDate {
 
 
-	private String time;
-	private List<CheckType> types;
-
-	public String getTime() {
-		return time;
-	}
-	public void setTime(String time) {
-		this.time = time;
-	}
-	public List<CheckType> getTypes() {
-		return types;
-	}
-	public void setTypes(List<CheckType> types) {
-		this.types = types;
-	}
-	
-	
-	
-}
+    private String time;
+    private List<CheckType> types;
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public List<CheckType> getTypes() {
+        return types;
+    }
+
+    public void setTypes(List<CheckType> types) {
+        this.types = types;
+    }
+}
\ No newline at end of file
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 fc94a17..bf1de1d 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
@@ -286,7 +286,7 @@ public class QhdfyHisService {
     public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){
 
         CheckResponse check1=new CheckResponse();
-        check1.setModified(DateUtil.parseYMDHMS("1452126368000"));
+        check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
         check1.setType(1);
         check1.setName("张三");
         check1.setTitle("血常规");
@@ -297,7 +297,7 @@ public class QhdfyHisService {
         check1.setDoctor("王医生");
 
         CheckResponse check10=new CheckResponse();
-        check10.setModified(DateUtil.parseYMDHMS("1452126368000"));
+        check10.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
         check10.setType(1);
         check10.setName("张三");
         check10.setTitle("肝功能");
@@ -308,7 +308,7 @@ public class QhdfyHisService {
         check10.setDoctor("刘医生");
 
         CheckResponse check9=new CheckResponse();
-        check9.setModified(DateUtil.parseYMDHMS("1452126368000"));
+        check9.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
         check9.setType(2);
         check9.setName("张三");
         check9.setTitle("肝功能");
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
index d4e33bb..c276eff 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
@@ -125,6 +125,7 @@ public class HisService {
         check10.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
         check10.setCheckDept("肝科");
         check10.setDoctor("刘医生");
+
         
         CheckResponse check9=new CheckResponse();
         check9.setModified(DateUtil.parseYMDHMS("2017-3-31"));
-- 
1.8.3.1