add

微信用户获取登录信息

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizClinicDTO.java

@@ -56,7 +56,7 @@ public class BizClinicDTO extends BaseDTO  {
     private Boolean followUp;
 
     @ApiModelProperty(value = "住院号", position = 15)
-    private String hospitalNumber;
+    private String patientCode;
 
     @ApiModelProperty(value = "患者姓名", position = 16)
     private String patientName;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/mapper/BizWxUserMapper.java

@@ -2,7 +2,10 @@ package cn.tr.module.smart.common.mapper;
 
 import cn.tr.module.smart.common.po.BizWxUserPO;
 import cn.tr.module.smart.common.dto.BizWxUserDTO;
+import cn.tr.module.sys.oauth2.dto.OAuth2PswLoginInfoDTO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 
 import java.util.List;
@@ -25,4 +28,11 @@ public interface BizWxUserMapper {
 
     List<BizWxUserPO> convertPOList(List<BizWxUserDTO> source);
 
+    @Mappings(
+            {
+                    @Mapping(source = "id",target = "userId"),
+                    @Mapping(source = "lastLoginTime",target = "lastLoginDate")
+            }
+    )
+    OAuth2PswLoginInfoDTO convertPswLoginInfo(BizWxUserDTO bizWxUserDTO);
 }

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

@@ -40,7 +40,7 @@ public class BizClinicPO extends TenantPO {
 
     /** 住院号 */
     @ApiModelProperty(value = "住院号", position = 2)
-    private String hospitalNumber;
+    private String patientCode;
 
     /** 科室 */
     @ApiModelProperty(value = "科室", position = 3)

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

@@ -127,7 +127,7 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
     public List<BizWxAppletClinicVO> stdSelectWxAppletList(BizWxAppletClinicQueryDTO query) {
         return BizClinicMapper.INSTANCE.convertWxAppletVOList(
                 baseMapper.selectList(new LambdaQueryWrapper<BizClinicPO>()
-                                .like(StrUtil.isNotEmpty(query.getPatientCode()),BizClinicPO::getHospitalNumber,query.getPatientCode())
+                                .like(StrUtil.isNotEmpty(query.getPatientCode()),BizClinicPO::getPatientCode,query.getPatientCode())
                         .eq(BizClinicPO::getWxUserId, query.getUserId())
                         .orderByDesc(BizClinicPO::getCare,BizClinicPO::getClinicStartTime))
         );

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/config/WxAppletOauth2UserOperator.java

@@ -11,12 +11,14 @@ import cn.hutool.http.useragent.UserAgentUtil;
 import cn.tr.core.utils.IpUtil;
 import cn.tr.core.utils.ServletUtils;
 import cn.tr.module.smart.common.dto.BizWxUserDTO;
+import cn.tr.module.smart.common.mapper.BizWxUserMapper;
 import cn.tr.module.smart.common.service.IBizWxUserService;
 import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import cn.tr.module.sys.oauth2.dto.AccountUserInfoDTO;
 import cn.tr.module.sys.oauth2.dto.AccountUserInfoEditDTO;
 import cn.tr.module.sys.oauth2.dto.OAuth2PswLoginInfoDTO;
 import cn.tr.module.sys.oauth2.dto.OAuth2PswReqDTO;
+import cn.tr.module.sys.oauth2.mapper.OAuth2Mapper;
 import cn.tr.module.sys.oauth2.psw.operator.AbstractOAuth2PswUserOperator;
 import cn.tr.module.sys.oauth2.psw.operator.LoginOAuth2PswUserOperator;
 import cn.tr.module.sys.user.service.ISysUserService;
@@ -49,8 +51,6 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
     @Autowired
     private IBizWxUserService wxUserService;
 
-    @Autowired
-    private ISysUserService sysUserService;
 
     @SneakyThrows
     @Override
@@ -134,7 +134,8 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
 
     @Override
     public OAuth2PswLoginInfoDTO getUserLoginInfo() {
-        return null;
+        String loginId =String.valueOf( SaTokenUtils.getStpUtil().getLoginId());
+        return  BizWxUserMapper.INSTANCE.convertPswLoginInfo(wxUserService.selectBizWxUserById(loginId));
     }
 
     @Override

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

@@ -35,7 +35,7 @@ public class BizWxAppletClinicVO implements Serializable {
     private String patientGender;
 
     @ApiModelProperty(value = "住院号", position = 5)
-    private String hospitalNumber;
+    private String patientCode;
 
     @ApiModelProperty(value = "手术开始时间", position = 6)
     private Date clinicStartTime;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizClinicAddOrEditDTO.java

@@ -38,7 +38,7 @@ public class BizClinicAddOrEditDTO implements Serializable {
 
     @ApiModelProperty(value = "住院号", position = 4,required = true)
     @NotBlank  (message = "住院号不能为空",groups = {Update.class, Insert.class})
-    private String hospitalNumber;
+    private String patientCode;
 
     @ApiModelProperty(value = "年龄", position = 5,required = true)
     @NotNull  (message = "年龄不能为空",groups = {Update.class, Insert.class})

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

@@ -9,7 +9,7 @@
         <result property="patientName" column="patientName"/>
         <result property="patientAge" column="patientAge"/>
         <result property="patientGender" column="patientGender"/>
-        <result property="hospitalNumber" column="hospitalNumber"/>
+        <result property="patientCode" column="patientCode"/>
         <result property="clinicStartTime" column="clinicStartTime"/>
         <result property="deptName" column="deptName"/>
         <result property="clinicName" column="clinicName"/>

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2PswLoginInfoDTO.java

@@ -40,6 +40,8 @@ public class OAuth2PswLoginInfoDTO implements Serializable {
 
     private String orgPathName;
 
+    private String lastLoginTenantId;
+
     public String getAvatar() {
         return UserUtil.getAvatar(userId);
     }