花名册修改

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -1866,7 +1866,7 @@
 	<sql id="where_getSocialDisRecord">
 		a.DELETE_FLAG = 0
 		AND a.social_id is not null
-		AND a.STATUS = "2"
+		AND a.STATUS in ('2','4')
 		AND a.DISPATCH_ITEM like concat('%','医疗','%')
 		<if test="tDispatchInfo != null">
 			<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
@@ -1878,9 +1878,12 @@
 			<if test="tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''">
 				AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth}
 			</if>
-			<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus.trim() != ''">
+			<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus.trim() != '' and tDispatchInfo.socialHandleStatus != 1">
 				AND a.SOCIAL_HANDLE_STATUS = #{tDispatchInfo.socialHandleStatus}
 			</if>
+			<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus.trim() != '' and tDispatchInfo.socialHandleStatus == 1">
+				AND a.SOCIAL_HANDLE_STATUS in ('1','3')
+			</if>
 			<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
 				${tDispatchInfo.authSql}
 			</if>