Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -91,6 +91,7 @@ public class TaskServiceImpl implements TaskService {
      * @param daysRemaining 评定剩余天数
      * @param taskStatus        任务状态
      * @param isReturn      是否退回
+     * @param type         0-评定任务分配检索 1-评定报告录入查询失能人员  2-评定任务查询检索
      */
     @Override
     public Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, String organId, String provincial, String city,
@@ -101,7 +102,7 @@ public class TaskServiceImpl implements TaskService {
             organIds = Arrays.asList(organId.split(","));
         }
         int aprType=0;
-        if(type==1){
+        if(type!=2){
             if (StrUtil.isNotBlank(realName)||StrUtil.isNotBlank(certiCode)) {
                 int count = taskMapper.queryApplyCount(realName,certiCode,2,2);
                 aprType=count>0?1:0;//count>0 复评已过，查询复评数据，反之查询初评数据。

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -67,7 +67,7 @@
         left join ch_refuse_reason reason on push.refuse_reason = reason.refuse_reason_id
         left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
         <where>
-            <if test="aprType != null  and  type == 1 ">
+            <if test="aprType != null  and  type != 2 ">
                 and task.APR_TYPE = #{aprType}
             </if>
             <if test="organIds != null">