From f04e1dcf7811de38bf5c6e32d48b04847a180251 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 13 Jul 2016 15:43:19 +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/biz/dal/impl/AntExChuDaoImpl.java     |  2 ++
 .../biz/dal/impl/AntenatalExaminationDaoImpl.java  |  2 ++
 .../java/com/lyms/platform/pojo/AntExChuModel.java | 11 ++++++++
 .../platform/pojo/AntenatalExaminationModel.java   | 10 ++++++-
 .../platform/pojo/ReferralApplyOrderModel.java     |  9 +-----
 .../platform/query/ReferralApplyOrderQuery.java    | 33 ++++++++++++++++------
 .../operate/web/facade/ApplyOrderFacade.java       |  2 +-
 .../web/request/ApplyOrderQueryRequest.java        | 21 ++++++++++----
 8 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java
index 3565920..0d5c7d6 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java
@@ -9,6 +9,7 @@ import com.lyms.platform.pojo.AntExChuModel;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,6 +45,7 @@ public class AntExChuDaoImpl  extends BaseMongoDAOImpl<AntExChuModel> implements
      * @param mongoQuery
      */
     public  void updateOneAntEx(MongoQuery mongoQuery,AntExChuModel antExChuModel){
+        antExChuModel.setModified(new Date());
         findAndModify(mongoQuery.convertToMongoQuery(),antExChuModel);
     }
 
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
index 23b0a3f..ba6e9a4 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java
@@ -9,6 +9,7 @@ import com.lyms.platform.common.dao.operator.Page;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,6 +24,7 @@ public class AntenatalExaminationDaoImpl  extends BaseMongoDAOImpl<AntenatalExam
 
     @Override
     public void updateAntenatalExamination(AntenatalExaminationModel obj, String id) {
+        obj.setModified(new Date());
         update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
     }
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
index 0485241..b44b23c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
@@ -232,6 +232,15 @@ public class AntExChuModel implements Serializable {
     private String  totalBilirubin;
     // 结合胆红素
     private String  jhBilirubin  ;
+
+    public Date getModified() {
+        return modified;
+    }
+
+    public void setModified(Date modified) {
+        this.modified = modified;
+    }
+
     //乙肝表面抗原
     private String   ygbmky;
     //乙肝表面抗体
@@ -255,6 +264,8 @@ public class AntExChuModel implements Serializable {
     //  阴道清洁度
     private String  ydqjd;
 
+    private Date modified;
+
 
 
     public String getCestationInfo() {
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 d3a0f76..14cba9c 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
@@ -88,9 +88,17 @@ public class AntenatalExaminationModel {
     private String nextCheckTime;
     private Integer yn;
     private Date created;
-
+    private Date modified;
     private String hospitalId;
 
+    public Date getModified() {
+        return modified;
+    }
+
+    public void setModified(Date modified) {
+        this.modified = modified;
+    }
+
     public String getHospitalId() {
         return hospitalId;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
index 0876cc2..90655f2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
@@ -21,7 +21,7 @@ public class ReferralApplyOrderModel {
     //患者年龄
     private Integer age;
     //孕周
-    private String dueWeek;
+//    private String dueWeek;
     //身份证号
     private String cardNo;
     //预产期
@@ -98,13 +98,6 @@ public class ReferralApplyOrderModel {
         this.dueDate = dueDate;
     }
 
-    public String getDueWeek() {
-        return dueWeek;
-    }
-
-    public void setDueWeek(String dueWeek) {
-        this.dueWeek = dueWeek;
-    }
 
     public String getName() {
         return name;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
index 7401b19..d380892 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
@@ -7,6 +7,8 @@ import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
 import com.lyms.platform.common.dao.operator.MongoQuery;
 
+import java.util.Date;
+
 /**
  * Created by Administrator on 2016/6/15 0015.
  */
@@ -31,7 +33,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
     //年龄
     private String age;
     //孕周
-    private String dueWeek;
+    private Date dueDateStart;
+    //孕周
+    private Date dueDateEnd;
     //风险等级
     private String rLevel;
     private Integer score;
@@ -82,6 +86,22 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
         this.id = id;
     }
 
+    public Date getDueDateEnd() {
+        return dueDateEnd;
+    }
+
+    public void setDueDateEnd(Date dueDateEnd) {
+        this.dueDateEnd = dueDateEnd;
+    }
+
+    public Date getDueDateStart() {
+        return dueDateStart;
+    }
+
+    public void setDueDateStart(Date dueDateStart) {
+        this.dueDateStart = dueDateStart;
+    }
+
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition =  MongoCondition.newInstance();
@@ -109,8 +129,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
         if(null!=outHospitalId){
             condition=condition.and("outHospitalId",outHospitalId, MongoOper.IS);
         }
-        if(null!=dueWeek){
-            condition=condition.and("dueWeek",dueWeek, MongoOper.IS);
+        //需要修改
+        if(null!=dueDateEnd){
+            condition=condition.and("dueWeek",dueDateEnd, MongoOper.IS);
         }
         if(null!=rLevel){
             condition=condition.and("rLevel",rLevel, MongoOper.IS);
@@ -147,13 +168,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
         this.cardNo = cardNo;
     }
 
-    public String getDueWeek() {
-        return dueWeek;
-    }
 
-    public void setDueWeek(String dueWeek) {
-        this.dueWeek = dueWeek;
-    }
 
     public String getName() {
         return name;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index a9b4eb0..7d36085 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -163,7 +163,7 @@ public class ApplyOrderFacade {
         ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
         referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
         referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge());
-        referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeek());
+        referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeekStart());
         referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor());
         referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel());
         referralApplyOrderQuery.setScore(applyOrderQueryRequest.getScore());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java
index 96e2984..d94bae2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java
@@ -31,7 +31,10 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest {
     //年龄
     private String age;
     //孕周
-    private String dueWeek;
+    private String dueWeekStart;
+
+    private String getDueWeekEnd;
+
     //风险等级
     private String rLevel;
     private Integer score;
@@ -85,12 +88,20 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest {
         this.age = age;
     }
 
-    public String getDueWeek() {
-        return dueWeek;
+    public String getDueWeekStart() {
+        return dueWeekStart;
+    }
+
+    public void setDueWeekStart(String dueWeekStart) {
+        this.dueWeekStart = dueWeekStart;
+    }
+
+    public String getGetDueWeekEnd() {
+        return getDueWeekEnd;
     }
 
-    public void setDueWeek(String dueWeek) {
-        this.dueWeek = dueWeek;
+    public void setGetDueWeekEnd(String getDueWeekEnd) {
+        this.getDueWeekEnd = getDueWeekEnd;
     }
 
     public String getRiskFactor() {
-- 
1.8.3.1