宣教文档、问卷组、科室关联 和广场 关联删除，

疼痛评价返回自己id调整

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.tr.core.exception.ServiceException;
@@ -39,6 +40,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 宣教文档Service接口实现类
@@ -156,6 +158,21 @@ public class BizMissionDocServiceImpl  implements IBizMissionDocService {
         if (CollectionUtil.isEmpty(ids)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "请选择要删除的数据");
         }
+        //关联删除自己推送的广场文档
+        List<BizMissionDocSquarePO> bizMissionDocSquarePOS = bizMissionDocSquareRepository
+                .selectList(new LambdaQueryWrapper<BizMissionDocSquarePO>().in(BizMissionDocSquarePO::getHospitalDocId, ids));
+        if(ObjectUtil.isNotEmpty(bizMissionDocSquarePOS)){
+            List<String> squareDocIds = bizMissionDocSquarePOS.stream()
+                    .map(BizMissionDocSquarePO::getId)
+                    .filter(StringUtils::isNotEmpty)
+                    .collect(Collectors.toList());
+            if(ObjectUtil.isNotEmpty(squareDocIds)){
+                bizMissionDocSquareRepository.updateDeletedById(squareDocIds);
+            }
+        }
+        //删除科室关联信息
+        bizDocDeptRepository.delete(new LambdaQueryWrapper<BizDocDeptPO>()
+                .in(BizDocDeptPO::getDocId, ids));
         return baseRepository.updateDeletedById(ids);
     }
 

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

@@ -14,10 +14,12 @@ import cn.tr.module.smart.common.dto.BizQuestionGroupQueryDTO;
 import cn.tr.module.smart.common.entity.BizWxAppletQuestionAnswerEntity;
 import cn.tr.module.smart.common.mapper.*;
 import cn.tr.module.smart.common.po.*;
+import cn.tr.module.smart.common.repository.BizQuestionDeptRepository;
 import cn.tr.module.smart.common.repository.BizQuestionGroupRepository;
 import cn.tr.module.smart.common.repository.BizQuestionGroupSquareRepository;
 import cn.tr.module.smart.common.repository.BizQuestionRepository;
 import cn.tr.module.smart.common.service.IBizQuestionGroupService;
+import cn.tr.module.smart.common.service.IBizQuestionGroupSquareService;
 import cn.tr.module.smart.web.dto.BizDeptUnlinkQuestionQueryDTO;
 import cn.tr.module.smart.web.dto.BizWebQuestionAnswerDTO;
 import cn.tr.module.smart.web.vo.BizDeptUnlinkQuestionVO;
@@ -50,6 +52,10 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
     private BizQuestionGroupSquareRepository bizQuestionGroupSquareRepository;
     @Autowired
     private BizQuestionSquareServiceImpl bizQuestionSquareServiceImpl;
+    @Autowired
+    private IBizQuestionGroupSquareService bizQuestionGroupSquareService;
+    @Autowired
+    private BizQuestionDeptRepository bizQuestionDeptRepository;
 
 
     private static final String[] MD5_FIELDS = {"name", "type", "interval", "frequency"};
@@ -128,6 +134,20 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
         }
         bizQuestionRepository.delete(new LambdaQueryWrapper<BizQuestionPO>()
                 .in(BizQuestionPO::getGroupId,ids));
+        //删除推送到广场数据
+        List<BizQuestionGroupSquarePO> bizQuestionGroupSquarePOS = bizQuestionGroupSquareRepository
+                .selectList(new LambdaQueryWrapper<BizQuestionGroupSquarePO>()
+                .in(BizQuestionGroupSquarePO::getHospitalGroupId, ids));
+        if(ObjectUtil.isNotEmpty(bizQuestionGroupSquarePOS)){
+            List<String> groupSquareIds = bizQuestionGroupSquarePOS.stream().map(BizQuestionGroupSquarePO::getId)
+                    .filter(StringUtils::isNotBlank).collect(Collectors.toList());
+            if(ObjectUtil.isNotEmpty(groupSquareIds)){
+                bizQuestionGroupSquareService.removeBizQuestionGroupSquareByIds(groupSquareIds);
+            }
+        }
+        //删除科室关联信息
+        bizQuestionDeptRepository.delete(new LambdaQueryWrapper<BizQuestionDeptPO>()
+                .in(BizQuestionDeptPO::getQuestionGroupId, ids));
         return baseRepository.deleteBatchIds(ids);
     }
 

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

@@ -112,6 +112,8 @@ public class BizQuestionGroupSquareServiceImpl implements IBizQuestionGroupSquar
         if(CollectionUtil.isEmpty(ids)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
+        bizQuestionSquareRepository.delete(new LambdaQueryWrapper<BizQuestionSquarePO>()
+                .in(BizQuestionSquarePO::getGroupId,ids));
         return baseRepository.deleteBatchIds(ids);
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/vo/BizWebPainAssessmentVO.java

@@ -19,9 +19,12 @@ import java.util.Date;
 public class BizWebPainAssessmentVO  implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "手术ID", position = 1)
+    @ApiModelProperty(value = "镇痛评价id", position = 0)
     private String id;
 
+    @ApiModelProperty(value = "手术ID", position = 1)
+    private String clinicId;
+
     @ApiModelProperty(value = "病人姓名", position = 2)
     private String patientName;
 

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizPainAssessmentMapper.xml

@@ -6,7 +6,8 @@
 
     <select id="selectWebBizPainAssessmentList" resultType="cn.tr.module.smart.web.vo.BizWebPainAssessmentVO">
         SELECT
-            bcr.id as id,
+            bpa.id as id,
+            bcr.id as clinicId,
             bcr.patient_name as patientName,
             bcr.clinic_name as clinicName,
             bcr.dept_id as deptId,