From 0de1ce032cd4763e3c0ffad1eb7c37f5daeb96fd Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 2 Mar 2018 10:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=B5=8B=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/master/MeasureDataInfoMapper.java          |   2 +
 .../service/impl/MeasureDataInfoServiceImpl.java   |   3 +
 .../mainOrm/master/MeasureDataInfoMapper.xml       | 219 ++++++++++++---------
 .../operate/web/facade/MeasureInfoFacade.java      |   1 +
 4 files changed, 128 insertions(+), 97 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java
index e047f86..f34692f 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java
@@ -20,4 +20,6 @@ public interface MeasureDataInfoMapper {
     int queryMeasureDataInfoListCount(MeasureDataInfoQuery query);
 
     List<MeasureDataInfoModel> queryMeasureList(MeasureDataInfoQuery query);
+
+    int queryMeasureListCount(MeasureDataInfoQuery query);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java
index 9e02e4d..cf933a8 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java
@@ -41,6 +41,9 @@ public class MeasureDataInfoServiceImpl implements MeasureDataInfoService {
 
     @Override
     public List<MeasureDataInfoModel> queryMeasureList(MeasureDataInfoQuery query) {
+        if (query.getNeed() != null) {
+            query.mysqlBuild(measureDataInfoMapper.queryMeasureListCount(query));
+        }
         return measureDataInfoMapper.queryMeasureList(query);
     }
 }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
index e645ae2..91fc16f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
@@ -70,6 +70,112 @@
 		<include refid="orderAndLimit"/>
 	</select>
 
+
+
+	<sql id="queryMeasureListCondition">
+		<where>
+			1 = 1
+			<if test="id != null and id >= 0">
+				and m.id = #{id,jdbcType=INTEGER}
+			</if>
+			<if test="valueOne != null and valueOne != ''">
+				and m.value_one = #{valueOne,jdbcType=VARCHAR}
+			</if>
+			<if test="valueTwo != null and valueTwo != ''">
+				and m.value_two = #{valueTwo,jdbcType=VARCHAR}
+			</if>
+			<if test="valueThree != null and valueThree != ''">
+				and m.value_three = #{valueThree,jdbcType=VARCHAR}
+			</if>
+			<if test="valueType != null and valueType > 0">
+				and m.value_type = #{valueType,jdbcType=INTEGER}
+			</if>
+			<if test="created != null">
+				AND date_format(m.created,'%Y-%m-%d') = #{created}
+			</if>
+			<if test="recordCount != null and recordCount >= 0">
+				and m.record_count = #{m.recordCount,jdbcType=INTEGER}
+			</if>
+
+			<if test="modified != null">
+				AND date_format(m.modified,'%Y-%m-%d') = #{modified}
+			</if>
+
+			<if test="createdTimeStart != null">
+				AND   m.created >= date_format(#{createdTimeStart},'%Y-%m-%d')
+			</if>
+			<if test="createdTimeEnd != null">
+				AND  <![CDATA[ m.created < date_format(#{createdTimeEnd},'%Y-%m-%d')  ]]>
+			</if>
+
+			<if test="modifiedTimeStart != null">
+				AND  m.modified >= date_format(#{modifiedTimeStart},'%Y-%m-%d')
+			</if>
+			<if test="modifiedTimeEnd != null">
+				AND  <![CDATA[ m.modified < date_format(#{modifiedTimeEnd},'%Y-%m-%d')  ]]>
+			</if>
+
+			<if test="todayCount != null and todayCount > 0">
+				m.today_count = #{todayCount,jdbcType=INTEGER},
+			</if>
+
+			<if test="queryNo != null and queryNo != ''">
+				and (u.phone = #{queryNo,jdbcType=VARCHAR} or u.cert_no = #{queryNo,jdbcType=VARCHAR}
+				or u.user_name = #{queryNo,jdbcType=VARCHAR})
+			</if>
+
+			<if test="hospitalId != null and hospitalId != ''">
+				and u.hospital_id = #{hospitalId,jdbcType=VARCHAR}
+			</if>
+			<if test="hospitalIds != null and hospitalIds.size() > 0">
+				and u.hospital_id in
+				<foreach collection="hospitalIds" index="index" item="item" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
+			<if test="address != null and address != ''">
+				and u.address = #{address,jdbcType=VARCHAR}
+			</if>
+			<if test="face != null and face != ''">
+				and u.face = #{face,jdbcType=VARCHAR}
+			</if>
+			<if test="finger != null and finger != ''">
+				and u.finger = #{finger,jdbcType=VARCHAR}
+			</if>
+
+			<if test="userName != null">
+				and u.user_name = #{userName,jdbcType=VARCHAR}
+			</if>
+			<if test="certType != null and certType != ''">
+				and u.cert_type = #{certType,jdbcType=VARCHAR}
+			</if>
+			<if test="certNo != null and certNo != ''">
+				and u.cert_no = #{certNo,jdbcType=VARCHAR}
+			</if>
+			<if test="age != null and age != ''">
+				and u.age = #{age,jdbcType=VARCHAR}
+			</if>
+			<if test="phone != null and phone != ''">
+				and u.phone = #{phone,jdbcType=VARCHAR}
+			</if>
+			<if test="sex != null">
+				and u.sex = #{sex,jdbcType=INTEGER}
+			</if>
+			<if test="vcCardNo != null and vcCardNo != ''">
+				and u.vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
+			</if>
+			<if test="zyNo != null and zyNo != ''">
+				and u.zy_no = #{zyNo,jdbcType=VARCHAR}
+			</if>
+			<if test="visitId != null and visitId != ''">
+				and u.visit_id = #{visitId,jdbcType=VARCHAR}
+			</if>
+			<if test="patientId != null and patientId != ''">
+				and u.patient_id = #{valueOne,jdbcType=VARCHAR}
+			</if>
+		</where>
+	</sql>
+
 	<select id="queryMeasureList" parameterType="com.lyms.platform.query.MeasureDataInfoQuery"
 			resultMap="measureDataInfoModelMapList">
 		SELECT
@@ -85,111 +191,30 @@
 		FROM measure_data_info m
 		LEFT  JOIN
 		measure_user_info u ON m.measure_user_id = u.id
-		WHERE 1 = 1
-		<if test="id != null and id >= 0">
-			and m.id = #{id,jdbcType=INTEGER}
-		</if>
-		<if test="valueOne != null and valueOne != ''">
-			and m.value_one = #{valueOne,jdbcType=VARCHAR}
-		</if>
-		<if test="valueTwo != null and valueTwo != ''">
-			and m.value_two = #{valueTwo,jdbcType=VARCHAR}
-		</if>
-		<if test="valueThree != null and valueThree != ''">
-			and m.value_three = #{valueThree,jdbcType=VARCHAR}
-		</if>
-		<if test="valueType != null and valueType > 0">
-			and m.value_type = #{valueType,jdbcType=INTEGER}
-		</if>
-		<if test="created != null">
-			AND date_format(m.created,'%Y-%m-%d') = #{created}
-		</if>
-		<if test="recordCount != null and recordCount >= 0">
-			and m.record_count = #{m.recordCount,jdbcType=INTEGER}
-		</if>
-
-		<if test="modified != null">
-			AND date_format(m.modified,'%Y-%m-%d') = #{modified}
-		</if>
-
-		<if test="createdTimeStart != null">
-			AND   m.created >= date_format(#{createdTimeStart},'%Y-%m-%d')
-		</if>
-		<if test="createdTimeEnd != null">
-			AND  <![CDATA[ m.created < date_format(#{createdTimeEnd},'%Y-%m-%d')  ]]>
-		</if>
-
-		<if test="modifiedTimeStart != null">
-			AND  m.modified >= date_format(#{modifiedTimeStart},'%Y-%m-%d')
-		</if>
-		<if test="modifiedTimeEnd != null">
-			AND  <![CDATA[ m.modified < date_format(#{modifiedTimeEnd},'%Y-%m-%d')  ]]>
-		</if>
-
-		<if test="todayCount != null and todayCount > 0">
-			m.today_count = #{todayCount,jdbcType=INTEGER},
-		</if>
-
-		<if test="queryNo != null and queryNo != ''">
-			and (u.phone = #{queryNo,jdbcType=VARCHAR} or u.cert_no = #{queryNo,jdbcType=VARCHAR}
-			or u.user_name = #{queryNo,jdbcType=VARCHAR})
+		<include refid="queryMeasureListCondition"/>
+		order by m.created desc
+		<if test="need != null">
+			limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
 		</if>
+	</select>
 
-		<if test="hospitalId != null and hospitalId != ''">
-			and u.hospital_id = #{hospitalId,jdbcType=VARCHAR}
-		</if>
-		<if test="hospitalIds != null and hospitalIds.size() > 0">
-			and u.hospital_id in
-			<foreach collection="hospitalIds" index="index" item="item" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
-		<if test="address != null and address != ''">
-			and u.address = #{address,jdbcType=VARCHAR}
-		</if>
-		<if test="face != null and face != ''">
-			and u.face = #{face,jdbcType=VARCHAR}
-		</if>
-		<if test="finger != null and finger != ''">
-			and u.finger = #{finger,jdbcType=VARCHAR}
-		</if>
 
-		<if test="userName != null">
-			and u.user_name = #{userName,jdbcType=VARCHAR}
-		</if>
-		<if test="certType != null and certType != ''">
-			and u.cert_type = #{certType,jdbcType=VARCHAR}
-		</if>
-		<if test="certNo != null and certNo != ''">
-			and u.cert_no = #{certNo,jdbcType=VARCHAR}
-		</if>
-		<if test="age != null and age != ''">
-			and u.age = #{age,jdbcType=VARCHAR}
-		</if>
-		<if test="phone != null and phone != ''">
-			and u.phone = #{phone,jdbcType=VARCHAR}
-		</if>
-		<if test="sex != null">
-			and u.sex = #{sex,jdbcType=INTEGER}
-		</if>
-		<if test="vcCardNo != null and vcCardNo != ''">
-			and u.vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
-		</if>
-		<if test="zyNo != null and zyNo != ''">
-			and u.zy_no = #{zyNo,jdbcType=VARCHAR}
-		</if>
-		<if test="visitId != null and visitId != ''">
-			and u.visit_id = #{visitId,jdbcType=VARCHAR}
-		</if>
-		<if test="patientId != null and patientId != ''">
-			and u.patient_id = #{valueOne,jdbcType=VARCHAR}
-		</if>
+	<select id="queryMeasureListCount" parameterType="com.lyms.platform.query.MeasureDataInfoQuery"
+			resultType="int">
+		SELECT
+		count(m.id)
+		FROM measure_data_info m
+		LEFT  JOIN
+		measure_user_info u ON m.measure_user_id = u.id
+		<include refid="queryMeasureListCondition"/>
 		order by m.created desc
 		<if test="need != null">
 			limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
 		</if>
 	</select>
 
+
+
 	<select id="queryMeasureDataInfoListCount" parameterType="com.lyms.platform.query.MeasureDataInfoQuery" resultType="int">
 		SELECT  count(id) FROM measure_data_info
 		<include refid="queryMeasureDataInfoCondition"/>
@@ -299,7 +324,7 @@
 			</if>
 
 			<if test="todayCount != null and todayCount > 0">
-				today_count = #{todayCount,jdbcType=INTEGER},
+				AND today_count = #{todayCount,jdbcType=INTEGER}
 			</if>
 		</where>
 	</sql>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index 7b25545..18b2c9a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -499,6 +499,7 @@ public class MeasureInfoFacade {
         MeasureUserInfoQuery query = new MeasureUserInfoQuery();
         query.setCertType(certType);
         query.setCertNo(certNo);
+        query.setHospitalId(hospitalId);
         query.setNeed("true");
         query.setSort(" created desc ");
         List<MeasureUserInfoModel> models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query);
-- 
1.8.3.1