From 088972edd0ac4796e269107421de4f7747427513 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 3 Sep 2018 16:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=93=E9=87=8D=E8=90=A5?=
 =?UTF-8?q?=E5=85=BB=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/PatientService.xml  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 3f402db..2396dec 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -239,21 +239,27 @@
 
     <!--查询只开通了标准服务的数据 -->
     <select id="selectOnlyBzService" resultType="java.util.HashMap" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
-        SELECT  parentid,id from patient_service where ser_status=1
+        SELECT * from (SELECT  parentid,id,ser_type from patient_service where ser_status=1
         <if test="perType != null and perType != ''">
             and per_type = #{perType,jdbcType=INTEGER}
         </if>
 
         and ser_type in (1,6,10,11)
 
-        GROUP BY parentid HAVING count(parentid)=1
+        GROUP BY parentid HAVING count(parentid)=1 )as b
+        <if test="perType == 1">
+            where   b.ser_type=6
+        </if>
+        <if test="perType == 2">
+            where  b.ser_type=11
+        </if>
         <include refid="orderAndLimit"/>
     </select>
 
 
     <!--查询只开通了标准服务的数据 -->
     <select id="selectOnlyBzServiceCount" resultType="int" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
-        SELECT count(1) from (SELECT  parentid,id from patient_service where ser_status=1
+        SELECT count(1) from ( SELECT count(1) from (SELECT  parentid,id from patient_service where ser_status=1
         <if test="perType != null and perType != ''">
             and per_type = #{perType,jdbcType=INTEGER}
         </if>
@@ -261,6 +267,13 @@
         and ser_type in (1,6,10,11)
 
         GROUP BY parentid HAVING count(parentid)=1) as b
+        <if test="perType == 1">
+            where b.ser_type=6
+        </if>
+        <if test="perType == 2">
+            where  b.ser_type=11
+        </if>
+        ) as c
     </select>
 
     <select id="queryPatientServiceCount" resultType="int"
-- 
1.8.3.1