Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizClinicPO.java

@@ -89,6 +89,9 @@ public class BizClinicPO extends TenantPO {
     @ApiModelProperty("上一次看护时间")
     private Date lastCareTime;
 
+    @ApiModelProperty("上一次填写问卷时间")
+    private Date lastQuestionTime;
+
     @TableLogic
     private Integer deleted;
 }

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

@@ -2,6 +2,7 @@ package cn.tr.module.smart.common.service;
 
 import cn.tr.module.smart.common.dto.BizClinicDTO;
 import cn.tr.module.smart.common.dto.BizClinicQueryDTO;
+import cn.tr.module.smart.wx.controller.vo.BizPreSurgeryQuestionVO;
 import cn.tr.module.smart.wx.controller.vo.BizWxDeptQuestionVO;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
@@ -69,5 +70,5 @@ public interface IBizClinicService{
 
     BizWxAppletClinicVO stdSelectWxAppletById(String id);
 
-    List<BizWxDeptQuestionVO> selectPreSurgeryQuestionnaire(String clinicId);
+    BizPreSurgeryQuestionVO selectPreSurgeryQuestionnaire(String clinicId);
 }

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

@@ -9,6 +9,7 @@ import cn.tr.module.smart.common.po.BizDeptPO;
 import cn.tr.module.smart.common.repository.BizDeptRepository;
 import cn.tr.module.smart.common.service.IBizDeptService;
 import cn.tr.module.smart.common.service.IBizQuestionService;
+import cn.tr.module.smart.wx.controller.vo.BizPreSurgeryQuestionVO;
 import cn.tr.module.smart.wx.controller.vo.BizWxDeptQuestionVO;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
@@ -16,6 +17,7 @@ import cn.tr.module.smart.wx.dto.BizWxAppletClinicShiftCareDTO;
 import cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.poi.util.StringUtil;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
@@ -49,6 +51,9 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
     @Autowired
     private IBizQuestionService bizQuestionService;
 
+    @Autowired
+    private BizClinicRepository bizClinicRepository;
+
 
     /**
      * 根据条件查询手术信息
@@ -191,13 +196,15 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
     }
 
     @Override
-    public List<BizWxDeptQuestionVO> selectPreSurgeryQuestionnaire(String clinicId) {
+    public BizPreSurgeryQuestionVO selectPreSurgeryQuestionnaire(String clinicId) {
         //判断临床id是否为空
         if(StrUtil.isBlank(clinicId)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"患者信息不存在");
         }
         BizClinicPO clinic = baseMapper.selectById(clinicId);
         String deptId = clinic.getDeptId();
+        Date lastQuestionTime = clinic.getLastQuestionTime();
+
         //判断科室id是否为空
         if(StrUtil.isBlank(deptId)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"科室信息不存在");
@@ -205,7 +212,13 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
         BizDeptDTO bizDeptDTO = bizDeptService.selectBizDeptById(deptId);
         String groupId = bizDeptDTO.getGroupId();
         //通过获取到的groupId查询问卷调查问题表
-        List<BizWxDeptQuestionVO> result = bizQuestionService.selectBizQuestionByGroupId(groupId);
+        List<BizWxDeptQuestionVO> questionVOList = bizQuestionService.selectBizQuestionByGroupId(groupId);
+
+        BizPreSurgeryQuestionVO result = new BizPreSurgeryQuestionVO();
+        result.setDataList(questionVOList);
+        result.setLastQuestionTime(lastQuestionTime);
+
+
         return result;
     }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWxAppletClinicController.java

@@ -6,6 +6,7 @@ import cn.tr.core.tenant.TenantContextHolder;
 import cn.tr.core.validation.Insert;
 import cn.tr.core.validation.Update;
 import cn.tr.module.smart.common.service.IBizClinicService;
+import cn.tr.module.smart.wx.controller.vo.BizPreSurgeryQuestionVO;
 import cn.tr.module.smart.wx.controller.vo.BizWxDeptQuestionVO;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
@@ -87,9 +88,10 @@ public class BizWxAppletClinicController extends BaseController{
         return CommonResult.success(clinicService.stdSelectWxAppletById(id));
     }
 
+    @ApiOperationSupport(author = "zzy",order = 8)
     @PostMapping("/preSurgeryQuestionnaire/{clinicId}")
-    @ApiOperation(value = "术前问卷",position = 8)
-    public CommonResult<List<BizWxDeptQuestionVO>> preSurgeryQuestionnaire(@PathVariable("clinicId") String clinicId){
+    @ApiOperation(value = "术前问卷",notes = "权限： 无")
+    public CommonResult<BizPreSurgeryQuestionVO> preSurgeryQuestionnaire(@PathVariable("clinicId") String clinicId){
         return CommonResult.success(clinicService.selectPreSurgeryQuestionnaire(clinicId));
     }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/WxAppletUserController.java

@@ -61,14 +61,14 @@ public class WxAppletUserController {
     }
 
     @PostMapping("/editUserInfo")
-    @ApiOperation(value = "编辑当前用户信息",position = 2)
+    @ApiOperation(value = "编辑当前用户信息",position = 3)
     public CommonResult<Boolean> editUserInfo(@PathVariable("tenantId") String tenantId){
         return CommonResult.success( wxUserService.shiftTenant(tenantId));
     }
 
 
     @PostMapping("/allBindHospital")
-    @ApiOperation(value = "获取已绑定的医院列表",position = 2)
+    @ApiOperation(value = "获取已绑定的医院列表",position = 4)
     public CommonResult<List<BizWxUserBindHospitalVO>> allBindHospital(){
         return CommonResult.success( wxUserService.allBindHospital());
     }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizPreSurgeryQuestionVO.java

@@ -0,0 +1,26 @@
+package cn.tr.module.smart.wx.controller.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zzy
+ * @Data 2025/6/4
+ * @Version 1.0
+ * @Description XXX
+ */
+@Data
+@ApiModel("微信小程序术前问卷返回结果")
+@ToString
+public class BizPreSurgeryQuestionVO {
+    @ApiModelProperty("上一次填写问卷时间")
+    private Date lastQuestionTime;
+
+    @ApiModelProperty("问题列表")
+    private List<BizWxDeptQuestionVO> dataList;
+}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizWxDeptQuestionVO.java

@@ -1,5 +1,6 @@
 package cn.tr.module.smart.wx.controller.vo;
 
+import cn.tr.module.smart.common.dto.BizQuestionDTO;
 import cn.tr.plugin.mybatis.config.handler.StringListTypeHandler;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,4 +45,6 @@ public class BizWxDeptQuestionVO {
     @ApiModelProperty(value = "排序", position = 7)
     private Integer sort;
 
+
+
 }

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.tr.module.smart.common.repository.BizWxUserRepository">
+
+    <resultMap id="stdWxUserBindHospitalResult" type="cn.tr.module.smart.wx.controller.vo.BizWxUserBindHospitalVO">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="allBindHospital" resultMap="stdWxUserBindHospitalResult">
+        select
+            bh.id as id,
+            bh.name as name
+        from biz_wx_user_hospital as bwuh
+        join biz_hospital as bh on bh.id = bwuh.tenant_id
+        where bwuh.wx_user_id = #{userId}
+        order by bwuh.create_time desc
+    </select>
+ </mapper>