From 3c075ff5bdaea4dc72747c7a5792fd58a31fd5b1 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Mon, 22 Jan 2024 11:28:49 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E6=AD=A3=E5=B8=B8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AskAncillaryServiceImpl.java    | 16 ++++++++--------
 .../service/impl/AskPhysicalServiceImpl.java     |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
index 6dff4a50..3a67da3e 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
@@ -3,6 +3,7 @@ package com.supervision.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.supervision.dto.DiseaseAncillaryDto;
 import com.supervision.exception.BusinessException;
 import com.supervision.model.*;
@@ -58,8 +59,8 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
                         .orElseThrow(() -> new BusinessException("流程ID不能为空")).getProcessId()))
                 .orElseThrow(() -> new BusinessException("未找到流程ID"));
         for (AskAncillaryBatchReqVO item : reqVO) {
-                // 执行并保存结果
-                execSaveDiagnosisAncillaryRecord(item.getAncillaryItemId(), item.getPrimaryId(), process);
+            // 执行并保存结果
+            execSaveDiagnosisAncillaryRecord(item.getAncillaryItemId(), item.getPrimaryId(), process);
         }
     }
 
@@ -90,7 +91,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
         record.setProcessId(process.getId());
         record.setItemId(itemId);
         record.setAncillaryId(diseaseAncillary.getId());
-        record.setResult(diseaseAncillary.getResult());
+        record.setResult(StrUtil.isNotBlank(diseaseAncillary.getResult()) ? diseaseAncillary.getResult() : diseaseAncillary.getNormalResult());
         record.setCreateUserId(UserUtil.getUser().getId());
         record.setUpdateUserId(UserUtil.getUser().getId());
         record.setItemName(diseaseAncillary.getItemName());
@@ -108,7 +109,6 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
         }
 
 
-
         return record;
     }
 
@@ -134,11 +134,11 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
             List<AskAncillaryHistoryResVO> value = entry.getValue();
             List<DiagnosisPrimaryVO> diagnosisPrimaryList = new ArrayList<>();
             Optional<AskAncillaryHistoryResVO> any = value.stream().findAny();
-            if (any.isPresent()){
+            if (any.isPresent()) {
                 AskAncillaryHistoryResVO bean = BeanUtil.toBean(any.get(), AskAncillaryHistoryResVO.class);
-                for (AskAncillaryHistoryResVO node: value) {
+                for (AskAncillaryHistoryResVO node : value) {
                     DiagnosisPrimaryVO diagnosisPrimaryVO = primaryMap.get(node.getPrimaryId());
-                    if (ObjectUtil.isNotEmpty(diagnosisPrimaryVO)){
+                    if (ObjectUtil.isNotEmpty(diagnosisPrimaryVO)) {
                         diagnosisPrimaryList.add(diagnosisPrimaryVO);
                     }
                 }
@@ -154,7 +154,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
     public void saveAncillaryAssessmentResult(SaveAncillaryAssessmentResultReqVO reqVO) {
         boolean update = diagnosisAncillaryRecordService.lambdaUpdate().set(DiagnosisAncillaryRecord::getAssessmentResult, reqVO.getResult())
                 .eq(DiagnosisAncillaryRecord::getId, reqVO.getRecordId()).update();
-        if (!update){
+        if (!update) {
             throw new BusinessException("保存判读结果失败");
         }
     }
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
index eb8656e2..3989ed0f 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
@@ -45,6 +45,7 @@ public class AskPhysicalServiceImpl implements AskPhysicalService {
     private final DiagnosisPrimaryService diagnosisPrimaryService;
 
     private final DefaultPhysicalIndicatorService defaultPhysicalIndicatorService;
+
     @Override
     public List<ConfigPhysicalToolResVO> queryPhysicalToolList() {
 
@@ -80,7 +81,8 @@ public class AskPhysicalServiceImpl implements AskPhysicalService {
         diagnosisPhysicalRecord.setPhysicalId(result.getId());
         diagnosisPhysicalRecord.setToolId(tool.getId());
         diagnosisPhysicalRecord.setLocationId(location.getId());
-        diagnosisPhysicalRecord.setResult(result.getResult());
+        // 首先查询异常结果,如果没有异常结果,则展示正常结果
+        diagnosisPhysicalRecord.setResult(StrUtil.isNotBlank(result.getResult()) ? result.getResult() : result.getNormalResult());
         diagnosisPhysicalRecord.setCreateUserId(UserUtil.getUser().getCreateUserId());
         diagnosisPhysicalRecord.setUpdateUserId(UserUtil.getUser().getCreateUserId());
         diagnosisPhysicalRecord.insert();