From 083525aa597fa197c0f14f5541d171d7b0e0d6d2 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 25 May 2018 17:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/msg/remote/AmsMessageService.java    | 2 +-
 .../java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
index e082183..c0ec6f7 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
@@ -173,7 +173,7 @@ public class AmsMessageService {
 //    }
 
     public static void main(String[] args) {
-        Map<String,List<MessageContent>> list = getMessageTemplateMap("216",
+        Map<String,List<MessageContent>> list = getMessageTemplateMap("197",
                 AmsServiceTypeEnum.CHILD_GUIDE);
         List<MessageContent> msgs = list.get("0周");
         System.out.println(list);
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 d47a548..4eb99b8 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
@@ -309,7 +309,7 @@ public class ApplyOrderFacade {
      */
     public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) {
         SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
-        String hospitalId = autoMatchFacade.getHospitalId(userId);
+        String hospitalId =  autoMatchFacade.getHospitalId(userId);
 
         //表示区域的
         if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
@@ -346,6 +346,7 @@ public class ApplyOrderFacade {
             SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
             sieveApplyOrderQuery.setStatus(0);
             sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
+            sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
             //查询转诊申请单
             List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
             if (CollectionUtils.isNotEmpty(list)) {
@@ -356,7 +357,7 @@ public class ApplyOrderFacade {
                         if (null != patients) {
                             SieveQuery sieveQuery = new SieveQuery();
                             sieveQuery.setYn(YnEnums.YES.getId());
-                            sieveQuery.setHospitalId(hospitalId);
+//                            sieveQuery.setHospitalId(hospitalId);
                             sieveQuery.setParentId(patients.getId());
                             List<SieveModel> modelList = sieveService.queryList(sieveQuery);
                             if (CollectionUtils.isEmpty(modelList)) {
-- 
1.8.3.1