From 58811748986950472291da765f8372bdc07631ce Mon Sep 17 00:00:00 2001
From: Euni4U <958079825@qq.com>
Date: Tue, 25 Mar 2025 10:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectPatientController.java              | 18 ++++++++++++++----
 .../vo/InspectPatientReportDataVO.java         |  3 +++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java
index 5f8d42c..7e00dca 100644
--- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java
+++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java
@@ -634,6 +634,7 @@ public class InspectPatientController {
                     itemData.setInspectdoctor(item.getInspectdoctor());
                     itemData.setInspecttime(item.getInspecttime());
                     itemData.setType(item.getItemName());
+                    itemData.setItemStatus(item.getItemStatus());
                     
                     // 尝试转换数值结果
                     if (item.getItemResult() != null) {
@@ -748,19 +749,31 @@ public class InspectPatientController {
         // 根据项目代码匹配
         if (itemCode != null) {
             String upperItemCode = itemCode.toUpperCase();
+            // 原有匹配逻辑
             if (pacsType.equals("XC") && upperItemCode.contains("XCG")) return true;
             if (pacsType.equals("NC") && upperItemCode.contains("NCG")) return true;
             if ((pacsType.equals("EC") || pacsType.equals("ECG")) && upperItemCode.contains("ECG")) return true;
             if (pacsType.equals("US") && upperItemCode.contains("US")) return true;
+            
+            // 添加新的匹配逻辑
+            if (pacsType.equals("CBC") && upperItemCode.contains("XCG")) return true;
+            if (pacsType.equals("RT") && upperItemCode.contains("NCG")) return true;
+            if (pacsType.equals("BT") && upperItemCode.contains("SHQX")) return true;
         }
         
         // 根据项目名称匹配
         if (itemName != null) {
             String upperItemName = itemName.toUpperCase();
+            // 原有匹配逻辑
             if (pacsType.equals("XC") && upperItemName.contains("血常规")) return true;
             if (pacsType.equals("NC") && upperItemName.contains("尿常规")) return true;
             if ((pacsType.equals("EC") || pacsType.equals("ECG")) && upperItemName.contains("心电图")) return true;
             if (pacsType.equals("US") && upperItemName.contains("超声")) return true;
+            
+            // 添加新的匹配逻辑
+            if (pacsType.equals("CBC") && upperItemName.contains("血常规")) return true;
+            if (pacsType.equals("RT") && upperItemName.contains("尿常规")) return true;
+            if (pacsType.equals("BT") && (upperItemName.contains("生化") || upperItemName.contains("SHQX"))) return true;
         }
         
         return false;
@@ -773,14 +786,11 @@ public class InspectPatientController {
         if (pacsType == null) return "未知检查";
         
         switch (pacsType.toUpperCase()) {
-            case "XC":
             case "XCG": return "血常规";
-            case "NC":
             case "NCG": return "尿常规";
-            case "EC":
             case "ECG": return "心电图";
             case "US": return "超声检查";
-            case "BT": return "生化全项";
+            case "BT": return "生化";
             case "RT": return "尿常规";
             case "CBC": return "血常规";
             default: return pacsType;
diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientReportDataVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientReportDataVO.java
index 142b785..63f90de 100644
--- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientReportDataVO.java
+++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientReportDataVO.java
@@ -31,6 +31,9 @@ public class InspectPatientReportDataVO {
     @Schema(description = "检查值", example = "1.00")
     private Double itemValue;
 
+    @Schema(description = "项目状态", example = "0")
+    private String itemStatus;
+
     @Schema(description = "根据检查结论分析")
     private String analyse;