bugfix:修复检查无法展示正常结果的问题

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.*;
@@ -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;
     }
 

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();