diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 8d66637..ee2c34b 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,5 +1,14 @@ \ No newline at end of file diff --git a/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java b/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java index 36e64fb..314f9c0 100644 --- a/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java +++ b/four-api-system/src/main/java/com/four/system/api/RemoteUserService.java @@ -1,6 +1,6 @@ package com.four.system.api; -import org.apache.ibatis.annotations.Param; +import com.four.common.duck.request.RequestRegistrationInformation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -14,6 +14,7 @@ import com.four.system.api.domain.SysUser; import com.four.system.api.factory.RemoteUserFallbackFactory; import com.four.system.api.model.LoginUser; + /** * 用户服务 * @@ -60,12 +61,12 @@ public interface RemoteUserService /** - * 注册用户信息 + * 注册医生的用户信息用户信息 * - * @param sysUser 用户信息 * @param source 请求来源 * @return 结果 */ @PostMapping("/user/healthRegister") - public R healthRegister(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + public R healthRegister(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java b/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java index 22a47a0..45ba2e2 100644 --- a/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java +++ b/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java @@ -13,6 +13,7 @@ import com.four.common.core.annotation.Excel.Type; import com.four.common.core.annotation.Excels; import com.four.common.core.web.domain.BaseEntity; import com.four.common.core.xss.Xss; +import org.apache.poi.hpsf.Decimal; /** * 用户对象 sys_user @@ -123,6 +124,20 @@ public class SysUser extends BaseEntity /** 状态1：患者 2：医生 **/ private Integer differentialState; + + + private Long medicalDepartmentId; + private Long professionalTitleDoctorId; + private Integer numberPatientsServed; + private Decimal consultingPrice; + private Integer praise; + private Integer registrationInformationExamineStatus; + private Integer registrationInformationMedicStatus; + + + + + public SysUser(Long userId, Long deptId, String userName, String nickName, String email, String phonenumber, String personalResume, String affiliatedHospital, String areaExpertise, String sex, String avatar, String password, String status, String delFlag, String loginIp, Date loginDate, SysDept dept, List roles, Long[] roleIds, Long[] postIds, Long roleId, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, String invitationCode, Integer differentialState) { this.userId = userId; this.deptId = deptId; diff --git a/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java b/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java index 666d693..0aa8f56 100644 --- a/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java +++ b/four-api-system/src/main/java/com/four/system/api/factory/RemoteUserFallbackFactory.java @@ -1,5 +1,6 @@ package com.four.system.api.factory; +import com.four.common.duck.request.RequestRegistrationInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -44,9 +45,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory healthRegister(SysUser sysUser, String source) { - return R.fail("注册维度健康用户失败:" + throwable.getMessage()); + return R.fail("医生用户失败:" + throwable.getMessage()); } - }; } diff --git a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class index 3b36643..29ff84b 100644 Binary files a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class and b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory$1.class differ diff --git a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory.class b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory.class index 45cb28a..c28e670 100644 Binary files a/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory.class and b/four-api-system/target/classes/com/four/system/api/factory/RemoteUserFallbackFactory.class differ diff --git a/four-api-system/target/four-api-system-3.6.3.jar b/four-api-system/target/four-api-system-3.6.3.jar index 5abd3fd..bc40f20 100644 Binary files a/four-api-system/target/four-api-system-3.6.3.jar and b/four-api-system/target/four-api-system-3.6.3.jar differ diff --git a/four-api-system/target/maven-archiver/pom.properties b/four-api-system/target/maven-archiver/pom.properties index f08387c..af8518e 100644 --- a/four-api-system/target/maven-archiver/pom.properties +++ b/four-api-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 26 21:31:47 CST 2023 +#Fri Oct 27 19:38:37 CST 2023 groupId=com.four artifactId=four-api-system version=3.6.3 diff --git a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 2ace286..9073f46 100644 --- a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -3,6 +3,7 @@ com\four\system\api\factory\RemoteLogFallbackFactory$1.class com\four\system\api\domain\SysDictData.class com\four\system\api\domain\SysFile.class com\four\system\api\factory\RemoteFileFallbackFactory$1.class +com\four\system\api\domain\RequestRegistrationInformation.class com\four\system\api\domain\registrationInformation.class com\four\system\api\factory\RemoteFileFallbackFactory.class com\four\system\api\RemoteLogService.class diff --git a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 7857a8e..5516f7e 100644 --- a/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/four-api-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -13,4 +13,5 @@ D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\ D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDept.java D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysUser.java D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\RemoteLogService.java +D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\RequestRegistrationInformation.java D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysFile.java