Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into uat_20230309_修改bug_mq

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -126,7 +126,7 @@ public class DisableController {
     /**
      * 查询机构下或者包含子机构下的所有护理机构
      *
-     * @param  机构id
+     * @param  token 机构id
      */
     @RequestMapping("/srvOrganListByIsInvolveChild")
     public Result<List<ChSrvOrgan>> srvOrganListByIsInvolveChild(@RequestHeader("Authorization") String token, Boolean isInvolveChild) {

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -527,6 +527,11 @@ public class DisableServiceImpl implements DisableService {
         ChDisableInfoChange chDisableInfoChange = chDisableInfoChangeMapper.selectById(changeId);
         DisableUpdateDetailVO disableUpdateDetailVO = new DisableUpdateDetailVO();
         BeanUtils.copyProperties(chDisableInfoChange, disableUpdateDetailVO);
+        //医保统筹区
+//        QueryWrapper<ChDisableApply> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("CERTI_CODE", disableUpdateDetailVO.getCertifNum());
+//        ChDisableApply chDisableApply =   disableApplyMapper.selectOne(queryWrapper);
+//        disableUpdateDetailVO.setMedicalArea(chDisableApply.getMedicalArea());
         try {
             Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(changeId.longValue(), AttachType.DISABLE_UPDATE.getUploadType());
             if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -59,11 +59,13 @@ public class TaskController {
      * @param taskName      评定人员姓名
      * @param taskTel       评定人员手机号码
      * @param daysRemaining 评定剩余天数
-     * @param status        任务状态
+     * @param taskStatus        任务状态
      * @param isReturn      是否退回
      * @param pageNum       当前页
      * @param pageSize      每页几条数据
+     * @param type          1评定报告录入查询失能人员
      */
+
     @RequestMapping("/taskDistributionList")
     public Result<Page<TaskDistributionVO>> taskDistributionList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
                                                                  String organId, String provincial, String city,
@@ -229,7 +231,7 @@ public class TaskController {
 
     /**
      * 添加评估公示信息
-     * @param taskId
+     * @param token
      * @return
      */
     @RequestMapping("/updateReportPublicityInfo")

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

@@ -106,6 +106,7 @@
             </if>
             <if test ="type == 1">
                 and disable.LAST_TASK_ID is not null
+                and disable.LAST_TASK_ID not in (select a.task_id from ch_apr_report a where a.task_id is not null)
             </if>
         </where>
     </select>