diff --git a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java index b6c6db15..b0378888 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java @@ -61,11 +61,6 @@ public class MedicalRec implements Serializable { */ private String expectDiseaseTreatmentPlan; - /** - * 初步诊断 - */ - private Object primaryDiagnosis; - /** * 过敏史 */ diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml index ba88d598..7e3f2e62 100644 --- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml @@ -16,7 +16,6 @@ - @@ -27,8 +26,7 @@ id,no,patient_id, patient_self_desc,symptoms,expect_diagnosis_result, expect_disease_treatment_plan,primarily_diagnosis_criteria, - confirm_diagnosis_criteria,confirm_diagnosis_criteria, - primary_diagnosis,allergy_history, + confirm_diagnosis_criteria,confirm_diagnosis_criteria,allergy_history, previous_history,family_history,marriage_child_history diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java index d1157327..0f243623 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java @@ -1,13 +1,17 @@ package com.supervision.service.impl; +import com.supervision.exception.BusinessException; +import com.supervision.model.MedicalRec; import com.supervision.model.Process; import com.supervision.model.User; import com.supervision.service.AskProcessService; +import com.supervision.service.MedicalRecService; import com.supervision.service.ProcessService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; @Service @RequiredArgsConstructor @@ -15,11 +19,15 @@ public class AskProcessServiceImpl implements AskProcessService { private final ProcessService processService; + private final MedicalRecService medicalRecService; + @Override public Process creatDiagnosisProcess(String patientId,String medicalId, User user) { + MedicalRec medicalRec = Optional.ofNullable(medicalRecService.getById(medicalId)).orElseThrow(() -> new BusinessException("未找到病历")); Process process = new Process(); process.setPatientId(patientId); process.setMedicalRecId(medicalId); + process.setDiseaseId(medicalRec.getDiseaseId()); process.setUserId(user.getId()); process.setStatus(0); process.setCreateUserId(user.getId());