| 
					
				 | 
			
			
				@ -306,7 +306,19 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            planDO.setPlanDoctor(list.get(0).get("plan_doctor")+""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            planDO.setPlanDoctorName(list.get(0).get("plan_doctor_name")+""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        PatientMedicalRecordsDO recordsDO = planDO.getMedicalRecordsDO(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String medicalRecordsCode = UUID.randomUUID().toString().replaceAll("-", ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setCode(medicalRecordsCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setPatient(planDO.getPatient()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setPatientName(planDO.getName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setCreateUser(planDO.getPlanDoctor()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setCreateUserName(planDO.getPlanDoctorName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setDiseaseCode(planDO.getDisease()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setDiseaseName(planDO.getDiseaseName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        recordsDO.setCreateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        patientMedicalRecordsDao.save(recordsDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        planDO.setMedicalRecordsCode(medicalRecordsCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String patientInfoCode = planDO.getPatientInfoCode(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        planDO.setStatus(3);//待分配 执行医生和科室 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        planDO.setTitle(planDO.getName()+"的康复计划"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -336,7 +348,6 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(patientInfoCode)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            RehabilitationPatientInfoDO infoDO = rehabilitationPatientInfoDao.findByCode(patientInfoCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(StringUtils.isBlank(infoDO.getDiagnosis())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                PatientMedicalRecordsDO recordsDO = patientMedicalRecordsDao.findByCode(planDO.getMedicalRecordsCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                infoDO.setDept(recordsDO.getDept()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                infoDO.setDeptName(recordsDO.getDeptName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                infoDO.setDiagnosis(recordsDO.getAdmittingDiagnosis()); 
			 |