From 0937cc80fe7cecb6b04b93f78e48b2e1d4268ba7 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 12 Dec 2023 11:38:27 +0800 Subject: [PATCH] =?UTF-8?q?web=20=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=97=85=E4=BE=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/controller/MedicalRecordController.java | 8 +++++++- .../com/supervision/service/MedicalRecordService.java | 2 +- .../service/impl/MedicalRecordServiceImpl.java | 8 ++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java b/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java index 0a47e682..f1845bc6 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java @@ -21,6 +21,12 @@ public class MedicalRecordController { private final MedicalRecordService medicalRecordService; + /** + * @Deprecated: 由updateMedicalRecord接口统一完成新增和更新操作 + * @param processMedical 问诊流程病历 + * @return 是否新增成功 + */ + @Deprecated @ApiOperation("新增电子病例信息") @PostMapping("save") public boolean saveMedicalRecord(@RequestBody ProcessMedical processMedical){ @@ -32,7 +38,7 @@ public class MedicalRecordController { @PutMapping("update") public boolean updateMedicalRecord(@RequestBody ProcessMedical processMedical){ - return medicalRecordService.updateMedicalRecord(processMedical); + return medicalRecordService.saveOrUpdateMedicalRecord(processMedical); } @ApiOperation("通过流程id查询电子病例信息") diff --git a/virtual-patient-web/src/main/java/com/supervision/service/MedicalRecordService.java b/virtual-patient-web/src/main/java/com/supervision/service/MedicalRecordService.java index 585fcfcd..85b688c4 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/MedicalRecordService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/MedicalRecordService.java @@ -10,7 +10,7 @@ public interface MedicalRecordService { ProcessMedicalResVo findByProcessId(String processId); - boolean updateMedicalRecord(ProcessMedical processMedical); + boolean saveOrUpdateMedicalRecord(ProcessMedical processMedical); ProcessMedicalViewDetailResVo queryViewDetail(String processId); } 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 8662c478..b44860e3 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 @@ -2,6 +2,7 @@ package com.supervision.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; import com.supervision.model.Process; import com.supervision.model.ProcessMedical; import com.supervision.model.User; @@ -50,9 +51,12 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { } @Override - public boolean updateMedicalRecord(ProcessMedical processMedical) { + public boolean saveOrUpdateMedicalRecord(ProcessMedical processMedical) { - Assert.notEmpty(processMedical.getId(),"id 不能为空"); + if (StrUtil.isEmpty(processMedical.getId())){ + // 走新增逻辑 + return saveMedicalRecord(processMedical); + } return processMedicalService.updateById(processMedical); }