代码修改

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

@@ -8,6 +8,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
 * Created by humingfen on 2018/8/15.
@@ -58,6 +59,7 @@ public class RehabilitationPlanTemplateDO extends UuidIdentityEntityWithOperator
    //非数据库字段
    private Integer isFamily;//是否关联三师共管专病(1是0否)
    private String familyRelation;//关联专病code
    private List<RehabilitationTemplateDetailDO> detailDOList;
    public String getType() {
        return type;
@@ -183,4 +185,13 @@ public class RehabilitationPlanTemplateDO extends UuidIdentityEntityWithOperator
    public void setFamilyRelation(String familyRelation) {
        this.familyRelation = familyRelation;
    }
    @Transient
    public List<RehabilitationTemplateDetailDO> getDetailDOList() {
        return detailDOList;
    }
    public void setDetailDOList(List<RehabilitationTemplateDetailDO> detailDOList) {
        this.detailDOList = detailDOList;
    }
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/RehabilitationPlanController.java

@@ -207,6 +207,17 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
        return success(entity);
    }
    @GetMapping(value = "findByTemplateId")
    @ApiOperation(value = "获取康复服务套餐模板明细")
    public ObjEnvelop findByTemplateId(@ApiParam(name = "templateId", value = "模板id")
                                                      @RequestParam(value = "templateId", required = true) String templateId) {
        try {
            return ObjEnvelop.getSuccess("获取成功",rehabilitationPlanService.findByTemplateId(templateId));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
        }
    }
    @GetMapping(value = SpecialistMapping.rehabilitation.findTemplateDetailByTemplateId)
    @ApiOperation(value = "获取康复服务套餐模板明细")

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java

@@ -233,19 +233,6 @@ public class RehabilitationInfoService {
        }
        patientMedicalRecordsDO.setPatient(patient);
        patientMedicalRecordsDO.setPatientName(patientName);
        if (StringUtils.isBlank(patientMedicalRecordsDO.getHospital())) {
//            patientMedicalRecordsDO.setHospital(doctor.getHospital());
//            patientMedicalRecordsDO.setHospitalName(doctor.getHospitalName());
        } else {
            //如果有传 hospital根据传过来的hospital来定义
//            if ("3".equals(patientMedicalRecordsDO.getDataFrom()) || "1".equals(patientMedicalRecordsDO.getDataFrom())) {
//                //hospital为自己的code
//                DmHospitalDO hospital = hospitalDao.findByCode(patientMedicalRecordsDO.getHospital());
//                patientMedicalRecordsDO.setHospital(hospital.getCode());
//                patientMedicalRecordsDO.setHospitalName(hospital.getName());
//            }
        }
        patientMedicalRecordsDO.setCreateUser(doctorCode);
        patientMedicalRecordsDO.setCreateUserName(doctor.getName());
        patientMedicalRecordsDO.setCreateTime(new Date());

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationPlanService.java

@@ -211,6 +211,13 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
        return ObjEnvelop.getSuccess(SpecialistMapping.api_success, true);
    }
    public RehabilitationPlanTemplateDO findByTemplateId(String templateId){
        RehabilitationPlanTemplateDO templateDO = templateDao.findById(templateId).orElse(null);
        List<RehabilitationTemplateDetailDO> list = templateDetailDao.findTemplateDetailByTemplateId(templateId);
        templateDO.setDetailDOList(list);
        return templateDO;
    }
    /**
     * 根据模板id获取机构服务项目id，然后找出具体服务项目内容
     *