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 b0378888..0b0f20d9 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 @@ -51,16 +51,6 @@ public class MedicalRec implements Serializable { */ private String symptoms; - /** - * 预期诊断结果 - */ - private String expectDiagnosisResult; - - /** - * 预期治疗计划 - */ - private String expectDiseaseTreatmentPlan; - /** * 过敏史 */ diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml index 7bdc51fa..6afe4200 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml @@ -5,16 +5,18 @@ - - - - - - + + + + + + + - disease_id,plan_id,create_user_id, + id + ,disease_id,plan_id,create_user_id, create_time,update_user_id,update_time diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml index 7e3f2e62..8ec58c3c 100644 --- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml @@ -11,8 +11,6 @@ - - @@ -24,8 +22,7 @@ id,no,patient_id, - patient_self_desc,symptoms,expect_diagnosis_result, - expect_disease_treatment_plan,primarily_diagnosis_criteria, + patient_self_desc,symptoms,primarily_diagnosis_criteria, 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/AskDiagnosisResultServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java index 1a89eb56..290cd773 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java @@ -3,6 +3,7 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.supervision.exception.BusinessException; import com.supervision.model.*; import com.supervision.model.Process; @@ -94,7 +95,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService DealPlanResVO dealPlanResVO = new DealPlanResVO(); dealPlanResVO.setUserTreatmentPlanType(diagnosisResult.getTreatmentPlanType()); dealPlanResVO.setUserTreatmentPlan(diagnosisResult.getTreatmentPlan()); - dealPlanResVO.setRealTreatmentPlan(medicalRec.getExpectDiseaseTreatmentPlan()); + dealPlanResVO.setRealTreatmentPlan("2.0修改,后期修改这个问题"); return dealPlanResVO; } @@ -226,7 +227,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService */ private ExpertDiagnosisResultResVO creatExpertDiagnosisResult(MedicalRec medicalRec, DiagnosisResult diagnosisResult, List diseasesList) { ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO(); - expertDiagnosisResultResVO.setDiagnosis(medicalRec.getExpectDiagnosisResult()); + expertDiagnosisResultResVO.setDiagnosis(StrUtil.join(";",diseasesList.stream().map(Disease::getDiseaseName).collect(Collectors.toList()))); Set expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet()); List userDiagnosisDiseaseList = CollUtil.isEmpty(diagnosisResult.getFinalDiagnosis()) ? CollUtil.newArrayList() : diseaseService.listByIds(diagnosisResult.getFinalDiagnosis());