Merge branch 'dev' of humingfen/wlyy2.0 into dev

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

@@ -21,6 +21,8 @@ public class PatientDisseaseInfoVO {
    private String patient;
    @ApiModelProperty("居民姓名")
    private String patientName;
    @ApiModelProperty("专科医生签约团队")
    private String teamCode;
    @ApiModelProperty("年龄")
    private String age;
    @ApiModelProperty("性别")
@@ -28,7 +30,9 @@ public class PatientDisseaseInfoVO {
    @ApiModelProperty("身份证")
    private String idcard;
    @ApiModelProperty("生日")
    private String  birthday;
    private String birthday;
    @ApiModelProperty("头像")
    private String photo;
    public String getDisease() {
        return disease;
@@ -93,4 +97,20 @@ public class PatientDisseaseInfoVO {
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
    public String getTeamCode() {
        return teamCode;
    }
    public void setTeamCode(String teamCode) {
        this.teamCode = teamCode;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
}

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

@@ -703,9 +703,10 @@ public class SpecialistService{
                "p.idcard, " +
                "case p.sex WHEN 1 then '男' ELSE '女' END as sex, " +
                "IFNULL(year( from_days( datediff( now(), p.birthday))),'未知') age, " +
                "p.birthday " +
                "FROM (SELECT s.disease,s.disease_name,s.patient,s.patient_name from " +
                "(SELECT id FROM wlyy_specialist_patient_relation WHERE doctor='" + doctor + "' and sign_status > 0 and `status` >= 0) r " +
                "p.birthday, " +
                "p.photo " +
                "FROM (SELECT s.disease,s.disease_name,s.patient,s.patient_name,r.team_code from " +
                "(SELECT id, team_code FROM wlyy_specialist_patient_relation WHERE doctor='" + doctor + "' and sign_status > 0 and `status` >= 0) r " +
                "JOIN "+basedb+".wlyy_patient_disease_server s on r.id = s.specialist_relation_code WHERE s.del = 1) s " +
                "JOIN "+basedb+".wlyy_patient p on s.patient = p.`code` where p.`status` >0 ";
        if(StringUtils.isNotBlank(patientInfo)){

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

@@ -142,7 +142,10 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
     */
    public MixEnvelop<HospitalServiceItemDO, HospitalServiceItemDO> findTemplateDetailByTemplateId(String templateId) {
        List<String> hospitalServiceItemIds = templateDetailDao.findHospitalServiceItemIdByTemplateId(templateId);
        return hospitalServiceItemService.selectById(hospitalServiceItemIds);
        if(hospitalServiceItemIds.size() > 0) {
            return hospitalServiceItemService.selectById(hospitalServiceItemIds);
        }
        return MixEnvelop.getSuccess(SpecialistMapping.api_success);
    }
    public PatientRehabilitationPlanDO createPatientRehabilitationPlan(PatientRehabilitationPlanDO planDO) {