smartor.git - Gitblit

			@@ -363,7 +363,7 @@
			#{state}
			</foreach>
			</if>
			<if test="subIdList != null and sendstates.size() > 0">
			<if test="subIdList != null and subIdList.size() > 0">
			AND id IN
			<foreach collection="subIdList" item="subId" open="(" separator="," close=")">
			#{subId}
			@@ -393,7 +393,6 @@
			<if test="endSendDateTime != null">
			AND date_format(visit_time,'%y%m%d') <= date_format(#{endSendDateTime},'%y%m%d')
			</if>

			<if test="longSendTime != null">
			AND date_format(long_send_time,'%y%m%d') <= date_format(#{longSendTime},'%y%m%d')
			</if>
			@@ -430,7 +429,8 @@
			close=")">
			#{leaveldeptcode}
			</foreach>
			</if>)
			</if>
			)
			</if>
			<if test="deptOrDistrict==3">
			AND (1=1
			@@ -451,7 +451,6 @@
			</if>
			)
			</if>

			<if test="deptOrDistrict==4">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			@@ -471,7 +470,6 @@
			</if>
			)
			</if>

			<if test="visitTime != null">
			AND date_format(visit_time,'%y%m%d') = date_format(#{visitTime},'%y%m%d')
			</if>
			@@ -488,6 +486,7 @@
			<if test="isupload != null ">and isupload = #{isupload}</if>
			<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
			<if test="pid != null ">and pid = #{pid}</if>
			<if test="preachform != null ">and preachform = #{preachform}</if>
			<if test="currentPreachform != null ">and current_preachform = #{currentPreachform}</if>
			@@ -502,7 +501,6 @@
			<if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
			<if test="libtemplatename != null ">and libtemplatename = #{libtemplatename}</if>
			<if test="openid != null ">and openid = #{openid}</if>
			<if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
			<if test="sendstate != null ">and sendstate = #{sendstate}</if>
			<if test="drname != null and drname != ''">and drname like concat('%', #{drname}, '%')</if>
			<if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
			@@ -1372,7 +1370,13 @@
			<if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
			<if test="continueContent != null ">continue_content = #{continueContent},</if>
			</trim>
			where patid = #{patid} and taskid = #{taskid}
			where
			<if test="patid != null ">
			patid = #{patid}
			</if>
			<if test="taskid != null ">
			and taskid = #{taskid}
			</if>
			<if test="id != null ">
			and id = #{id}
			</if>
			@@ -2522,14 +2526,15 @@
			SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
			SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wxsf,
			SUM(CASE WHEN sendstate != 4 THEN 1 ELSE 0 END) AS xsf,
			SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0 END) AS dsf,
			SUM(CASE WHEN (sendstate = 1 OR sendstate = 2 OR sendstate = 3 OR sendstate = 5 OR sendstate = 7 ) THEN 1 ELSE 0
			END) AS dsf,
			SUM(CASE WHEN sendstate = 6 THEN 1 ELSE 0 END) AS ywc,
			SUM(CASE WHEN excep IS NOT NULL AND excep = '1' THEN 1 ELSE 0 END) AS yc,
			SUM(CASE WHEN excep IS NOT NULL AND excep = '2' THEN 1 ELSE 0 END) AS jg,
			COUNT(1) as total
			FROM service_subtask
			where 1=1
			and del_flag = 0
			where del_flag = 0
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			<if test="sendname != null and sendname != ''">
			AND sendname LIKE CONCAT('%', #{sendname}, '%')
			</if>
			@@ -2685,6 +2690,9 @@
			</if>
			<if test="orgid != null and orgid != ''">
			AND orgid = #{orgid}
			</if>
			<if test="campusid != null and campusid != ''">
			AND campusid = #{campusid}
			</if>
			<if test="guid != null and guid != ''">
			AND guid = #{guid}
			@@ -2898,7 +2906,7 @@
			<if test="sendstate != null">
			AND sendstate = #{sendstate}
			</if>
			<if test="isFinished != null and isFinished != '0'">
			<if test="isFinished != null and isFinished == '1'">
			AND finishtime is not null
			</if>
			<if test="starttime != null">AND starttime >= #{starttime}</if>
			@@ -2994,10 +3002,10 @@
			<if test="orgid != null and orgid != ''">
			and orgid = #{orgid}
			</if>
			<if test="sendstate != null and isFinished != '0'">
			<if test="sendstate != null">
			AND sendstate = #{sendstate}
			</if>
			<if test="isFinished != null">
			<if test="isFinished != null and isFinished == '1'">
			AND finishtime is not null
			</if>
			<if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
			@@ -3059,6 +3067,12 @@
			#{taskId}
			</foreach>
			AND s.sendstate = 6
			<if test="startOutHospTime != null">
			AND date_format(s.endtime,'%y%m%d') >= date_format(#{startOutHospTime},'%y%m%d')
			</if>
			<if test="endOutHospTime != null">
			AND date_format(s.endtime,'%y%m%d') <= date_format(#{endOutHospTime},'%y%m%d')
			</if>
			GROUP BY
			t.taskid,
			d.questiontext,