add

新增患者小程序患者列表操作

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/mapper/BizClinicMapper.java → tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/mapper/BizClinicMapper.java

@@ -1,9 +1,9 @@
-package cn.tr.module.smart.wx.mapper;
+package cn.tr.module.smart.common.mapper;
 
 import cn.tr.module.smart.common.po.BizClinicPO;
 import cn.tr.module.smart.common.dto.BizClinicDTO;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
-import cn.tr.module.smart.wx.vo.BizWxAppletClinicVO;
+import cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

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

@@ -5,7 +5,7 @@ import cn.tr.module.smart.common.dto.BizClinicQueryDTO;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicShiftCareDTO;
-import cn.tr.module.smart.wx.vo.BizWxAppletClinicVO;
+import cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO;
 
 import java.util.*;
 

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

@@ -1,6 +1,5 @@
 package cn.tr.module.smart.common.service.impl;
 
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.core.exception.TRExcCode;
@@ -8,9 +7,8 @@ import cn.tr.core.strategy.LoginUserStrategy;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicShiftCareDTO;
-import cn.tr.module.smart.wx.vo.BizWxAppletClinicVO;
+import cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,7 +22,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.tr.module.smart.common.service.IBizClinicService;
-import cn.tr.module.smart.wx.mapper.BizClinicMapper;
+import cn.tr.module.smart.common.mapper.BizClinicMapper;
 /**
  * 手术信息Service接口实现类
  *

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

@@ -1,7 +1,6 @@
 package cn.tr.module.smart.wx.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.tr.core.pojo.CommonResult;
 import cn.tr.core.strategy.LoginUserStrategy;
 import cn.tr.core.validation.Insert;
@@ -10,7 +9,7 @@ import cn.tr.module.smart.common.service.IBizClinicService;
 import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicShiftCareDTO;
-import cn.tr.module.smart.wx.vo.BizWxAppletClinicVO;
+import cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO;
 import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import cn.tr.plugin.mybatis.base.BaseController;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;

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

@@ -3,6 +3,7 @@ package cn.tr.module.smart.wx.controller;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
+import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.pojo.CommonResult;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @AllArgsConstructor
 @Slf4j
-@RequestMapping("/wx/user/{appid}")
+@RequestMapping("/wx/user")
 @Api(tags = "微信小程序用户")
 public class WxAppletUserController {
     private final WxMaService wxMaService;
@@ -31,7 +32,7 @@ public class WxAppletUserController {
      * 获取用户信息接口
      * </pre>
      */
-    @PostMapping("/info")
+    @PostMapping("/{appid}/info")
     @ApiOperation("获取微信用户信息")
     public CommonResult<WxMaUserInfo> info(@PathVariable String appid, @RequestBody WxAppletEncodeInfoDTO source) {
         if (!wxMaService.switchover(appid)) {
@@ -49,4 +50,12 @@ public class WxAppletUserController {
         WxMaConfigHolder.remove();//清理ThreadLocal
         return CommonResult.success(userInfo);
     }
+
+
+    @PostMapping("/{tenantId}")
+    @ApiOperation("切换用户当前登录的医院")
+    public CommonResult<Boolean> shiftTenant(@PathVariable("tenantId") String tenantId){
+
+        return CommonResult.success(Boolean.TRUE);
+    }
 }

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

@@ -1,4 +1,4 @@
-package cn.tr.module.smart.wx.vo;
+package cn.tr.module.smart.wx.controller.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;