添加各个接口

src/main/java/com/four/system/controller/SysUserController.java

@@ -1,27 +1,6 @@
 package com.four.system.controller;
 
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
 
-import com.four.system.domain.SysRegistrationInformation;
-import com.four.system.service.*;
-import org.apache.commons.lang3.ArrayUtils;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.four.common.core.domain.R;
 import com.four.common.core.utils.StringUtils;
 import com.four.common.core.utils.poi.ExcelUtil;
@@ -37,6 +16,24 @@ import com.four.system.api.domain.SysDept;
 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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -229,9 +226,7 @@ public class SysUserController extends BaseController
         return ajax;
     }
 
-    /***
+
-     * 维度健康获取余额
-     */
 
     /**
      * 根据用户编号获取详细信息
@@ -384,6 +379,61 @@ public class SysUserController extends BaseController
     }
 
 
+
+    /***
+     * 查询价格倒序的医生信息
+     * @param registrationInformationId
+     * @return
+     */
+    @PostMapping("findDoctorInformation/{registrationInformationId}")
+    public AjaxResult findDoctorInformation(@PathVariable Long registrationInformationId){
+        AjaxResult ajax= AjaxResult.success();
+        List<SysDoctor> SysDoctor = userService.findDoctorInformation(registrationInformationId);
+        ajax.put("sysRedis",SysDoctor);
+        return ajax;
+    }
+
+
+    /***
+     * 查询好评人数倒序的医生信息
+     * @param medicalDepartmentId
+     * @return
+     */
+    @PostMapping("findDoctorNumber/{medicalDepartmentId}")
+    public AjaxResult findDoctorNumber(@PathVariable Long medicalDepartmentId){
+        AjaxResult ajax = AjaxResult.success();
+        List<SysUser> sysUsers = userService.findDoctorNumber(medicalDepartmentId);
+        ajax.put("sysUsers",sysUsers);
+        return ajax;
+    }
+
+    /**
+     * 查询接待患者人数倒序的医生信息
+     * @param medicalDepartmentId
+     * @return
+     */
+    @PostMapping("findDoctorPraise/{medicalDepartmentId}")
+    public AjaxResult findDoctorPraise(@PathVariable Long medicalDepartmentId){
+        AjaxResult ajax = AjaxResult.success();
+        List<SysDoctor>  sysDoctorList = userService.findDoctorPraise(medicalDepartmentId);
+        ajax.put("sysDoctorList",sysDoctorList);
+        return ajax;
+    }
+
+
+    /***
+     * 查询综合排序医生信息
+     * @param medicalDepartmentId
+     * @return
+     */
+    @PostMapping("findDoctorComprehensive/{medicalDepartmentId}")
+    public AjaxResult findDoctorComprehensive(@PathVariable Long medicalDepartmentId){
+        AjaxResult ajax = AjaxResult.success();
+        List<SysDoctor> sysDoctorList = userService.findDoctorComprehensive(medicalDepartmentId);
+        ajax.put("sysDoctorList",sysDoctorList);
+        return ajax;
+    }
+
     /**
      * 根据用户id修改用户余额
      * @param userId
@@ -398,18 +448,16 @@ public class SysUserController extends BaseController
     }
 
     /**
-     * 医生信息表
+     * 医生详情表
-     * @param registrationinformationid
+     * @param registrationInformationId
      * @return
      */
 
-    @GetMapping("findRegistrationInformation/{registrationinformationid}")
+    @GetMapping("findRegistrationInformation/{registrationInformationId}")
-    public AjaxResult findRegistrationInformation(@PathVariable Long registrationinformationid){
+    public AjaxResult findRegistrationInformation(@PathVariable Long registrationInformationId){
         AjaxResult ajax = AjaxResult.success();
-        SysRegistrationInformation information = userService.selectregistrationinformation(registrationinformationid);
+        SysRegistrationInformation registrationInformation = userService.selectregistrationinformation(registrationInformationId);
-        List<Long> roles = roleService.selectRoleListByUserId(registrationinformationid);
+        ajax.put("registrationInformation",registrationInformation);
-        ajax.put("information",information);
-        ajax.put("roles",roles);
         return ajax;
     }
 

src/main/java/com/four/system/domain/SysDoctor.java

@@ -0,0 +1,181 @@
+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;
+    }
+}

src/main/java/com/four/system/domain/SysRegistrationInformation.java

