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

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

@@ -527,11 +527,6 @@ 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/resources/mapper/ChDisableEvaluateMapper.xml

@@ -106,7 +106,6 @@
             </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>

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableInfoChange.java

@@ -420,4 +420,9 @@ public class ChDisableInfoChange {
      * 待遇类型(1失能、0失智)
      */
     private Integer treatmentType;
+
+    /**
+     *医保统筹区区
+     */
+    private String medicalArea;
 }