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

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

@@ -22,6 +22,10 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    private String name;//患者姓名
    @Column(name = "title")
    private String title;//康复服务套餐名称
    @Column(name = "disease")
    private String disease;//疾病
    @Column(name = "disease_name")
    private String diseaseName;//疾病名称
    @Column(name = "payment")
    private Integer payment;//支付方式（1立即支付，2按服务支付）
    @Column(name = "total_expense")
@@ -30,10 +34,10 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    private Integer planType;//安排类型（1康复计划，2转社区医院，3转家庭病床）
    @Column(name = "service_package_id")
    private String servicePackageId;//服务包id
    @Column(name = "status")
    private Integer status;//状态（0已中止，1进行中，2已完成）
    @Column(name = "service_qr_code")
    private String serviceQrCode;//服务码
    @Column(name = "status")
    private Integer status;//状态（0已中止，1进行中，2已完成）
    public String getSaasId() {
        return saasId;
@@ -107,6 +111,22 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
        this.status = status;
    }
    public String getDisease() {
        return disease;
    }
    public void setDisease(String disease) {
        this.disease = disease;
    }
    public String getDiseaseName() {
        return diseaseName;
    }
    public void setDiseaseName(String diseaseName) {
        this.diseaseName = diseaseName;
    }
    public String getServiceQrCode() {
        return serviceQrCode;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailDO.java

@@ -35,7 +35,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
    @Column(name = "execute_time")
    private Date executeTime;//服务项目执行时间
    @Column(name = "status")
    private Integer status;//状态（0已中止，1进行中，2已完成）
    private Integer status;//状态（0未完成，1已完成，2已预约）
    public String getSaasId() {
        return saasId;

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationPlanTemplateDO.java

@@ -24,6 +24,8 @@ public class RehabilitationPlanTemplateDO extends UuidIdentityEntityWithOperator
    private String hospitalName;//医院名称
    @Column(name = "admin_team_code")
    private Integer adminTeamCode;//行政团队id
    @Column(name = "del")
    private Integer del;//是否删除（0是，1否）
    public String getSaasId() {
        return saasId;
@@ -64,4 +66,12 @@ public class RehabilitationPlanTemplateDO extends UuidIdentityEntityWithOperator
    public void setAdminTeamCode(Integer adminTeamCode) {
        this.adminTeamCode = adminTeamCode;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

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

@@ -61,6 +61,7 @@ public class RehabilitationPlanService {
    public MixEnvelop<String, String> createRehabilitationTemplate(RehabilitationPlanTemplateDO templateDO) {
        templateDO.setCreateTime(new Date());
        templateDO.setDel(1);
        templateDO = templateDao.save(templateDO);
        return MixEnvelop.getSuccess(SpecialistMapping.api_success,templateDO.getId());
    }
@@ -95,13 +96,13 @@ public class RehabilitationPlanService {
            return MixEnvelop.getSuccessListWithPage(SpecialistMapping.api_success,list,page,size,count);
        }else {
            List<RehabilitationPlanTemplateDO> list = templateDao.findByAdminTeamCode(adminTeamCode);
            return MixEnvelop.getSuccess(SpecialistMapping.api_success,list, list.size());
            return MixEnvelop.getSuccessList(SpecialistMapping.api_success,list, list.size());
        }
    }
    public MixEnvelop<RehabilitationTemplateDetailDO, RehabilitationTemplateDetailDO> findTemplateDetailByTemplateId(String templateId) {
        List<RehabilitationTemplateDetailDO> list = templateDetailDao.findTemplateDetailByTemplateId(templateId);
        return MixEnvelop.getSuccess(SpecialistMapping.api_success,list, list.size());
        return MixEnvelop.getSuccessList(SpecialistMapping.api_success,list, list.size());
    }
    public PatientRehabilitationPlanDO createPatientRehabilitationPlan(PatientRehabilitationPlanDO planDO) {
@@ -113,7 +114,7 @@ public class RehabilitationPlanService {
    public List<RehabilitationDetailDO> createRehabilitationDetail(List<RehabilitationDetailDO> details, String planId) {
        for(RehabilitationDetailDO detail : details) {
            detail.setPlanId(planId);
            detail.setStatus(1);
            detail.setStatus(0);
        }
        return (List<RehabilitationDetailDO>)rehabilitationDetailDao.save(details);
    }