From 8060d825188b498bf0f25e8999fbfc91bd90e3d2 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Thu, 23 Nov 2023 13:37:47 +0800
Subject: [PATCH] =?UTF-8?q?vp=5Fmedical=5Frec=E4=BC=98=E5=8C=96=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/supervision/model/MedicalRec.java | 5 -----
.../src/main/resources/mapper/MedicalRecMapper.xml | 4 +---
.../supervision/service/impl/AskProcessServiceImpl.java | 8 ++++++++
3 files changed, 9 insertions(+), 8 deletions(-)
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 @@
<result property="primarilyDiagnosisCriteria" column="primarily_diagnosis_criteria" jdbcType="VARCHAR"/>
<result property="confirmDiagnosisCriteria" column="confirm_diagnosis_criteria" jdbcType="VARCHAR"/>
<result property="differentialDiagnosisCriteria" column="differential_diagnosis_criteria" jdbcType="VARCHAR"/>
- <result property="primaryDiagnosis" column="primary_diagnosis" jdbcType="OTHER"/>
<result property="allergyHistory" column="allergy_history" jdbcType="VARCHAR"/>
<result property="previousHistory" column="previous_history" jdbcType="VARCHAR"/>
<result property="familyHistory" column="family_history" jdbcType="VARCHAR"/>
@@ -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
</sql>
</mapper>
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());