From 9d7ba9c2c8285dc512992e7599a90e056cc846a5 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Sat, 22 Feb 2020 17:06:46 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java  | 4 ++--
 .../java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 6 +++---
 2 files changed, 5 insertions(+), 5 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 47bc208..f1ec5aa 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
@@ -462,7 +462,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
 
         if (null != dueDateStart) {
             if (null != c) {
-                c = c.where("days").gte(dueDateStart);
+                c = c.and("days").gte(dueDateStart);
             } else {
                 c = Criteria.where("days").gte(dueDateStart);
             }
@@ -491,7 +491,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
         }
         if (null != birthStart) {
             if (null != c) {
-                c = c.where("birth").gte(birthStart);
+                c = c.and("birth").gte(birthStart);
             } else {
                 c = Criteria.where("birth").gte(birthStart);
             }
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 7ff02c0..e4f80d3 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
@@ -1272,13 +1272,13 @@ public class ApplyOrderFacade {
             map.put("applyDoctor", users.getName());
             map.put("create", DateUtil.getyyyy_MM_dd(reOrderModel.getCreated()));
             String hospital1 = "";
-            /*if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) {
+            if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) {
                 Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital()));
                 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                     hospital1 = organization.getName();
                 }
-            }*/
-            map.put("zhuanRname", reOrderModel.getTransferredHospital());
+            }
+            map.put("zhuanRname",hospital1);
             if (NumberUtils.isNumber(reOrderModel.getRecDoctor())) {
                 Users users1 = usersService.getUsers(NumberUtils.toInt(reOrderModel.getRecDoctor()));
                 if (null != users) {
-- 
1.8.3.1