diff --git a/.idea/misc.xml b/.idea/misc.xml
index edb557b..07ab7a4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -21,5 +21,5 @@
-
+
\ No newline at end of file
diff --git a/four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java b/four-api-system/src/main/java/com/four/system/api/domain/RegistrationInformation.java
similarity index 98%
rename from four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java
rename to four-api-system/src/main/java/com/four/system/api/domain/RegistrationInformation.java
index 6d55fe4..b15ec84 100644
--- a/four-api-system/src/main/java/com/four/system/api/domain/registrationInformation.java
+++ b/four-api-system/src/main/java/com/four/system/api/domain/RegistrationInformation.java
@@ -1,14 +1,11 @@
package com.four.system.api.domain;
-import com.four.system.api.model.LoginUser;
import org.apache.poi.hpsf.Decimal;
-import java.util.Date;
-
/**
* 医生信息表
* */
-public class registrationInformation {
+public class RegistrationInformation {
/**
* 医生注册信息id
*/
@@ -144,41 +141,46 @@ public class registrationInformation {
*/
private Integer differentialState;
+ public RegistrationInformation() {
+ }
- public registrationInformation(Long registrationInformationId, Long userId, String affiliatedHospital, Long medicalDepartmentId, Long professionalTitleDoctorId, String personalResume, String areaExpertise, Integer numberPatientsServed, Decimal consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Long deptId, String userName, String nickName, String userType, String email, String phonenumber, String sex, String avatar, String password, String status, String delFlag, String loginIp, String createBy, String remark, String updateBy, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, Decimal userMoney, String invitationCode, Integer differentialState) {
- this.registrationInformationId = registrationInformationId;
- this.userId = userId;
- this.affiliatedHospital = affiliatedHospital;
- this.medicalDepartmentId = medicalDepartmentId;
- this.professionalTitleDoctorId = professionalTitleDoctorId;
- this.personalResume = personalResume;
- this.areaExpertise = areaExpertise;
- this.numberPatientsServed = numberPatientsServed;
- this.consultingPrice = consultingPrice;
- this.praise = praise;
- this.registrationInformationExamineStatus = registrationInformationExamineStatus;
- this.deptId = deptId;
- this.userName = userName;
- this.nickName = nickName;
- this.userType = userType;
- this.email = email;
- this.phonenumber = phonenumber;
- this.sex = sex;
- this.avatar = avatar;
- this.password = password;
- this.status = status;
- this.delFlag = delFlag;
- this.loginIp = loginIp;
- this.createBy = createBy;
- this.remark = remark;
- this.updateBy = updateBy;
- this.userSign = userSign;
- this.bindWechatStatus = bindWechatStatus;
- this.realNameAuthenticationStatus = realNameAuthenticationStatus;
- this.bindBankCardStatus = bindBankCardStatus;
- this.userMoney = userMoney;
- this.invitationCode = invitationCode;
- this.differentialState = differentialState;
+ @Override
+ public String toString() {
+ return "RegistrationInformation{" +
+ "registrationInformationId=" + registrationInformationId +
+ ", userId=" + userId +
+ ", affiliatedHospital='" + affiliatedHospital + '\'' +
+ ", medicalDepartmentId=" + medicalDepartmentId +
+ ", professionalTitleDoctorId=" + professionalTitleDoctorId +
+ ", personalResume='" + personalResume + '\'' +
+ ", areaExpertise='" + areaExpertise + '\'' +
+ ", numberPatientsServed=" + numberPatientsServed +
+ ", consultingPrice=" + consultingPrice +
+ ", praise=" + praise +
+ ", registrationInformationExamineStatus=" + registrationInformationExamineStatus +
+ ", deptId=" + deptId +
+ ", userName='" + userName + '\'' +
+ ", nickName='" + nickName + '\'' +
+ ", userType='" + userType + '\'' +
+ ", email='" + email + '\'' +
+ ", phonenumber='" + phonenumber + '\'' +
+ ", sex='" + sex + '\'' +
+ ", avatar='" + avatar + '\'' +
+ ", password='" + password + '\'' +
+ ", status='" + status + '\'' +
+ ", delFlag='" + delFlag + '\'' +
+ ", loginIp='" + loginIp + '\'' +
+ ", createBy='" + createBy + '\'' +
+ ", remark='" + remark + '\'' +
+ ", updateBy='" + updateBy + '\'' +
+ ", userSign='" + userSign + '\'' +
+ ", bindWechatStatus=" + bindWechatStatus +
+ ", realNameAuthenticationStatus=" + realNameAuthenticationStatus +
+ ", bindBankCardStatus=" + bindBankCardStatus +
+ ", userMoney=" + userMoney +
+ ", invitationCode='" + invitationCode + '\'' +
+ ", differentialState=" + differentialState +
+ '}';
}
public Long getRegistrationInformationId() {
@@ -445,45 +447,39 @@ public class registrationInformation {
this.differentialState = differentialState;
}
- public registrationInformation() {
- }
-
- @Override
- public String toString() {
- return "registrationInformation{" +
- "registrationInformationId=" + registrationInformationId +
- ", userId=" + userId +
- ", affiliatedHospital='" + affiliatedHospital + '\'' +
- ", medicalDepartmentId=" + medicalDepartmentId +
- ", professionalTitleDoctorId=" + professionalTitleDoctorId +
- ", personalResume='" + personalResume + '\'' +
- ", areaExpertise='" + areaExpertise + '\'' +
- ", numberPatientsServed=" + numberPatientsServed +
- ", consultingPrice=" + consultingPrice +
- ", praise=" + praise +
- ", registrationInformationExamineStatus=" + registrationInformationExamineStatus +
- ", deptId=" + deptId +
- ", userName='" + userName + '\'' +
- ", nickName='" + nickName + '\'' +
- ", userType='" + userType + '\'' +
- ", email='" + email + '\'' +
- ", phonenumber='" + phonenumber + '\'' +
- ", sex='" + sex + '\'' +
- ", avatar='" + avatar + '\'' +
- ", password='" + password + '\'' +
- ", status='" + status + '\'' +
- ", delFlag='" + delFlag + '\'' +
- ", loginIp='" + loginIp + '\'' +
- ", createBy='" + createBy + '\'' +
- ", remark='" + remark + '\'' +
- ", updateBy='" + updateBy + '\'' +
- ", userSign='" + userSign + '\'' +
- ", bindWechatStatus=" + bindWechatStatus +
- ", realNameAuthenticationStatus=" + realNameAuthenticationStatus +
- ", bindBankCardStatus=" + bindBankCardStatus +
- ", userMoney=" + userMoney +
- ", invitationCode='" + invitationCode + '\'' +
- ", differentialState=" + differentialState +
- '}';
+ public RegistrationInformation(Long registrationInformationId, Long userId, String affiliatedHospital, Long medicalDepartmentId, Long professionalTitleDoctorId, String personalResume, String areaExpertise, Integer numberPatientsServed, Decimal consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Long deptId, String userName, String nickName, String userType, String email, String phonenumber, String sex, String avatar, String password, String status, String delFlag, String loginIp, String createBy, String remark, String updateBy, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, Decimal userMoney, String invitationCode, Integer differentialState) {
+ this.registrationInformationId = registrationInformationId;
+ this.userId = userId;
+ this.affiliatedHospital = affiliatedHospital;
+ this.medicalDepartmentId = medicalDepartmentId;
+ this.professionalTitleDoctorId = professionalTitleDoctorId;
+ this.personalResume = personalResume;
+ this.areaExpertise = areaExpertise;
+ this.numberPatientsServed = numberPatientsServed;
+ this.consultingPrice = consultingPrice;
+ this.praise = praise;
+ this.registrationInformationExamineStatus = registrationInformationExamineStatus;
+ this.deptId = deptId;
+ this.userName = userName;
+ this.nickName = nickName;
+ this.userType = userType;
+ this.email = email;
+ this.phonenumber = phonenumber;
+ this.sex = sex;
+ this.avatar = avatar;
+ this.password = password;
+ this.status = status;
+ this.delFlag = delFlag;
+ this.loginIp = loginIp;
+ this.createBy = createBy;
+ this.remark = remark;
+ this.updateBy = updateBy;
+ this.userSign = userSign;
+ this.bindWechatStatus = bindWechatStatus;
+ this.realNameAuthenticationStatus = realNameAuthenticationStatus;
+ this.bindBankCardStatus = bindBankCardStatus;
+ this.userMoney = userMoney;
+ this.invitationCode = invitationCode;
+ this.differentialState = differentialState;
}
}
diff --git a/four-api-system/src/main/java/com/four/system/api/domain/SysDoctor.java b/four-api-system/src/main/java/com/four/system/api/domain/SysDoctor.java
new file mode 100644
index 0000000..280545d
--- /dev/null
+++ b/four-api-system/src/main/java/com/four/system/api/domain/SysDoctor.java
@@ -0,0 +1,247 @@
+package com.four.system.api.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 查询价格倒序的医生信息
+ */
+public class SysDoctor {
+
+ /**
+ * 医生注册信息id
+ */
+ private Long registrationInformationId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 真实姓名
+ */
+ private String realName;
+
+ /**
+ * 所属医院
+ */
+ private String affiliatedHospital;
+
+ /**
+ * 医生科室id
+ */
+ private Long medicalDepartmentId;
+
+ /**
+ * 医生职称id
+ */
+ private Long professionalTitleDoctorId;
+
+ /**
+ * 个人简历
+ */
+ private String personalResume;
+
+ /**
+ * 擅长领域
+ */
+ private String areaExpertise;
+
+ /**
+ * 注册时间
+ */
+ private Date registrationTime;
+
+ /**
+ * 服务患者次数
+ */
+ private Integer numberPatientsServed;
+
+ /**
+ * 咨询价格
+ */
+ private BigDecimal consultingPrice;
+
+ /**
+ * 好评人数
+ */
+ private Integer praise;
+
+ /**
+ * 审核状态:1:待审核2:审核通过3:已驳回
+ */
+ private Integer registrationInformationExamineStatus;
+
+ /**
+ * 医生的状态:1:在线2:离线
+ */
+ private Integer registrationInformationMedicStatus;
+
+ /**
+ * 医生职称名称
+ */
+ private String professionalTitleDoctorName;
+
+ public SysDoctor(Long registrationInformationId, Long userId, String realName, String affiliatedHospital, Long medicalDepartmentId, Long professionalTitleDoctorId, String personalResume, String areaExpertise, Date registrationTime, Integer numberPatientsServed, BigDecimal consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Integer registrationInformationMedicStatus, String professionalTitleDoctorName) {
+ this.registrationInformationId = registrationInformationId;
+ this.userId = userId;
+ this.realName = realName;
+ this.affiliatedHospital = affiliatedHospital;
+ this.medicalDepartmentId = medicalDepartmentId;
+ this.professionalTitleDoctorId = professionalTitleDoctorId;
+ this.personalResume = personalResume;
+ this.areaExpertise = areaExpertise;
+ this.registrationTime = registrationTime;
+ this.numberPatientsServed = numberPatientsServed;
+ this.consultingPrice = consultingPrice;
+ this.praise = praise;
+ this.registrationInformationExamineStatus = registrationInformationExamineStatus;
+ this.registrationInformationMedicStatus = registrationInformationMedicStatus;
+ this.professionalTitleDoctorName = professionalTitleDoctorName;
+ }
+
+ public SysDoctor() {
+ }
+
+ public Long getRegistrationInformationId() {
+ return registrationInformationId;
+ }
+
+ public void setRegistrationInformationId(Long registrationInformationId) {
+ this.registrationInformationId = registrationInformationId;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public String getRealName() {
+ return realName;
+ }
+
+ public void setRealName(String realName) {
+ this.realName = realName;
+ }
+
+ public String getAffiliatedHospital() {
+ return affiliatedHospital;
+ }
+
+ public void setAffiliatedHospital(String affiliatedHospital) {
+ this.affiliatedHospital = affiliatedHospital;
+ }
+
+ public Long getMedicalDepartmentId() {
+ return medicalDepartmentId;
+ }
+
+ public void setMedicalDepartmentId(Long medicalDepartmentId) {
+ this.medicalDepartmentId = medicalDepartmentId;
+ }
+
+ public Long getProfessionalTitleDoctorId() {
+ return professionalTitleDoctorId;
+ }
+
+ public void setProfessionalTitleDoctorId(Long professionalTitleDoctorId) {
+ this.professionalTitleDoctorId = professionalTitleDoctorId;
+ }
+
+ public String getPersonalResume() {
+ return personalResume;
+ }
+
+ public void setPersonalResume(String personalResume) {
+ this.personalResume = personalResume;
+ }
+
+ public String getAreaExpertise() {
+ return areaExpertise;
+ }
+
+ public void setAreaExpertise(String areaExpertise) {
+ this.areaExpertise = areaExpertise;
+ }
+
+ public Date getRegistrationTime() {
+ return registrationTime;
+ }
+
+ public void setRegistrationTime(Date registrationTime) {
+ this.registrationTime = registrationTime;
+ }
+
+ public Integer getNumberPatientsServed() {
+ return numberPatientsServed;
+ }
+
+ public void setNumberPatientsServed(Integer numberPatientsServed) {
+ this.numberPatientsServed = numberPatientsServed;
+ }
+
+ public BigDecimal getConsultingPrice() {
+ return consultingPrice;
+ }
+
+ public void setConsultingPrice(BigDecimal consultingPrice) {
+ this.consultingPrice = consultingPrice;
+ }
+
+ public Integer getPraise() {
+ return praise;
+ }
+
+ public void setPraise(Integer praise) {
+ this.praise = praise;
+ }
+
+ public Integer getRegistrationInformationExamineStatus() {
+ return registrationInformationExamineStatus;
+ }
+
+ public void setRegistrationInformationExamineStatus(Integer registrationInformationExamineStatus) {
+ this.registrationInformationExamineStatus = registrationInformationExamineStatus;
+ }
+
+ public Integer getRegistrationInformationMedicStatus() {
+ return registrationInformationMedicStatus;
+ }
+
+ public void setRegistrationInformationMedicStatus(Integer registrationInformationMedicStatus) {
+ this.registrationInformationMedicStatus = registrationInformationMedicStatus;
+ }
+
+ public String getProfessionalTitleDoctorName() {
+ return professionalTitleDoctorName;
+ }
+
+ public void setProfessionalTitleDoctorName(String professionalTitleDoctorName) {
+ this.professionalTitleDoctorName = professionalTitleDoctorName;
+ }
+
+ @Override
+ public String toString() {
+ return "SysDoctor{" +
+ "registrationInformationId=" + registrationInformationId +
+ ", userId=" + userId +
+ ", realName='" + realName + '\'' +
+ ", affiliatedHospital='" + affiliatedHospital + '\'' +
+ ", medicalDepartmentId=" + medicalDepartmentId +
+ ", professionalTitleDoctorId=" + professionalTitleDoctorId +
+ ", personalResume='" + personalResume + '\'' +
+ ", areaExpertise='" + areaExpertise + '\'' +
+ ", registrationTime=" + registrationTime +
+ ", numberPatientsServed=" + numberPatientsServed +
+ ", consultingPrice=" + consultingPrice +
+ ", praise=" + praise +
+ ", registrationInformationExamineStatus=" + registrationInformationExamineStatus +
+ ", registrationInformationMedicStatus=" + registrationInformationMedicStatus +
+ ", professionalTitleDoctorName='" + professionalTitleDoctorName + '\'' +
+ '}';
+ }
+}
diff --git a/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class b/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class
index 6ecffe1..825376d 100644
Binary files a/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class and b/four-api-system/target/classes/com/four/system/api/domain/registrationInformation.class differ
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 0005d4a..67b6a4b 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 c28e670..45cb28a 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 9ad0461..e583e8f 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 b7011a8..7398579 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
-#Fri Nov 03 08:26:54 CST 2023
+#Sun Nov 05 19:12:50 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..fc30b94 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,8 +3,9 @@ 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\registrationInformation.class
+com\four\system\api\domain\SysDoctor.class
com\four\system\api\factory\RemoteFileFallbackFactory.class
+com\four\system\api\domain\RegistrationInformation.class
com\four\system\api\RemoteLogService.class
com\four\system\api\domain\SysDictType.class
com\four\system\api\factory\RemoteUserFallbackFactory.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..5d80b64 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
@@ -1,16 +1,17 @@
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDictData.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteFileFallbackFactory.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysRole.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\model\LoginUser.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteUserFallbackFactory.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteLogFallbackFactory.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\RemoteFileService.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\registrationInformation.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysOperLog.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\RemoteUserService.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysLogininfor.java
-D:\hospital\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDictType.java
-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\SysFile.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\RegistrationInformation.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteFileFallbackFactory.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDictData.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysFile.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysUser.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDoctor.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysLogininfor.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\model\LoginUser.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysRole.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\RemoteLogService.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\RemoteFileService.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysOperLog.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\RemoteUserService.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDept.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\domain\SysDictType.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteUserFallbackFactory.java
+D:\Project\api-system\four-api-system\src\main\java\com\four\system\api\factory\RemoteLogFallbackFactory.java