Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/repository/ImMsgReceivedRepository.java

@@ -50,7 +50,6 @@ public interface ImMsgReceivedRepository extends BaseMapper<ImMsgReceivedPO> {
             "im_msg_received as imr\n" +
             "left join biz_wx_user as bwu on bwu.id=imr.msg_from\n" +
             "left join sys_user as su on su.id=imr.msg_from " +
-            "where imr.group_id = #{query.clinicId}" +
-            "order by imr.send_time desc")
+            "where imr.group_id = #{query.clinicId}" )
     List<ImMsgReceivedVO> stdSelectImMsgReceivedList(@Param("query") ImMsgReceivedQueryDTO query);
 }

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

@@ -9,10 +9,12 @@ import cn.tr.module.smart.app.controller.vo.AppDeptQuestionGroupVO;
 import cn.tr.module.smart.app.controller.vo.AppQuestionAndDeptListVO;
 import cn.tr.module.smart.common.dto.BizDeptDTO;
 import cn.tr.module.smart.common.dto.BizDeptQueryDTO;
+import cn.tr.module.smart.common.enums.ClinicPhaseEnums;
 import cn.tr.module.smart.common.mapper.BizDeptMapper;
 import cn.tr.module.smart.common.po.BizDeptPO;
 import cn.tr.module.smart.common.po.BizDocDeptPO;
 import cn.tr.module.smart.common.po.BizQuestionDeptPO;
+import cn.tr.module.smart.common.po.BizQuestionGroupPO;
 import cn.tr.module.smart.common.repository.BizDeptRepository;
 import cn.tr.module.smart.common.repository.BizQuestionGroupRepository;
 import cn.tr.module.smart.common.service.IBizDeptService;
@@ -170,7 +172,6 @@ public class BizDeptServiceImpl implements IBizDeptService {
          return baseRepository.update(null,
                 new LambdaUpdateWrapper<BizDeptPO>()
                         .set(BizDeptPO::getMissionDocCount, bizDocDeptPOS.size())
-                        .set(BizDeptPO::getGroupId,CollectionUtil.getFirst(docIds))
                         .eq(BizDeptPO::getId, deptId)) != 0;
     }
 
@@ -204,11 +205,20 @@ public class BizDeptServiceImpl implements IBizDeptService {
             bizQuestionDeptPO.setQuestionGroupId(questionGroupId);
             return bizQuestionDeptPO;
         }).collect(Collectors.toList());
+        //过滤先出术后问卷
+        List<BizQuestionGroupPO> bizQuestionGroupPOS =
+                questionGroupRepository.selectList(new LambdaQueryWrapper<BizQuestionGroupPO>()
+                        .in(BizQuestionGroupPO::getId, questionGroupIds)
+                        .eq(BizQuestionGroupPO::getType, ClinicPhaseEnums.AFTER));
+
         bizQuestionDeptService.saveOrUpdateBatch(collect);
+
         return baseRepository.update(null,
                 new LambdaUpdateWrapper<BizDeptPO>()
                         .set(BizDeptPO::getQuestionCount, collect.size())
-                        .eq(BizDeptPO::getId, deptId)) != 0;
+                        .set(BizDeptPO::getGroupId,CollectionUtil.getFirst(
+                                bizQuestionGroupPOS.stream().map(BizQuestionGroupPO::getId).collect(Collectors.toList())
+                        )).eq(BizDeptPO::getId, deptId)) != 0;
     }
 
     @Override

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizMissionDocController.java

@@ -2,6 +2,7 @@ package cn.tr.module.smart.web.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.pojo.CommonResult;
 import cn.tr.core.pojo.TableDataInfo;
 import cn.tr.core.validation.Insert;
@@ -51,6 +52,7 @@ public class BizMissionDocController extends BaseController{
     @ApiOperationSupport(author = "lf",order = 2)
     @ApiOperation(value = "根据id查询宣教文档",notes = "权限： common:missionDoc:query")
     @GetMapping("/detail/{id}")
+    @TenantIgnore
     @SaCheckPermission("common:missionDoc:query")
     public CommonResult<BizMissionDocDTO> findById(@PathVariable("id") String id){
         return CommonResult.success(bizMissionDocService.selectBizMissionDocById(id));

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizMissionDocSquareController.java

@@ -48,6 +48,7 @@ public class BizMissionDocSquareController extends BaseController{
     @ApiOperationSupport(author = "lf",order = 2)
     @ApiOperation(value = "根据id查询宣教文档广场",notes = "权限： common:missionDocSquare:query")
     @GetMapping("/detail/{id}")
+    @TenantIgnore
     @SaCheckPermission("common:missionDocSquare:query")
     public CommonResult<BizMissionDocSquareDTO> findById(@PathVariable("id") String id){
         return CommonResult.success(bizMissionDocSquareService.selectBizMissionDocSquareById(id));

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

@@ -60,4 +60,7 @@ public class BizWebPainAssessmentVO  implements Serializable {
 
     @ApiModelProperty(value = "患者头像",position = 13)
     private String imageUrl;
+
+    @ApiModelProperty(value = "评价时间", position = 14)
+    private Date createTime;
 }

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

@@ -53,6 +53,7 @@
         bcr.patient_code as patientCode,
         bpa.satisfaction_rating as satisfactionRating,
         bpa.id as assessmentId,
+        bpa.create_time as create_time,
         bcr.create_time as create_time,
         bcr.create_by as create_by,
         bcr.update_time as update_time,

tr-modules/tr-module-system/src/main/resources/mapper/user/SysUserMapper.xml

@@ -90,6 +90,7 @@
         join sys_user_tenant as sut on sut.user_id=su.id
         join sys_tenant as st on st.id=sut.tenant_id
         where su.id=#{currentUserId}
+        order by st.create_time desc
     </select>
 
     <select id="stdSelectById" resultMap="stdResult">