Merge branch 'dev' of trick9191/jw2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/specialist/SpecialistMapping.java

@@ -32,6 +32,7 @@ public class SpecialistMapping {
        public static final String findPatientSigninfo ="/findPatientSigninfo";
        public static final String findPatientTeamList ="/findPatientTeamList";
        public static final String findPatientSignSpecialist ="/findPatientSignSpecialist";
        public static final String findPatientSignSpecialistInfo ="/findPatientSignSpecialistInfo";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/PatientSignInfoVO.java

@@ -13,6 +13,8 @@ import java.util.Date;
@ApiModel(value = "居民专病签约信息", description = "居民专病签约信息")
public class PatientSignInfoVO {
    @ApiModelProperty("签约Code")
    private String relationCode;
    @ApiModelProperty("居民code")
    private String patient;
    @ApiModelProperty("居民")
@@ -43,6 +45,18 @@ public class PatientSignInfoVO {
    private String status;
    @ApiModelProperty("医生角色")
    private String level;
    @ApiModelProperty("计管师code")
    private String healthAssistant;
    @ApiModelProperty("计管师")
    private String healthAssistantName;
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    public String getPatient() {
        return patient;
@@ -163,4 +177,20 @@ public class PatientSignInfoVO {
    public void setLevel(String level) {
        this.level = level;
    }
    public String getHealthAssistant() {
        return healthAssistant;
    }
    public void setHealthAssistant(String healthAssistant) {
        this.healthAssistant = healthAssistant;
    }
    public String getHealthAssistantName() {
        return healthAssistantName;
    }
    public void setHealthAssistantName(String healthAssistantName) {
        this.healthAssistantName = healthAssistantName;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/SpecialistController.java

@@ -245,7 +245,7 @@ public class SpecialistController extends EnvelopRestController {
    @GetMapping(value = SpecialistMapping.specialist.findPatientSignSpecialist)
    @ApiOperation(value = "获取居民所有有效签约医生信息")
    public Envelop findPatientSignSpecialist(String patient){
    public Envelop findPatientSignSpecialist(@ApiParam(name = "patient", value = "居民code") @RequestParam(required = true)String patient){
        try {
            return specialistService.findPatientSignSpecialist(patient);
        }catch (Exception e){
@@ -255,6 +255,19 @@ public class SpecialistController extends EnvelopRestController {
        }
    }
    @GetMapping(value = SpecialistMapping.specialist.findPatientSignSpecialistInfo)
    @ApiOperation(value = "获取居民与当前专科医生有效签约信息")
    public Envelop findPatientSignSpecialistInfo(@ApiParam(name = "patient", value = "居民code") @RequestParam(required = true)String patient,
                                                 @ApiParam(name = "doctor", value = "专科医生code") @RequestParam(required = true)String doctor) {
        try {
            return specialistService.findPatientSignSpecialistInfo(patient,doctor);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return Envelop.getError(e.getMessage());
        }
    }

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

@@ -545,6 +545,7 @@ public class SpecialistService{
    public Envelop findPatientSignSpecialist(String patient){
        String sql = "SELECT " +
                " r.patient, " +
                " r.team_code AS teamCode," +
                " r.patient_name AS patientName, " +
                " d.name AS doctorName, " +
                " d.code AS doctor, " +
@@ -556,7 +557,7 @@ public class SpecialistService{
                " d.`level` " +
                " FROM " +
                " wlyy_specialist_patient_relation r " +
                "  JOIN wlyy.wlyy_doctor d ON r.doctor = d.`code` " +
                " JOIN wlyy.wlyy_doctor d ON r.doctor = d.`code` " +
                " WHERE  " +
                " r.patient ='"+patient+"' " +
                " AND r.`status`>=0 " +
@@ -565,6 +566,35 @@ public class SpecialistService{
        return Envelop.getSuccess(SpecialistMapping.api_success,patientSignInfoVOs);
    }
    public Envelop findPatientSignSpecialistInfo(String patient,String doctor){
        String sql = "SELECT " +
                " r.id AS relationCode," +
                " r.patient, " +
                " r.team_code AS teamCode," +
                " r.patient_name AS patientName, " +
                " r.health_assistant AS healthAssistant," +
                " r.health_assistant_name AS healthAssistantName," +
                " d.name AS doctorName, " +
                " d.code AS doctor, " +
                " d.photo, " +
                " d.dept, " +
                " d.dept_name AS deptName, " +
                " d.hospital, " +
                " d.hospital_name AS hospital_name, " +
                " d.`level` " +
                " FROM " +
                " wlyy_specialist_patient_relation r " +
                " JOIN wlyy.wlyy_doctor d ON r.doctor = d.`code` " +
                " WHERE  " +
                " r.patient ='"+patient+"' " +
                " AND r.doctor ='"+doctor+"' " +
                " AND r.`status`>=0 " +
                " AND r.sign_status >0";
        List<PatientSignInfoVO> patientSignInfoVOs = jdbcTemplate.query(sql,new BeanPropertyRowMapper(PatientSignInfoVO.class));
        return Envelop.getSuccess(SpecialistMapping.api_success,patientSignInfoVOs.get(0));
    }
//    public Envelop<Boolean> createSpecialists(List<SpecialistDO> info){
//        specialistDao.save(info);