smartor.git - Gitblit

			@@ -344,8 +344,9 @@
			</if>
			</if>
			<if test="deptOrDistrict==2">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			AND (leavehospitaldistrictcode IN
			AND leavehospitaldistrictcode IN
			<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
			separator=","
			close=")">
			@@ -355,14 +356,15 @@
			<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
			OR deptcode IN
			<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
			close="))">
			close=")">
			#{leaveldeptcode}
			</foreach>
			</if>
			</if>)
			</if>
			<if test="deptOrDistrict==3">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			AND (leavehospitaldistrictcode IN
			AND leavehospitaldistrictcode IN
			<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
			separator=","
			close=")">
			@@ -370,17 +372,19 @@
			</foreach>
			</if>
			<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
			and visit_dept_code IN
			AND visit_dept_code IN
			<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
			close="))">
			close=")">
			#{visitDeptCode}
			</foreach>
			</if>
			)
			</if>

			<if test="deptOrDistrict==4">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			AND (leavehospitaldistrictcode IN
			AND leavehospitaldistrictcode IN
			<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
			separator=","
			close=")">
			@@ -390,10 +394,11 @@
			<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
			OR visit_dept_code IN
			<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
			close="))">
			close=")">
			#{visitDeptCode}
			</foreach>
			</if>
			)
			</if>

			<if test="visitTime != null">
			@@ -641,6 +646,8 @@
			AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
			</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
			<if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
			<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
			<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			@@ -655,25 +662,29 @@
			) a
			</select>

			<select id="selectTimelyRateBatch" parameterType="com.smartor.domain.ServiceSubtask" resultType="map">
			<select id="selectTimelyRateBatch" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity" resultType="map">
			SELECT
			<if test="groupKey != null and groupKey != ''">
			${groupKey} as groupKey,
			</if>
			SUM(CASE WHEN DATE(visit_time) < DATE(IFNULL(finishtime, NOW())) THEN 1 ELSE 0 END) / COUNT(*) as rate
			SUM(CASE WHEN finishtime IS NOT NULL AND DATE(visit_time) <= DATE(finishtime) THEN 1 ELSE 0 END) / COUNT(*) AS finishRate,
			<if test="rateDay != null">
			SUM(CASE WHEN finishtime IS NOT NULL AND DATEDIFF(finishtime, endtime) <= #{rateDay} THEN 1 ELSE 0 END) / COUNT(*) AS rate
			</if>
			<if test="rateDay == null">
			NULL AS rate
			</if>
			FROM service_subtask
			WHERE del_flag = 0
			AND visit_time IS NOT NULL
			AND finishtime IS NOT NULL
			<if test="orgid != null">AND orgid = #{orgid}</if>
			<if test="starttime == null and endtime==null">
			AND visit_time < NOW()
			AND DATE(visit_time) < DATE(NOW())
			</if>
			<if test="starttime != null and endtime!=null">
			AND visit_time >= #{starttime}
			AND visit_time < DATE_ADD(#{endtime}, INTERVAL 1 DAY)
			</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="orgid != null and orgid != ''">AND orgid = #{orgid}</if>
			<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
			<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			@@ -690,6 +701,13 @@
			</if>
			<if test="visitCount != null and visitCount > 1">
			AND visit_count > 1
			</if>
			<if test="serviceTypeList != null">
			AND service_type IN
			<foreach collection="serviceTypeList" item="serviceType" open="(" separator=","
			close=")">
			#{serviceType}
			</foreach>
			</if>
			<if test="groupKey != null and groupKey != ''">
			AND ${groupKey} IN
			@@ -720,6 +738,8 @@
			AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
			</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
			<if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
			<if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
			<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
			<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
			@@ -1238,6 +1258,9 @@
			<if test="continueContent != null ">continue_content = #{continueContent},</if>
			</trim>
			where patid = #{patid} and taskid = #{taskid}
			<if test="id != null ">
			and id = #{id}
			</if>
			</update>

			<update id="updateServiceSubtaskByTaskGuid" parameterType="com.smartor.domain.ServiceSubtask">