From 9cbaac4079d44dfea5bba15ff1331f546eed0d2a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 13 Jul 2016 16:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/pojo/AntenatalExaminationModel.java   | 31 ++++++++++++++-------
 .../platform/operate/web/facade/PatientFacade.java |  2 +-
 .../operate/web/request/AntExAddRequest.java       | 32 ++++++++++++++++------
 .../lyms/platform/operate/web/result/AntData.java  |  4 ++-
 .../web/result/AntenatalExaminationResult.java     | 31 +++++++++++++++------
 5 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
index 14cba9c..e7f5027 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
@@ -83,13 +83,22 @@ public class AntenatalExaminationModel {
     //产检医生
     private String checkDoctor;
     //产检日期
-    private String checkDate;
+    private Date checkDate;
     //下次产检日期
-    private String nextCheckTime;
+    private Date nextCheckTime;
     private Integer yn;
     private Date created;
     private Date modified;
     private String hospitalId;
+    private String cDueWeek;
+
+    public String getcDueWeek() {
+        return cDueWeek;
+    }
+
+    public void setcDueWeek(String cDueWeek) {
+        this.cDueWeek = cDueWeek;
+    }
 
     public Date getModified() {
         return modified;
@@ -163,13 +172,7 @@ public class AntenatalExaminationModel {
         this.bp = bp;
     }
 
-    public String getCheckDate() {
-        return checkDate;
-    }
 
-    public void setCheckDate(String checkDate) {
-        this.checkDate = checkDate;
-    }
 
     public String getCheckDoctor() {
         return checkDoctor;
@@ -243,11 +246,19 @@ public class AntenatalExaminationModel {
         this.id = id;
     }
 
-    public String getNextCheckTime() {
+    public Date getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(Date checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    public Date getNextCheckTime() {
         return nextCheckTime;
     }
 
-    public void setNextCheckTime(String nextCheckTime) {
+    public void setNextCheckTime(Date nextCheckTime) {
         this.nextCheckTime = nextCheckTime;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 5ea33b6..7afb7d9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -271,7 +271,7 @@ public class PatientFacade {
             List<AntenatalExaminationModel> ant = antExService.queryAntenatalExamination(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
             String nextCheckTime = "";
             if (CollectionUtils.isNotEmpty(ant)) {
-                nextCheckTime = ant.get(0).getNextCheckTime();
+                nextCheckTime = DateUtil.getyyyy_MM_dd(ant.get(0).getNextCheckTime());
             }
             chanResult.setNextCheckTime(nextCheckTime);
             data.add(chanResult);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index 7fdee1c..768c7bf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request;
 
 import com.lyms.platform.common.base.IBasicRequestConvert;
 import com.lyms.platform.common.core.annotation.form.Form;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import org.codehaus.jackson.annotate.JsonIgnore;
@@ -69,9 +70,21 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     //产检日期
     private String checkDate;
     //下次产检日期
-    private Map nextCheckTime;
+    private String nextCheckTime;
+    private String cDueWeek;
 
 
+    public String getcDueWeek() {
+        return cDueWeek;
+    }
+
+    public void setcDueWeek(String cDueWeek) {
+        this.cDueWeek = cDueWeek;
+    }
+
+    public void setNextCheckTime(String nextCheckTime) {
+        this.nextCheckTime = nextCheckTime;
+    }
 
     public String getTypeYc() {
         return typeYc;
@@ -108,9 +121,14 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setTreatmentOpinion(treatmentOpinion);
         examinationModel.setGuide(guide);
         examinationModel.setCheckDoctor(checkDoctor);
-        examinationModel.setCheckDate(checkDate);
-        examinationModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
-
+        if(null!=checkDate){
+            examinationModel.setCheckDate(DateUtil.parseYMD(checkDate));
+        }
+        if(null!=nextCheckTime){
+
+            examinationModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
+        }
+examinationModel.setcDueWeek(cDueWeek);
         return examinationModel;
     }
 
@@ -226,14 +244,10 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         this.id = id;
     }
 
-    public Map getNextCheckTime() {
+    public String getNextCheckTime() {
         return nextCheckTime;
     }
 
-    public void setNextCheckTime(Map nextCheckTime) {
-        this.nextCheckTime = nextCheckTime;
-    }
-
     public Map getOtherRisk() {
         return otherRisk;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
index ff862de..a64099a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
@@ -51,7 +51,9 @@ public class AntData {
     public AntData(AntenatalExaminationModel model,String hospitalName) {
         this.id = model.getId();
         this.dueWeek = model.getCurrentDueDate();
-        this.checkTime = model.getCheckDate();
+        if(null!=model.getCheckDate()){
+            this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckDate());
+        }
         this.title="复诊";
         this.type="3";
         this.hospitalName=hospitalName;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index a404fdb..5ac6436 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.base.IBasicResultConvert;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 
@@ -68,11 +69,24 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //产检日期
     private String checkDate;
     //下次产检日期
-    private Map nextCheckTime;
+    private String nextCheckTime;
     //是否有转诊
     private int hasRefer;
     //是否有产筛
     private int hasSieve;
+    private String cDueWeek;
+
+    public String getcDueWeek() {
+        return cDueWeek;
+    }
+
+    public void setcDueWeek(String cDueWeek) {
+        this.cDueWeek = cDueWeek;
+    }
+
+    public void setNextCheckTime(String nextCheckTime) {
+        this.nextCheckTime = nextCheckTime;
+    }
 
     public int getHasRefer() {
         return hasRefer;
@@ -90,13 +104,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         this.hasSieve = hasSieve;
     }
 
-    public Map getNextCheckTime() {
-        return nextCheckTime;
-    }
 
-    public void setNextCheckTime(Map nextCheckTime) {
-        this.nextCheckTime = nextCheckTime;
-    }
 
     @Override
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
@@ -114,12 +122,17 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         } catch (Exception e) {
         }
         try {
-            setNextCheckTime(JsonUtil.str2Obj(destModel.getNextCheckTime(),Map.class));
+            if(null!=destModel.getNextCheckTime()){
+                setNextCheckTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
+            }
+            if(null!=destModel.getCheckDate()){
+                setCheckDate(DateUtil.getyyyy_MM_dd(destModel.getCheckDate()));
+            }
         }catch (Exception e){
         }
 
         setChiefComplaint(destModel.getChiefComplaint());
-        setCheckDate(destModel.getCheckDate());
+
         setCheckDoctor(destModel.getCheckDoctor());
         setCurrentDueDate(destModel.getCurrentDueDate());
         setGuide(destModel.getGuide());
-- 
1.8.3.1