smartor.git - Gitblit

			@@ -410,7 +410,6 @@
			<if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if>
			<if test="submit != null ">and submit = #{submit}</if>
			<if test="upid != null ">and upid = #{upid}</if>
			<if test="visitCount != null ">and visit_count = #{visitCount}</if>
			<if test="patfrom != null ">and patfrom = #{patfrom}</if>
			<if test="serviceType != null ">and service_type = #{serviceType}</if>
			<if test="patid != null ">and patid = #{patid}</if>
			@@ -573,7 +572,7 @@
			<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>
			<if test="currentPreachform != null and currentPreachform != '' ">and current_preachform = #{currentPreachform}</if>
			<if test="currentPreachforms != null and currentPreachforms != ''">
			and FIND_IN_SET(<include refid="effectiveCurrentPreachformExpr"/>, #{currentPreachforms})
			</if>
			@@ -723,7 +722,7 @@
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
			<if test="managementDoctor != null">and management_doctor = #{managementDoctor}</if>
			<if test="currentPreachform != null">and current_preachform = #{currentPreachform}</if>
			<if test="currentPreachform != null and currentPreachform != '' ">and current_preachform = #{currentPreachform}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
			<if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
			@@ -783,7 +782,7 @@
			<if test="visitTime != null ">and visit_time = #{visitTime}</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			<if test="currentPreachform != null">and current_preachform = #{currentPreachform}</if>
			<if test="currentPreachform != null and currentPreachform != '' ">and current_preachform = #{currentPreachform}</if>
			<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			<if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
			@@ -1087,7 +1086,7 @@
			<if test="visitDeptName != null">visit_dept_name,</if>
			<if test="managementDoctorCode != null">management_doctor_code,</if>
			<if test="managementDoctor != null">management_doctor,</if>
			<if test="currentPreachform != null">current_preachform,</if>
			<if test="currentPreachform != null and currentPreachform != '' ">current_preachform,</if>
			<if test="taskSituation != null">task_situation,</if>
			<if test="isabnormal != null">isabnormal,</if>
			<if test="continueFlag != null ">continue_flag,</if>
			@@ -1187,7 +1186,7 @@
			<if test="visitDeptName != null">#{visitDeptName},</if>
			<if test="managementDoctorCode != null">#{managementDoctorCode},</if>
			<if test="managementDoctor != null">#{managementDoctor},</if>
			<if test="currentPreachform != null">#{currentPreachform},</if>
			<if test="currentPreachform != null and currentPreachform != '' ">#{currentPreachform},</if>
			<if test="taskSituation != null">#{taskSituation},</if>
			<if test="isabnormal != null">#{isabnormal},</if>
			<if test="continueFlag != null ">#{continueFlag},</if>
			@@ -1301,7 +1300,7 @@
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
			<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
			<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
			<if test="currentPreachform != null and currentPreachform != '' ">current_preachform=#{currentPreachform},</if>
			<if test="taskSituation != null">task_situation=#{taskSituation},</if>
			<if test="isabnormal != null">isabnormal=#{isabnormal},</if>
			<if test="continueFlag != null ">continue_flag = #{continueFlag},</if>
			@@ -1407,7 +1406,7 @@
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
			<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
			<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
			<if test="currentPreachform != null and currentPreachform != '' ">current_preachform=#{currentPreachform},</if>
			<if test="taskSituation != null">task_situation=#{taskSituation},</if>
			<if test="isabnormal != null">isabnormal=#{isabnormal},</if>
			<if test="continueFlag != null ">continue_flag = #{continueFlag},</if>
			@@ -1512,7 +1511,7 @@
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
			<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
			<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
			<if test="currentPreachform != null and currentPreachform != '' ">current_preachform=#{currentPreachform},</if>
			<if test="taskSituation != null">task_situation=#{taskSituation},</if>
			<if test="isabnormal != null">isabnormal=#{isabnormal},</if>
			<if test="continueFlag != null ">continue_flag = #{continueFlag},</if>
			@@ -1625,7 +1624,7 @@
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
			<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
			<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
			<if test="currentPreachform != null and currentPreachform != '' ">current_preachform=#{currentPreachform},</if>
			<if test="taskSituation != null">task_situation=#{taskSituation},</if>
			<if test="isabnormal != null">isabnormal=#{isabnormal},</if>
			<if test="continueFlag != null ">continue_flag = #{continueFlag},</if>
			@@ -1655,6 +1654,35 @@
			where patid = #{patid} and taskid = #{taskid}
			</update>

			<!-- 人工随访：软删除患者出院记录对应的未完成随访任务 -->
			<update id="deleteUnfinishedServiceSubtaskByInhospids">
			update service_subtask
			set del_flag = 1
			where del_flag = 0
			and patid = #{patid}
			and sendstate in
			<foreach collection="sendstates" item="sendstate" open="(" separator="," close=")">
			#{sendstate}
			</foreach>
			and inhospid in
			<foreach collection="inhospids" item="inhospid" open="(" separator="," close=")">
			#{inhospid}
			</foreach>
			</update>

			<!-- 人工随访重复校验：同一患者同一任务下是否已有未完成随访任务 -->
			<select id="countUnfinishedServiceSubtaskByPatidAndTaskid" resultType="int">
			select count(1)
			from service_subtask
			where del_flag = 0
			and patid = #{patid}
			and taskid = #{taskid}
			and sendstate in
			<foreach collection="sendstates" item="sendstate" open="(" separator="," close=")">
			#{sendstate}
			</foreach>
			</select>

			<select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
			resultMap="ServiceSubtaskResult">
			select id,
			@@ -1672,7 +1700,7 @@
			deptname,
			sendstate,
			preachform,
			current_preachform,
			<include refid="effectiveCurrentPreachformExpr"/> AS current_preachform,
			excep,
			nurse_id,
			nurse_name,
			@@ -1941,9 +1969,6 @@
			<if test="groupKey != null and groupKey != ''">
			group by ${groupKey}
			</if>
			<if test="pageSize != null and pageNum != null">
			limit ${pageSize} OFFSET ${pageNum}
			</if>
			</select>

			<select id="getSfStatisticsHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
			@@ -1961,7 +1986,7 @@
			deptname,
			sendstate,
			preachform,
			current_preachform,
			<include refid="effectiveCurrentPreachformExpr"/> AS current_preachform,
			excep,
			nurse_id,
			nurse_name,
			@@ -2041,10 +2066,15 @@
			<if test="type != null">
			and type = #{type}
			</if>
			<if test="visitCount != null and visitCount == 1">
			<!-- 首个再次随访：精确查 visit_count = 2，与统计口径一致 -->
			<if test="hyperLinkInfoType == 'againFollowUpPushCountInfo'">
			AND visit_count = 2
			</if>
			<!-- 其他类型保持原语义：1 首次，>1 再次 -->
			<if test="hyperLinkInfoType != 'againFollowUpPushCountInfo' and visitCount != null and visitCount == 1">
			AND visit_count = 1
			</if>
			<if test="visitCount != null and visitCount > 1">
			<if test="hyperLinkInfoType != 'againFollowUpPushCountInfo' and visitCount != null and visitCount > 1">
			AND visit_count > 1
			</if>
			<if test="groupKey != null and groupKey != '' and groupKeyList != null and groupKeyList.size>0">
			@@ -2061,8 +2091,8 @@
			#{state}
			</foreach>
			</if>
			<if test="currentPreachform != null">
			AND current_preachform = #{currentPreachform}
			<if test="currentPreachform != null and currentPreachform != '' ">
			AND <include refid="effectiveCurrentPreachformExpr"/> = #{currentPreachform}
			<if test="followUpCountStyle != null and followUpCountStyle = '1'">
			AND sendstate != 4
			</if>
			@@ -2088,6 +2118,9 @@
			<if test="isManuallyCalled != null">
			AND is_manually_called = #{isManuallyCalled}
			</if>
			<if test="suggest != null and suggest != ''">
			AND TRIM(suggest) = #{suggest}
			</if>
			order by endtime desc
			<if test="pageSize != null and pageNum != null">
			limit ${pageSize} OFFSET ${pageNum}