From 7dfd26ac62adffc7990649eb67cd13f93326d504 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Mon, 9 Jan 2017 10:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/PatientsQuery.java     | 13 +++++++++++++
 .../web/facade/DischargeAbstractFacade.java        | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 4ccb6fb..5c7cdb2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -111,10 +111,20 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     //0 隐藏  1 显示
     private String enable="1";
 
+    private String notEnable;
+
     private Boolean extEnable;
     //区域来源
     private String source;
 
+    public String getNotEnable() {
+        return notEnable;
+    }
+
+    public void setNotEnable(String notEnable) {
+        this.notEnable = notEnable;
+    }
+
     public String getSource() {
         return source;
     }
@@ -1026,6 +1036,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("expVip", expVip, MongoOper.IS);
         }
 
+        if (null != notEnable) {
+            condition = condition.and("enable", notEnable, MongoOper.NE);
+        }
 
         if (null != orServiceStatus && orServiceStatus.length > 1) {
             condition = condition.and("serviceStatus", Arrays.asList(orServiceStatus), MongoOper.IN);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index c59f862..f1d9125 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -130,6 +130,13 @@ public class DischargeAbstractFacade {
         }
         Patients patients = patientsList.get(patientsList.size() - 1);
 
+        if (new Integer(1).equals(patients.getDueStatus())) {
+            // 终止妊娠不能进行出院小结
+            dischargeAbstractQueryResult.setStatus("5");
+            dischargeAbstractQueryResult.setErrormsg("终止妊娠不能进行出院小结");
+            return dischargeAbstractQueryResult;
+        }
+
         if (patients.getType() == 1) {
             // 如果是孕妇直接抛出，产妇才查询是否做过出院小结
             dischargeAbstractQueryResult.setStatus("1");
@@ -143,6 +150,21 @@ public class DischargeAbstractFacade {
             return dischargeAbstractQueryResult;
         }
 
+        String hospitalId;
+        try {
+            hospitalId = autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId());
+        } catch (Exception e) {
+            dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
+            dischargeAbstractQueryResult.setErrormsg("获取获取当前医院异常");
+            return dischargeAbstractQueryResult;
+        }
+
+        if (!hospitalId.equals(patients.getFmHospital())) {
+            dischargeAbstractQueryResult.setStatus("6");
+            dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结");
+            return dischargeAbstractQueryResult;
+        }
+
         BeanUtils.copy(patients, dischargeAbstractQueryResult);
         dischargeAbstractQueryResult.setPatientId(patients.getId());
         dischargeAbstractQueryResult.setUserName(patients.getUsername());
-- 
1.8.3.1