trick9191 6 年之前
父節點
當前提交
3134d55757

+ 10 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/SpecialistTeamVO.java

@ -14,6 +14,8 @@ import java.util.List;
@ApiModel(value = "专科医生团队与居民匹配关系", description = "专科医生团队与居民匹配关系")
@ApiModel(value = "专科医生团队与居民匹配关系", description = "专科医生团队与居民匹配关系")
public class SpecialistTeamVO {
public class SpecialistTeamVO {
    @ApiModelProperty("签约code")
    private String relationCode;
    @ApiModelProperty("居民code")
    @ApiModelProperty("居民code")
    private String patient;
    private String patient;
    @ApiModelProperty("居民姓名")
    @ApiModelProperty("居民姓名")
@ -128,6 +130,14 @@ public class SpecialistTeamVO {
        this.hospitalName = hospitalName;
        this.hospitalName = hospitalName;
    }
    }
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    public List<AdminTeamMemberVO> getMembers() {
    public List<AdminTeamMemberVO> getMembers() {
        return members;
        return members;
    }
    }

+ 7 - 2
svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistService.java

@ -370,11 +370,14 @@ public class SpecialistService{
        //1.查询该居民是否已经与该专科医生签约
        //1.查询该居民是否已经与该专科医生签约
        String checkDoctorSql = "SELECT " +
        String checkDoctorSql = "SELECT " +
                " r.id AS relationCode," +
                " r.patient, " +
                " r.patient, " +
                " r.patient_name AS patientName, " +
                " r.patient_name AS patientName, " +
                " r.team_code AS teamCode, " +
                " r.team_code AS teamCode, " +
                " t.`name`, " +
                " t.`name`, " +
                " d.photo " +
                " d.photo ," +
                " d.code AS doctor," +
                " d.name AS doctorName" +
                " FROM " +
                " FROM " +
                " wlyy_specialist_patient_relation r " +
                " wlyy_specialist_patient_relation r " +
                " JOIN "+basedb+".wlyy_admin_team t ON t.id = r.team_code " +
                " JOIN "+basedb+".wlyy_admin_team t ON t.id = r.team_code " +
@ -407,6 +410,7 @@ public class SpecialistService{
        //验证团队是否已经签约
        //验证团队是否已经签约
        String checkTeamSql = "SELECT " +
        String checkTeamSql = "SELECT " +
                " r.id AS relationCode," +
                " r.patient, " +
                " r.patient, " +
                " r.patient_name AS patientName, " +
                " r.patient_name AS patientName, " +
                " r.team_code AS teamCode, " +
                " r.team_code AS teamCode, " +
@ -468,7 +472,7 @@ public class SpecialistService{
            relation.setSignStatus("1");
            relation.setSignStatus("1");
            specialistPatientRelationDao.save(relation);
            specialistPatientRelationDao.save(relation);
        }
        }
        return Envelop.getSuccess(SpecialistMapping.api_success);
        return Envelop.getSuccess(SpecialistMapping.api_success,relation);
    }
    }
    public Envelop<PatientSignInfoVO> findPatientSigninfo(String code){
    public Envelop<PatientSignInfoVO> findPatientSigninfo(String code){
@ -499,6 +503,7 @@ public class SpecialistService{
    public Envelop<SpecialistTeamVO> findPatientTeamList(String patient){
    public Envelop<SpecialistTeamVO> findPatientTeamList(String patient){
        String sql = "SELECT " +
        String sql = "SELECT " +
                " r.id AS relationCode, " +
                " r.patient, " +
                " r.patient, " +
                " r.patient_name AS patientName, " +
                " r.patient_name AS patientName, " +
                " r.team_code, " +
                " r.team_code, " +