smartor.git - Gitblit

			@@ -52,6 +52,7 @@
			<result property="wechat" column="wechat"/>
			<result property="leaveicd10code" column="leaveicd10code"/>
			<result property="leavediagname" column="leavediagname"/>
			<result property="diagname" column="diagname"/>
			<result property="deptname" column="deptname"/>
			<result property="admindate" column="admindate"/>
			<result property="roomno" column="roomno"/>
			@@ -147,6 +148,7 @@
			select id,
			hosp_type,
			task_guid,
			diagname,
			patfrom,
			management_doctor,
			management_doctor_code,
			@@ -269,12 +271,36 @@
			<include refid="selectServiceSubtaskVo"/>
			where 1=1
			and del_flag = 0
			and sendstate != 5
			<if test="orgid != null and orgid != ''">
			and orgid = #{orgid}
			</if>
			<if test="subId != null">
			AND id = #{subId}
			</if>
			<if test="taskid != null ">and taskid = #{taskid}</if>
			<if test="visitTime != null">
			AND date_format(visit_time,'%y%m%d') <= date_format(#{visitTime},'%y%m%d')
			</if>
			<if test="sendstate != null ">and sendstate = #{sendstate}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			<if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
			<if test="continueCount != null ">and continue_count = #{continueCount}</if>
			<if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
			UNION ALL
			<include refid="selectServiceSubtaskVo"/>
			where 1=1
			and del_flag = 0
			and sendstate = 5
			<if test="orgid != null and orgid != ''">
			and orgid = #{orgid}
			</if>
			<if test="subId != null">
			AND id = #{subId}
			</if>
			<if test="taskid != null ">and taskid = #{taskid}</if>
			<if test="visitTime != null">
			AND date_format(visit_time,'%y%m%d') <= date_format(DATE_ADD(#{visitTime}, INTERVAL 1 DAY),'%y%m%d')
			</if>
			<if test="sendstate != null ">and sendstate = #{sendstate}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			@@ -327,6 +353,12 @@
			AND sendstate IN
			<foreach collection="sendstates" item="state" open="(" separator="," close=")">
			#{state}
			</foreach>
			</if>
			<if test="subIdList != null and sendstates.size() > 0">
			AND id IN
			<foreach collection="subIdList" item="subId" open="(" separator="," close=")">
			#{subId}
			</foreach>
			</if>
			<!-- taskIds筛选 -->
			@@ -543,11 +575,33 @@
			resultMap="ServiceSubtaskResult">
			<include refid="selectServiceSubtaskVo"/>
			where del_flag = 0
			and sendstate != 5
			<if test="orgid != null and orgid != ''">
			and orgid = #{orgid}
			</if>
			<if test="visitTime != null">
			AND date_format(visit_time,'%y%m%d') <= date_format(#{visitTime},'%y%m%d')
			</if>
			<if test="subId != null">
			AND id = #{subId}
			</if>
			<if test="sendstate != null ">and sendstate = #{sendstate}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			<if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
			<if test="continueCount != null ">and continue_count = #{continueCount}</if>
			<if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
			UNION ALL
			<include refid="selectServiceSubtaskVo"/>
			where del_flag = 0
			and sendstate = 5
			<if test="orgid != null and orgid != ''">
			and orgid = #{orgid}
			</if>
			<if test="visitTime != null">
			AND date_format(visit_time,'%y%m%d') <= date_format(DATE_ADD(#{visitTime}, INTERVAL 1 DAY),'%y%m%d')
			</if>
			<if test="subId != null">
			AND id = #{subId}
			</if>
			<if test="sendstate != null ">and sendstate = #{sendstate}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			@@ -1482,6 +1536,10 @@
			AND visit_time >= DATE(#{startTime})
			AND visit_time < DATE_ADD(DATE(#{endTime}), INTERVAL 1 DAY)
			</if>
			<if test="hospitalStartTime != null and hospitalEndTime!=null">
			AND endtime >= DATE(#{hospitalStartTime})
			AND endtime < DATE_ADD(DATE(#{hospitalEndTime}), INTERVAL 1 DAY)
			</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			@@ -1661,6 +1719,10 @@
			AND visit_time >= DATE(#{startTime})
			AND visit_time < DATE_ADD(DATE(#{endTime}), INTERVAL 1 DAY)
			</if>
			<if test="hospitalStartTime != null and hospitalEndTime!=null">
			AND endtime >= DATE(#{hospitalStartTime})
			AND endtime < DATE_ADD(DATE(#{hospitalEndTime}), INTERVAL 1 DAY)
			</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			@@ -1809,6 +1871,7 @@
			<if test="deptcode != null and deptcode != ''">
			AND deptcode = #{deptcode}
			</if>
			order by endtime desc
			<if test="pageSize != null and pageNum != null">
			limit ${pageSize} OFFSET ${pageNum}
			</if>
			@@ -2431,8 +2494,8 @@
			SUM(CASE WHEN sendstate = 5 THEN 1 ELSE 0 END) AS fssb,
			SUM(CASE WHEN sendstate >= 3 OR sendstate = 1 THEN 1 ELSE 0 END) AS yfs,
			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 = 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 = 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,