From f4723358b371631d4e99a853a0790ded64522f8d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 27 Jun 2016 09:29:42 +0800
Subject: [PATCH] 1

---
 .../java/com/lyms/platform/permission/dao/OrganizationMapper.java   | 1 +
 .../com/lyms/platform/permission/service/OrganizationService.java   | 2 +-
 .../platform/permission/service/impl/OrganizationServiceImpl.java   | 3 +++
 platform-biz-service/src/main/resources/mainOrm/Organization.xml    | 3 +++
 .../lyms/platform/operate/web/controller/MatDeliverController.java  | 3 ++-
 .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 6 ++++++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java
index b26ecb4..7ca13d7 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java
@@ -20,4 +20,5 @@ public interface OrganizationMapper {
 
     List<String> queryProvinceIdByOrgId(List<Integer> orgList);
 
+    List<Organization> queryHospital();
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
index f5761a4..8190f0a 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
@@ -19,5 +19,5 @@ public interface OrganizationService {
     public List<Organization> queryOrganization(OrganizationQuery query);
 
     List<String> queryProvinceIdByOrgId(List<Integer> orgId);
-
+    List<Organization> queryHospital();
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index e226c4f..dad22bb 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -87,4 +87,7 @@ public class OrganizationServiceImpl implements OrganizationService {
     public List<String> queryProvinceIdByOrgId(List<Integer> orgId) {
         return organizationMapper.queryProvinceIdByOrgId(orgId);
     }
+    public List<Organization> queryHospital(){
+        return organizationMapper.queryHospital();
+    }
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
index e634079..2d294af 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
@@ -220,4 +220,7 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
             </foreach>
         </if>
     </select>
+    <select id="queryHospital" resultMap="OrganizationResultMap">
+        select * from organization where yn=1 and type in(2,3,4,5,6,7)
+            </select>
 </mapper>
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 1338941..f9a1a8c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.controller;
 
+import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
@@ -18,7 +19,7 @@ import javax.validation.Valid;
  * Created by Administrator on 2016/6/17 0017.
  */
 @Controller
-public class MatDeliverController {
+public class MatDeliverController extends BaseController{
 
     @Autowired
     private MatDeliverFacade matDeliverFacade;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 23051c2..04eef1c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
 import com.lyms.platform.operate.web.result.MatDeliverListResult;
 import com.lyms.platform.operate.web.result.MaternalDeliverResult;
+import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.MaternalDeliverModel;
 import com.lyms.platform.pojo.Patients;
@@ -39,6 +40,8 @@ public class MatDeliverFacade {
     private BabyService babyService;
     @Autowired
     private PatientsService patientsService;
+    @Autowired
+    private OrganizationService organizationService;
 
 
     /**
@@ -198,9 +201,12 @@ public class MatDeliverFacade {
         map.put("getTaiPan", getTaiPan());
         map.put("getQidaiYc", getQidaiYc());
         map.put("getRenShenJieJuEnums", getRenShenJieJuEnums());
+        map.put("organizations", organizationService.queryHospital());
         return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
+
+
     //胎方位
     public List<Object> getFetPosition() {
         List<Object> list = new ArrayList<>();
-- 
1.8.3.1