Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizMissionDocServiceImpl.java

@@ -171,8 +171,20 @@ public class BizMissionDocServiceImpl  implements IBizMissionDocService {
             }
         }
         //删除科室关联信息
-        bizDocDeptRepository.delete(new LambdaQueryWrapper<BizDocDeptPO>()
-                .in(BizDocDeptPO::getDocId, ids));
+        List<BizDocDeptPO> bizDocDeptPOS = bizDocDeptRepository.selectList(new LambdaQueryWrapper<BizDocDeptPO>().in(BizDocDeptPO::getDocId, ids));
+        if(CollectionUtil.isNotEmpty(bizDocDeptPOS)){
+            List<String> deptIds = bizDocDeptPOS.stream()
+                    .map(BizDocDeptPO::getDeptId)
+                    .filter(StringUtils::isNotEmpty)
+                    .collect(Collectors.toList());
+            if(CollectionUtil.isNotEmpty(deptIds)){
+                bizDocDeptRepository.delete(new LambdaQueryWrapper<BizDocDeptPO>()
+                        .in(BizDocDeptPO::getDocId, ids));
+                bizDeptRepository.update(null ,new LambdaUpdateWrapper<BizDeptPO>()
+                        .setSql("mission_doc_count = mission_doc_count - 1")
+                        .in(BizDeptPO::getId, deptIds));
+            }
+        }
         return baseRepository.updateDeletedById(ids);
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupServiceImpl.java

@@ -82,6 +82,8 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
     private IBizClinicRoomUndoService bizClinicRoomUndoService;
     @Autowired
     private ALiYunProperties aliyunProperties;
+    @Autowired
+    private BizDeptRepository bizDeptRepository;
 
     private String promptTemplate;
 
@@ -185,8 +187,22 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
             }
         }
         //删除科室关联信息
-        bizQuestionDeptRepository.delete(new LambdaQueryWrapper<BizQuestionDeptPO>()
-                .in(BizQuestionDeptPO::getQuestionGroupId, ids));
+        List<BizQuestionDeptPO> bizQuestionDeptPOS = bizQuestionDeptRepository.selectList(new LambdaQueryWrapper<BizQuestionDeptPO>()
+                .in(BizQuestionDeptPO::getQuestionGroupId,ids));
+        if(CollectionUtil.isNotEmpty(bizQuestionDeptPOS)){
+            List<String> deptIds = bizQuestionDeptPOS.stream()
+                    .map(BizQuestionDeptPO::getDeptId)
+                    .filter(StringUtils::isNotEmpty)
+                    .collect(Collectors.toList());
+            if(CollectionUtil.isNotEmpty(deptIds)){
+                bizQuestionDeptRepository.delete(new LambdaQueryWrapper<BizQuestionDeptPO>()
+                        .in(BizQuestionDeptPO::getQuestionGroupId, ids));
+                bizDeptRepository.update(null ,new LambdaUpdateWrapper<BizDeptPO>()
+                        .ge(BizDeptPO::getQuestionCount, 1)
+                        .setSql("question_count = question_count - 1")
+                        .in(BizDeptPO::getId, deptIds));
+            }
+        }
         return baseRepository.deleteBatchIds(ids);
     }