From fbc48cb4a8c27d1460f3d59a6569c8f25e7126f1 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Wed, 6 Dec 2023 16:19:36 +0800
Subject: [PATCH] =?UTF-8?q?web=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/ProcessMedicalMapper.xml | 2 ++
.../service/impl/MedicalRecordServiceImpl.java | 16 ++++++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/virtual-patient-model/src/main/resources/mapper/ProcessMedicalMapper.xml b/virtual-patient-model/src/main/resources/mapper/ProcessMedicalMapper.xml
index eae30564..b96e8c67 100644
--- a/virtual-patient-model/src/main/resources/mapper/ProcessMedicalMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/ProcessMedicalMapper.xml
@@ -40,6 +40,8 @@
<select id="findByProcessId" resultType="com.supervision.vo.ask.ProcessMedicalResVo">
select pr.process_no as processNo,
pr.update_time as recentTime,
+ pm.process_id as processId,
+ pm.disease_id as diseaseId,
mr.id as medicalRecId,
mr.no as medicalRecNo,
mr.patient_name as patientName,
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java
index 806a59d8..12e1027a 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java
@@ -1,8 +1,7 @@
package com.supervision.service.impl;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.supervision.model.Process;
import com.supervision.model.ProcessMedical;
import com.supervision.service.MedicalRecordService;
import com.supervision.service.ProcessMedicalService;
@@ -12,8 +11,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.util.List;
-
@Service
@RequiredArgsConstructor
@@ -21,6 +18,9 @@ import java.util.List;
public class MedicalRecordServiceImpl implements MedicalRecordService {
private final ProcessMedicalService processMedicalService;
+
+ private final ProcessService processService;
+
@Override
public boolean saveMedicalRecord(ProcessMedical processMedical) {
@@ -47,8 +47,12 @@ public class MedicalRecordServiceImpl implements MedicalRecordService {
private void saveAssert(ProcessMedical processMedical){
Assert.notEmpty(processMedical.getProcessId(),"流程id不为空");
- Assert.notEmpty(processMedical.getMedicalRecId(),"病例id不能为空");
- Assert.notEmpty(processMedical.getPatientId(),"病人id不能为空");
+
+ Process process = processService.getById(processMedical.getProcessId());
+ Assert.notNull(process,"流程数据不存在");
+
+ processMedical.setMedicalRecId(process.getMedicalRecId());
+ processMedical.setPatientId(process.getPatientId());
Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count();
Assert.isFalse(count > 0,"当前实例已经存在电子病例信息");