代码修改

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

@@ -44,7 +44,7 @@ public class BaseDiseaseHospitalDO extends UuidIdentityEntityWithOperator {
     * 新增字段
     */
    private String rehabilitationType;// '是否开通诊后康复 0否 1是'
    private String rehabilitationDownType;//康复下转 1自动 2手动
    private String rehabilitationDownType;//康复下转 0自动 1手动
    private String rehabilitationTemplateId;//康复计划模板id
    public String getRehabilitationType() {

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

@@ -6,7 +6,6 @@ import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.door.SignFamily;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.entity.rehabilitation.PatientDischargeDO;
import com.yihu.jw.entity.specialist.rehabilitation.PatientMedicalRecordsDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationAdviceDO;
@@ -301,17 +300,12 @@ public class RehabilitationInfoService {
//            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());
            } else {
                //hospital为基位的code
//                HospitalMapping hospitalMapping = hospitalMappingDao.findByMappingCode(patientMedicalRecordsDO.getHospital());
////                patientMedicalRecordsDO.setHospital(hospitalMapping.getCode());
//                patientMedicalRecordsDO.setHospitalName(hospitalMapping.getName());
            }
//            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);

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

@@ -349,7 +349,7 @@ public class SynchronizePatientService  {
    public RehabilitationPlanTemplateDO findPlanTemplate(String dept,String diagnosis){
        String sql = "SELECT t.*,d.is_family isFamily,d.id diseaseId,d.name diseaseName,d.family_relation familyRelation " +
                "FROM base_disease_hospital d,wlyy_rehabilitation_plan_template t " +
                "WHERE d.rehabilitation_template_id=t.id and d.`status`='1' and d.rehabilitation_down_type='1' and d.rehabilitation_type='1'" +
                "WHERE d.rehabilitation_template_id=t.id and d.`status`='1' and d.rehabilitation_down_type='0' and d.rehabilitation_type='1'" +
                "and d.dept like '%"+dept+"%' and d.diagnosis like '%"+diagnosis+"%' LIMIT 1";
        List<RehabilitationPlanTemplateDO> diseaseList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(RehabilitationPlanTemplateDO.class));
        if(diseaseList.size()==0){