From dafeb79cc55f26405e9a5f8d9c4d4e2dc6f1e7fb Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Mon, 26 Aug 2019 15:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E8=BD=AC=E8=AF=8Abug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/ReferralApplyOrderQuery.java | 16 ++++++++++++++++
 .../platform/operate/web/facade/ApplyOrderFacade.java    | 14 ++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

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 ca7a2f7..47bc208 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
@@ -88,12 +88,23 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
      * 末次月经
      */
     private Date lastMensesEnd;
+
+    private Date lastMenses;
     //患者ID
     private List<String> parentIds;
 
     //查询号
     private String queryNo;
 
+
+    public Date getLastMenses() {
+        return lastMenses;
+    }
+
+    public void setLastMenses(Date lastMenses) {
+        this.lastMenses = lastMenses;
+    }
+
     public String getQueryNo() {
         return queryNo;
     }
@@ -333,6 +344,11 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
         if (null != serviceStatus) {
             condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);
         }
+
+        if (null != lastMenses) {
+            condition = condition.and("lastMenses", lastMenses, MongoOper.IS);
+        }
+
         if (null != status) {
             condition = condition.and("status", status, MongoOper.IS);
         }
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 4008ec8..487a9f5 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
@@ -1364,6 +1364,8 @@ public class ApplyOrderFacade {
 
     public BaseResponse auditMessages(Integer userId, String id, String state, String reason) {
         ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(id);
+
+        ReferralApplyOrderModel archiveModel = new ReferralApplyOrderModel();
         String hospital = autoMatchFacade.getHospitalId(userId);
         if (null != referralApplyOrderModel) {
             ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
@@ -1373,10 +1375,14 @@ public class ApplyOrderFacade {
                 patients.setEnable("1");
                 patientsService.updatePatientOne(patients, referralApplyOrderModel.getParentId());
             }
-            referralApplyOrderQuery.setId(id);
-            referralApplyOrderModel.setStatus(Integer.parseInt(state));
-            referralApplyOrderModel.setReason(reason);
-            applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel);
+            referralApplyOrderQuery.setPid(referralApplyOrderModel.getPid());
+            referralApplyOrderQuery.setLastMenses(referralApplyOrderModel.getLastMenses());
+            referralApplyOrderQuery.setStatus(1);
+           /* referralApplyOrderQuery.setHospitalId(hospital);
+            referralApplyOrderQuery.setTransferredHospital(hospital);*/
+            archiveModel.setStatus(Integer.parseInt(state));
+            archiveModel.setReason(reason);
+            applyOrderService.updateByParentId(referralApplyOrderQuery, archiveModel);
         }
         return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
-- 
1.8.3.1