@@ -1,200 +1,74 @@
 package com.four.system.domain;
 
+import io.swagger.models.auth.In;
 import org.apache.poi.hpsf.Decimal;
+import org.bouncycastle.cms.PasswordRecipientId;
 
 /***
  * 医生详情表
  */
 public class SysRegistrationInformation {
-    /**
+
-     * 医生注册信息id
+
+    /***
+     * 真实姓名
      */
-    private Long registrationInformationId;
+    private String nickName;
+
     /**
-     * 用户id
+     * 所在医院
-     */
-    private Long userId;
-    /**
-     * 所属医院
      */
     private String affiliatedHospital;
-    /**
+
-     * 医生科室id
-     */
-    private Long medicalDepartmentId;
-    /**
-     * 医生职称id
-     */
-    private Long professionalTitleDoctorId;
-    /**
-     * 个人简历
-     */
-    private String personalResume;
-    /**
-     * 擅长领域
-     */
-    private String areaExpertise;
-    /**
-     * 服务患者次数
-     */
-    private Integer numberPatientsServed;
-    /**
-     * 咨询价格
-     */
-    private Decimal consultingPrice;
     /**
      * 好评人数
      */
-    private Integer praise;
+    private String praise;
-    /**
+
-     * 审核状态：1：待审核2：审核通过3：已驳回
+    /***
+     *
      */
-    private Integer registrationInformationExamineStatus;
+    private String numberPatientsServed;
+
+    private String personalResume;
+
+    private String areaExpertise;
+
+    private String professionalTitleDoctorName;
 
 
-    /*************************************用户表*********************************************/
+    public SysRegistrationInformation(String nickName, String affiliatedHospital, String praise, String numberPatientsServed, String personalResume, String areaExpertise, String professionalTitleDoctorName) {
-
+        this.nickName = nickName;
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-    /**
-     * 用户账号
-     */
-    private String userName;
-    /**
-     * 用户昵称
-     */
-    private String nickName;
-    /**
-     * 用户类型（00系统用户）
-     */
-    private String userType;
-    /**
-     * 用户邮箱
-     */
-    private String email;
-    /**
-     * 手机号码
-     */
-    private String phonenumber;
-    /**
-     * 用户性别（0男 1女 2未知）
-     */
-    private String sex;
-    /**
-     * 头像地址
-     */
-    private String avatar;
-    /**
-     * 密码
-     */
-    private String password;
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    private String status;
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-    /**
-     * 最后登录IP
-     */
-    private String loginIp;
-    /**
-     * 创建者
-     */
-    private String createBy;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 更新者
-     */
-    private String updateBy;
-    /**
-     * 体征
-     */
-    private String userSign;
-    /**
-     * 绑定微信状态 1：未绑定 2：已绑定
-     */
-    private Integer bindWechatStatus;
-    /**
-     * 实名认证状态 1：未绑定 2：已绑定
-     */
-    private Integer realNameAuthenticationStatus;
-    /**
-     * 绑定银行卡状态 1：未绑定 2：已绑定
-     */
-    private Integer bindBankCardStatus;
-    /**
-     * 余额
-     */
-    private Decimal userMoney;
-    /**
-     * 邀请码
-     */
-    private String invitationCode;
-    /**
-     * 状态1：患者 2：医生
-     */
-    private Integer differentialState;
-
-
-    public SysRegistrationInformation(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.praise = praise;
-        this.professionalTitleDoctorId = professionalTitleDoctorId;
+        this.numberPatientsServed = numberPatientsServed;
         this.personalResume = personalResume;
         this.areaExpertise = areaExpertise;
-        this.numberPatientsServed = numberPatientsServed;
+        this.professionalTitleDoctorName = professionalTitleDoctorName;
-        this.consultingPrice = consultingPrice;
+    }
-        this.praise = praise;
+
-        this.registrationInformationExamineStatus = registrationInformationExamineStatus;
+    @Override
-        this.deptId = deptId;
+    public String toString() {
-        this.userName = userName;
+        return "SysRegistrationInformation{" +
+                "nickName='" + nickName + '\'' +
+                ", affiliatedHospital='" + affiliatedHospital + '\'' +
+                ", praise='" + praise + '\'' +
+                ", numberPatientsServed='" + numberPatientsServed + '\'' +
+                ", personalResume='" + personalResume + '\'' +
+                ", areaExpertise='" + areaExpertise + '\'' +
+                ", professionalTitleDoctorName='" + professionalTitleDoctorName + '\'' +
+                '}';
+    }
+
+    public SysRegistrationInformation() {
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
         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;
-    }
-
-
-    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 getAffiliatedHospital() {
@@ -205,20 +79,20 @@ public class SysRegistrationInformation {
         this.affiliatedHospital = affiliatedHospital;
     }
 
-    public Long getMedicalDepartmentId() {
+    public String getPraise() {
-        return medicalDepartmentId;
+        return praise;
     }
 
-    public void setMedicalDepartmentId(Long medicalDepartmentId) {
+    public void setPraise(String praise) {
-        this.medicalDepartmentId = medicalDepartmentId;
+        this.praise = praise;
     }
 
-    public Long getProfessionalTitleDoctorId() {
+    public String getNumberPatientsServed() {
-        return professionalTitleDoctorId;
+        return numberPatientsServed;
     }
 
-    public void setProfessionalTitleDoctorId(Long professionalTitleDoctorId) {
+    public void setNumberPatientsServed(String numberPatientsServed) {
-        this.professionalTitleDoctorId = professionalTitleDoctorId;
+        this.numberPatientsServed = numberPatientsServed;
     }
 
     public String getPersonalResume() {
@@ -237,253 +111,11 @@ public class SysRegistrationInformation {
         this.areaExpertise = areaExpertise;
     }
 
-    public Integer getNumberPatientsServed() {
+    public String getProfessionalTitleDoctorName() {
-        return numberPatientsServed;
+        return professionalTitleDoctorName;
     }
 
-    public void setNumberPatientsServed(Integer numberPatientsServed) {
+    public void setProfessionalTitleDoctorName(String professionalTitleDoctorName) {
-        this.numberPatientsServed = numberPatientsServed;
+        this.professionalTitleDoctorName = professionalTitleDoctorName;
-    }
-
-    public Decimal getConsultingPrice() {
-        return consultingPrice;
-    }
-
-    public void setConsultingPrice(Decimal 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 Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getLoginIp() {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp) {
-        this.loginIp = loginIp;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public String getUserSign() {
-        return userSign;
-    }
-
-    public void setUserSign(String userSign) {
-        this.userSign = userSign;
-    }
-
-    public Integer getBindWechatStatus() {
-        return bindWechatStatus;
-    }
-
-    public void setBindWechatStatus(Integer bindWechatStatus) {
-        this.bindWechatStatus = bindWechatStatus;
-    }
-
-    public Integer getRealNameAuthenticationStatus() {
-        return realNameAuthenticationStatus;
-    }
-
-    public void setRealNameAuthenticationStatus(Integer realNameAuthenticationStatus) {
-        this.realNameAuthenticationStatus = realNameAuthenticationStatus;
-    }
-
-    public Integer getBindBankCardStatus() {
-        return bindBankCardStatus;
-    }
-
-    public void setBindBankCardStatus(Integer bindBankCardStatus) {
-        this.bindBankCardStatus = bindBankCardStatus;
-    }
-
-    public Decimal getUserMoney() {
-        return userMoney;
-    }
-
-    public void setUserMoney(Decimal userMoney) {
-        this.userMoney = userMoney;
-    }
-
-    public String getInvitationCode() {
-        return invitationCode;
-    }
-
-    public void setInvitationCode(String invitationCode) {
-        this.invitationCode = invitationCode;
-    }
-
-    public Integer getDifferentialState() {
-        return differentialState;
-    }
-
-    public void setDifferentialState(Integer differentialState) {
-        this.differentialState = differentialState;
-    }
-
-    public SysRegistrationInformation() {
-    }
-
-    @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 +
-                '}';
     }
 }

src/main/java/com/four/system/mapper/SysUserMapper.java

@@ -4,10 +4,12 @@ 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.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;
 
 /**
  * 用户表 数据层
@@ -161,5 +163,15 @@ public interface SysUserMapper
 
     void updateSysUserMoney(@Param("userId") Long userId, @Param("userMoney") BigDecimal userMoney);
 
-    SysRegistrationInformation selectregistrationinformation(Long registrationinformationid);
+
+    SysRegistrationInformation selectregistrationinformation(Long registrationInformationId);
+
+
+    List<SysDoctor> findDoctorInformation(Long registrationInformationId);
+
+    List<SysUser> findDoctorNumber(Long medicalDepartmentId);
+
+    List<SysDoctor> findDoctorPraise(Long medicalDepartmentId);
+
+    List<SysDoctor> findDoctorComprehensive(Long medicalDepartmentId);
 }

src/main/java/com/four/system/service/ISysUserService.java

@@ -6,8 +6,10 @@ import java.util.List;
 
 import com.four.common.core.web.domain.AjaxResult;
 import com.four.system.api.domain.SysUser;
+import com.four.system.domain.SysDoctor;
 import com.four.system.domain.SysRegistrationInformation;
 import org.apache.ibatis.annotations.Param;
+import org.apache.poi.hpsf.Decimal;
 
 /**
  * 用户 业务层
@@ -222,6 +224,15 @@ public interface ISysUserService
 
     void updateSysUserMoney(Long userId, BigDecimal userMoney);
 
-    SysRegistrationInformation selectregistrationinformation(Long registrationinformationid);
 
+    SysRegistrationInformation selectregistrationinformation(Long registrationInformationId);
+
+
+    List<SysDoctor> findDoctorInformation(Long registrationInformationId);
+
+    List<SysUser> findDoctorNumber(Long medicalDepartmentId);
+
+    List<SysDoctor> findDoctorPraise(Long medicalDepartmentId);
+
+    List<SysDoctor> findDoctorComprehensive(Long medicalDepartmentId);
 }

src/main/java/com/four/system/service/impl/SysUserServiceImpl.java

@@ -8,8 +8,9 @@ import javax.validation.Validator;
 
 import com.four.common.core.domain.R;
 import com.four.common.core.web.domain.AjaxResult;
-import com.four.system.domain.SysRegistrationInformation;
+import com.four.system.domain.*;
 import com.four.system.service.ISysConfigService;
+import org.apache.poi.hpsf.Decimal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +25,6 @@ import com.four.common.datascope.annotation.DataScope;
 import com.four.common.security.utils.SecurityUtils;
 import com.four.system.api.domain.SysRole;
 import com.four.system.api.domain.SysUser;
-import com.four.system.domain.SysPost;
-import com.four.system.domain.SysUserPost;
-import com.four.system.domain.SysUserRole;
 import com.four.system.mapper.SysPostMapper;
 import com.four.system.mapper.SysRoleMapper;
 import com.four.system.mapper.SysUserMapper;
@@ -610,8 +608,28 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     @Override
-    public SysRegistrationInformation selectregistrationinformation(Long registrationinformationid) {
+    public SysRegistrationInformation selectregistrationinformation(Long registrationInformationId) {
-        return userMapper.selectregistrationinformation(registrationinformationid);
+        return userMapper.selectregistrationinformation(registrationInformationId);
+    }
+
+    @Override
+    public List<SysDoctor> findDoctorInformation(Long registrationInformationId) {
+        return userMapper.findDoctorInformation(registrationInformationId);
+    }
+
+    @Override
+    public List<SysUser> findDoctorNumber(Long medicalDepartmentId) {
+        return userMapper.findDoctorNumber(medicalDepartmentId);
+    }
+
+    @Override
+    public List<SysDoctor> findDoctorPraise(Long medicalDepartmentId) {
+        return userMapper.findDoctorPraise(medicalDepartmentId);
+    }
+
+    @Override
+    public List<SysDoctor> findDoctorComprehensive(Long medicalDepartmentId) {
+        return userMapper.findDoctorComprehensive(medicalDepartmentId);
     }
 
 

src/main/resources/mapper/system/SysUserMapper.xml

@@ -36,6 +36,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 
+	<resultMap type="com.four.system.domain.SysDoctor" id="SysDoctorResult">
+		<id property="registrationInformationId" column="registration_information_id" />
+		<result property="affiliatedHospital" column="affiliated_hospital" />
+		<result property="medicalDepartmentId" column="medical_department_id" />
+		<result property="professionalTitleDoctorId" column="professional_title_doctor_id" />
+		<result property="personalResume" column="personal_resume" />
+		<result property="areaExpertise" column="area_expertise" />
+		<result property="numberPatientsServed" column="number_patients_served" />
+		<result property="consultingPrice" column="consulting_price" />
+		<result property="praise" column="praise" />
+		<result property="registrationInformationExamineStatus" column="registration_information_examine_status" />
+		<result property="registrationInformationMedicStatus" column="registration_information_medic_status" />
+	</resultMap>
+
+
+	<resultMap  id="SysRegistrationInformation" type="com.four.system.domain.SysRegistrationInformation" >
+		<result property="nickName" column="nick_name" />
+		<result property="affiliatedHospital" column="affiliated_hospital" />
+		<result property="praise" column="praise" />
+		<result property="numberPatientsServed" column="number_patients_served" />
+		<result property="personalResume" column="personal_resume" />
+		<result property="areaExpertise" column="area_expertise" />
+		<result property="professionalTitleDoctorName" column="professional_title_doctor_name" />
+	</resultMap>
+
+
 	<resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -165,21 +191,106 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	<select id="selectregistrationinformation" resultType="com.four.system.domain.SysRegistrationInformation">
+
+	<select id="selectregistrationinformation" resultMap="SysRegistrationInformation">
 		SELECT
-			nick_name,
+			su.nick_name,
-			professional_title_doctor_name,
+			pd.professional_title_doctor_name,
-			affiliated_hospital,
+			ri.affiliated_hospital,
-			praise,
+			ri.praise,
-			number_patients_served,
+			ri.number_patients_served,
-			personal_resume,
+			ri.personal_resume,
-			area_expertise,
+			ri.area_expertise
-			praise
 		FROM
 			registration_information ri
 				LEFT JOIN sys_user su ON ri.user_id = su.user_id
 				LEFT JOIN professional_title_doctor pd ON ri.professional_title_doctor_id = pd.professional_title_doctor_id
 	</select>
+	<select id="findDoctorInformation" resultMap="SysDoctorResult">
+		SELECT
+			r.registration_information_id,
+			r.user_id,
+			r.affiliated_hospital,
+			r.medical_department_id,
+			r.professional_title_doctor_id,
+			r.personal_resume,
+			r.area_expertise,
+			r.number_patients_served,
+			r.consulting_price,
+			r.praise,
+			r.registration_information_examine_status,
+			r.registration_information_medic_status
+		FROM
+			registration_information r
+				LEFT JOIN professional_title_doctor p ON r.professional_title_doctor_id = p.professional_title_doctor_id where registration_information_id = #{registrationInformationId}
+		ORDER BY
+			r.consulting_price DESC
+	</select>
+	<select id="findDoctorNumber" resultMap="SysDoctorResult">
+		SELECT
+			r.registration_information_id,
+			r.user_id,
+			r.affiliated_hospital,
+			r.medical_department_id,
+			r.professional_title_doctor_id,
+			r.personal_resume,
+			r.area_expertise,
+			r.number_patients_served,
+			r.consulting_price,
+			r.praise,
+			r.registration_information_examine_status,
+			r.registration_information_medic_status
+		FROM
+			registration_information r
+				LEFT JOIN professional_title_doctor p ON r.professional_title_doctor_id = p.professional_title_doctor_id where medical_department_id = #{medicalDepartmentId}
+		ORDER BY r.praise DESC
+	</select>
+	<select id="findDoctorPraise" resultMap="SysDoctorResult">
+		SELECT
+			r.registration_information_id,
+			r.user_id,
+			r.affiliated_hospital,
+			r.medical_department_id,
+			r.professional_title_doctor_id,
+			r.personal_resume,
+			r.area_expertise,
+			r.number_patients_served,
+			r.consulting_price,
+			r.praise,
+			r.registration_information_examine_status,
+			r.registration_information_medic_status
+		FROM
+			registration_information r
+				LEFT JOIN professional_title_doctor p ON r.professional_title_doctor_id = p.professional_title_doctor_id
+		WHERE
+			medical_department_id = #{medicalDepartmentId}
+		ORDER BY
+			r.number_patients_served DESC
+	</select>
+	<select id="findDoctorComprehensive" resultMap="SysDoctorResult">
+		SELECT
+			r.registration_information_id,
+			r.user_id,
+			r.affiliated_hospital,
+			r.medical_department_id,
+			r.professional_title_doctor_id,
+			r.personal_resume,
+			r.area_expertise,
+			r.number_patients_served,
+			r.consulting_price,
+			r.praise,
+			r.registration_information_examine_status,
+			r.registration_information_medic_status
+		FROM
+			registration_information r
+				LEFT JOIN professional_title_doctor p ON r.professional_title_doctor_id = p.professional_title_doctor_id
+		WHERE
+			medical_department_id = #{medical_department_idd}
+		ORDER BY
+			r.consulting_price,
+			r.number_patients_served,
+			r.praise DESC
+	</select>
 
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">