重构项目
parent
3de69b277d
commit
4c714b51c0
18
pom.xml
18
pom.xml
|
@ -8,7 +8,7 @@
|
|||
<version>3.6.3</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<version>3.6.3</version>
|
||||
<version>3.6.4</version>
|
||||
<artifactId>four-modules-system</artifactId>
|
||||
|
||||
<description>
|
||||
|
@ -86,6 +86,7 @@
|
|||
|
||||
</dependencies>
|
||||
|
||||
|
||||
<build>
|
||||
<finalName>${project.artifactId}</finalName>
|
||||
<plugins>
|
||||
|
@ -102,5 +103,20 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>menghang-public</id>
|
||||
<name>menghang-public</name>
|
||||
<url>http://47.120.41.128:8081/repository/maven-public/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>menghang-releases</id>
|
||||
<name>menghang-releases</name>
|
||||
<url>http://47.120.41.128:8081/repository/maven-releases/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
</project>
|
||||
|
|
|
@ -13,16 +13,13 @@ import com.four.common.security.annotation.InnerAuth;
|
|||
import com.four.common.security.annotation.RequiresPermissions;
|
||||
import com.four.common.security.utils.SecurityUtils;
|
||||
import com.four.system.api.domain.SysDept;
|
||||
import com.four.system.api.domain.SysDoctor;
|
||||
import com.four.system.api.domain.SysRole;
|
||||
import com.four.system.api.domain.SysUser;
|
||||
import com.four.system.api.model.LoginUser;
|
||||
import com.four.system.domain.SysDoctor;
|
||||
import com.four.system.domain.SysRegistrationInformation;
|
||||
import com.four.system.service.*;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.apache.poi.hpsf.Decimal;
|
||||
import org.apache.xmlbeans.impl.jam.mutable.MElement;
|
||||
import org.aspectj.weaver.loadtime.Aj;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
|
@ -1,181 +0,0 @@
|
|||
package com.four.system.domain;
|
||||
|
||||
|
||||
import org.apache.poi.hpsf.Decimal;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 查询价格倒序的医生信息
|
||||
*/
|
||||
public class SysDoctor {
|
||||
|
||||
/***
|
||||
* 医生注册信息id
|
||||
*/
|
||||
private Long registrationInformationId;
|
||||
/***
|
||||
* 所属医院
|
||||
*/
|
||||
private String affiliatedHospital;
|
||||
/***
|
||||
* 医生科室id
|
||||
*/
|
||||
private Long medicalDepartmentId;
|
||||
/***
|
||||
* 医生职称id
|
||||
*/
|
||||
private Long professionalTitleDoctorId;
|
||||
/***
|
||||
* 个人简历
|
||||
*/
|
||||
private String personalResume;
|
||||
/***
|
||||
* 擅长领域
|
||||
*/
|
||||
private String areaExpertise;
|
||||
/***
|
||||
* 服务患者次数
|
||||
*/
|
||||
private Integer numberPatientsServed;
|
||||
/***
|
||||
* 咨询价格
|
||||
*/
|
||||
private BigDecimal consultingPrice;
|
||||
/***
|
||||
* 好评人数
|
||||
*/
|
||||
private Integer praise;
|
||||
/***
|
||||
* 审核状态:1:待审核2:审核通过3:已驳回
|
||||
*/
|
||||
private Integer registrationInformationExamineStatus;
|
||||
/***
|
||||
* 医生的状态:1:在线2:离线
|
||||
*/
|
||||
private Integer registrationInformationMedicStatus;
|
||||
|
||||
|
||||
public SysDoctor(Long registrationInformationId, String affiliatedHospital, Long medicalDepartmentId, Long professionalTitleDoctorId, String personalResume, String areaExpertise, Integer numberPatientsServed, BigDecimal consultingPrice, Integer praise, Integer registrationInformationExamineStatus, Integer registrationInformationMedicStatus) {
|
||||
this.registrationInformationId = registrationInformationId;
|
||||
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.registrationInformationMedicStatus = registrationInformationMedicStatus;
|
||||
}
|
||||
|
||||
public SysDoctor() {
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SysDoctor{" +
|
||||
"registrationInformationId=" + registrationInformationId +
|
||||
", affiliatedHospital='" + affiliatedHospital + '\'' +
|
||||
", medicalDepartmentId=" + medicalDepartmentId +
|
||||
", professionalTitleDoctorId=" + professionalTitleDoctorId +
|
||||
", personalResume='" + personalResume + '\'' +
|
||||
", areaExpertise='" + areaExpertise + '\'' +
|
||||
", numberPatientsServed=" + numberPatientsServed +
|
||||
", consultingPrice=" + consultingPrice +
|
||||
", praise=" + praise +
|
||||
", registrationInformationExamineStatus=" + registrationInformationExamineStatus +
|
||||
", registrationInformationMedicStatus=" + registrationInformationMedicStatus +
|
||||
'}';
|
||||
}
|
||||
|
||||
public Long getRegistrationInformationId() {
|
||||
return registrationInformationId;
|
||||
}
|
||||
|
||||
public void setRegistrationInformationId(Long registrationInformationId) {
|
||||
this.registrationInformationId = registrationInformationId;
|
||||
}
|
||||
|
||||
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 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;
|
||||
}
|
||||
}
|
|
@ -3,13 +3,11 @@ package com.four.system.mapper;
|
|||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import com.four.system.api.model.LoginUser;
|
||||
import com.four.system.domain.SysDoctor;
|
||||
import com.four.system.api.domain.SysDoctor;
|
||||
import com.four.system.domain.SysRegistrationInformation;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.four.system.api.domain.SysUser;
|
||||
import org.apache.poi.hpsf.Decimal;
|
||||
|
||||
/**
|
||||
* 用户表 数据层
|
||||
|
|
|
@ -4,8 +4,8 @@ import java.math.BigDecimal;
|
|||
import java.util.List;
|
||||
|
||||
|
||||
import com.four.system.api.domain.SysDoctor;
|
||||
import com.four.system.api.domain.SysUser;
|
||||
import com.four.system.domain.SysDoctor;
|
||||
import com.four.system.domain.SysRegistrationInformation;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ import java.util.stream.Collectors;
|
|||
import javax.validation.Validator;
|
||||
|
||||
import com.four.system.Test.FastUtil;
|
||||
import com.four.system.api.domain.SysDoctor;
|
||||
import com.four.system.controller.SampleTest;
|
||||
import com.four.system.domain.*;
|
||||
import com.four.system.service.ISysConfigService;
|
||||
|
|
|
@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
|
||||
<resultMap type="com.four.system.domain.SysDoctor" id="SysDoctorResult">
|
||||
<resultMap type="com.four.system.api.domain.SysDoctor" id="SysDoctorResult">
|
||||
<id property="registrationInformationId" column="registration_information_id" />
|
||||
<result property="affiliatedHospital" column="affiliated_hospital" />
|
||||
<result property="medicalDepartmentId" column="medical_department_id" />
|
||||
|
@ -378,7 +378,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</insert>
|
||||
|
||||
|
||||
<insert id="insertHealthUser" parameterType="com.four.system.api.domain.registrationInformation" useGeneratedKeys="true" keyProperty="registrationInformationId">
|
||||
<insert id="insertHealthUser" parameterType="com.four.system.api.domain.RegistrationInformation" useGeneratedKeys="true" keyProperty="registrationInformationId">
|
||||
insert into registration_information(
|
||||
<if test="registrationInformationId != null and registrationInformationId != 0">registration_information_id,</if>
|
||||
<if test="userId != null and userId != 0">user_id,</if>
|
||||
|
|
Loading…
Reference in New Issue