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"/>
			@@ -122,6 +123,9 @@
			</resultMap>

			<resultMap type="com.smartor.domain.ServiceSubtaskStatistic" id="ServiceSubtaskStatisticResult">
			<result property="taskName" column="task_name"/>
			<result property="drcode" column="drcode"/>
			<result property="drname" column="drname"/>
			<result property="dischargeCount" column="discharge_count"/>
			<result property="nonFollowUp" column="non_follow_up"/>
			<result property="filterCount" column="filter_count"/>
			@@ -144,6 +148,7 @@
			select id,
			hosp_type,
			task_guid,
			diagname,
			patfrom,
			management_doctor,
			management_doctor_code,
			@@ -266,12 +271,30 @@
			<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="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="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>
			@@ -540,11 +563,27 @@
			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="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="sendstate != null ">and sendstate = #{sendstate}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			@@ -1508,7 +1547,13 @@
			<select id="getSpecialSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
			resultMap="ServiceSubtaskStatisticResult">
			select
			a.task_name,
			<if test="groupKey != null and groupKey == 'task_name'">
			a.task_name,
			</if>
			<if test="groupKey != null and groupKey == 'drcode'">
			b.drcode,
			b.drname,
			</if>
			COUNT(1) AS discharge_count,
			SUM(CASE WHEN b.sendstate = 4 THEN 1 ELSE 0 END) AS non_follow_up,
			SUM(CASE WHEN b.sendstate = 4 and b.task_situation = 6 THEN 1 ELSE 0 END) AS filter_count,
			@@ -1607,7 +1652,12 @@
			<if test="visitCount != null and visitCount > 1">
			AND b.visit_count > 1
			</if>
			GROUP BY a.task_name
			<if test="groupKey != null and groupKey == 'task_name'">
			GROUP BY a.task_name
			</if>
			<if test="groupKey != null and groupKey == 'drcode'">
			GROUP BY b.drcode, b.drname
			</if>
			</select>

			<select id="getSfStatisticsGroupKey" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
			@@ -1795,6 +1845,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>
			@@ -2343,7 +2394,6 @@
			AND endtime >= #{startDate}
			AND endtime <= DATE_ADD(#{endDate}, INTERVAL 1 DAY)
			</if>
			AND service_type IN (2, 13)
			AND inhospstate=1
			<if test="orgid != null">
			AND orgid = #{orgid}
			@@ -2417,8 +2467,11 @@
			SUM(CASE WHEN sendstate != 4 AND sendstate != 2 THEN 1 ELSE 0 END) AS ysf,
			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 = 2 THEN 1 ELSE 0 END) AS dsf,
			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 = 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