From 518d8385e6705ec3da5201d62ea985f6c8eb1cd5 Mon Sep 17 00:00:00 2001
From: duzhongxu <15039018447@163.com>
Date: Mon, 30 Mar 2026 14:01:43 +0800
Subject: [PATCH] =?UTF-8?q?292=20=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E3=80=8B=E5=A5=97=E9=A4=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=9A=E6=A3=80=E9=AA=8C=E5=A5=97=E9=A4=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B4=B9=E5=AD=97=E6=AE=B5=3D=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5=E7=9A=84=E5=80=BC/10=20293=20?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E3=80=8B=E5=A5=97=E9=A4=90=E8=AE=BE=E7=BD=AE=EF=BC=9Alis?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8F=96=E5=80=BC=20296=20?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E3=80=8B=E5=A5=97=E9=A4=90=E7=AE=A1=E7=90=86=EF=BC=9A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=A1=8C=E3=80=90=E7=BC=96=E8=BE=91=E3=80=91=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=8A=A5=E9=94=99=20297=20?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E3=80=8B=E5=A5=97=E9=A4=90=E7=AE=A1=E7=90=86=EF=BC=9A=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=A1=8C=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E2=80=9C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=A4=B1=E8=B4=A5=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lab/domain/InspectionPackageDetail.java   |   3 +-
 .../Inspection/PackageManagement.vue          |   2 +-
 .../views/maintainSystem/Inspection/index.vue | 109 ++++++++----------
 .../components/PackageSettings.vue            |  18 +++
 4 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java
index f5f1f667..69571001 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java
@@ -79,6 +79,7 @@ public class InspectionPackageDetail {
     private LocalDateTime updateTime;
 
     /** 删除标志（false-正常，true-删除） */
+    @TableField(value = "del_flag", fill = FieldFill.INSERT)
     @TableLogic(value = "false", delval = "true")
-    private Boolean delFlag;
+    private Boolean delFlag = false;
 }
diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue
index 4f2df7bc..50774211 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/PackageManagement.vue
@@ -190,7 +190,7 @@
 <script setup>
 import {computed, onMounted, ref} from 'vue';
 import {useRouter} from 'vue-router';
-import {ElMessage} from 'element-plus';
+import {ElMessage, ElMessageBox} from 'element-plus';
 import {getLocationTree} from '@/views/charge/outpatientregistration/components/outpatientregistration';
 import {listInspectionPackage, delInspectionPackage} from '@/api/system/inspectionPackage';
 import { getTenantPage } from '@/api/system/tenant';
diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
index 255934a3..0bc965aa 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
@@ -562,7 +562,14 @@
             </div>
             <div class="form-item">
               <span class="form-label">lis分组</span>
-              <el-select v-model="selectedLisGroup" placeholder="请选择lis分组" style="width: 100%;" :disabled="isViewMode">
+              <el-select
+                v-model="selectedLisGroup"
+                placeholder="请选择lis分组"
+                style="width: 100%;"
+                :disabled="isViewMode"
+                :loading="loadingLisGroup"
+                @visible-change="handleLisGroupVisibleChange"
+              >
                 <el-option
                   v-for="group in lisGroupList"
                   :key="group.id"
@@ -841,36 +848,50 @@ const route = useRoute();
 const lisGroupList = ref([]);
 // 选中的LIS分组
 const selectedLisGroup = ref('');
+// LIS分组加载状态
+const loadingLisGroup = ref(false);
+
+// 点击展开时才加载LIS分组数据
+const handleLisGroupVisibleChange = (visible) => {
+  if (visible && lisGroupList.value.length === 0) {
+    getLisGroupList();
+  }
+};
 
 // 获取就诊科室数据 - 与门诊挂号页面保持一致，在组件初始化时直接调用
 getLocationInfo();
 
 // 获取LIS分组数据
 const getLisGroupList = async () => {
+  loadingLisGroup.value = true;
   try {
-    const response = await listLisGroup();
+    const response = await listLisGroup({ pageNum: 1, pageSize: 200 });
     if (response.code === 200) {
       // 适配可能的不同响应格式
       let items = [];
 
       // 检查响应数据
       if (response.data) {
-        // 格式1: {data: {rows: [], total: number}} - 标准分页格式
-        if (response.data.rows && Array.isArray(response.data.rows)) {
+        // 格式0: {data: {data: {records: []}}} - 三层嵌套 MyBatisPlus 分页格式（实际后端返回格式）
+        if (response.data.data && response.data.data.records && Array.isArray(response.data.data.records)) {
+          items = response.data.data.records;
+        }
+        // 格式1: {data: {records: [], total: number}} - MyBatisPlus 分页格式
+        else if (response.data.records && Array.isArray(response.data.records)) {
+          items = response.data.records;
+        }
+        // 格式2: {data: {rows: [], total: number}} - 标准分页格式
+        else if (response.data.rows && Array.isArray(response.data.rows)) {
           items = response.data.rows;
         }
-        // 格式2: {data: []} - 简单数组格式
+        // 格式3: {data: []} - 简单数组格式
         else if (Array.isArray(response.data)) {
           items = response.data;
         }
-        // 格式3: {data: {data: []}} - 双重嵌套格式
+        // 格式4: {data: {data: []}} - 双重嵌套数组格式
         else if (response.data.data && Array.isArray(response.data.data)) {
           items = response.data.data;
         }
-        // 格式4: {data: {data: {rows: []}}} - 双重嵌套分页格式
-        else if (response.data.data && response.data.data.rows && Array.isArray(response.data.data.rows)) {
-          items = response.data.data.rows;
-        }
       }
 
       lisGroupList.value = items;
@@ -878,8 +899,9 @@ const getLisGroupList = async () => {
       ElMessage.error('获取LIS分组数据失败');
     }
   } catch (error) {
-    console.error('获取LIS分组数据失败:', error);
     ElMessage.error('获取LIS分组数据失败');
+  } finally {
+    loadingLisGroup.value = false;
   }
 };
 
@@ -1545,8 +1567,7 @@ const updateItemAmount = (item) => {
   // 更新项目金额
   item.amount = parseFloat(discountedAmount.toFixed(2));
 
-  // 基于折扣后的金额计算服务费
-  item.serviceFee = calculateItemServiceFee(item);
+  // 注意：serviceFee 由用户手动输入，不在此处覆盖
 
   // 更新项目总金额
   updateItemTotalAmount(item);
@@ -1624,63 +1645,27 @@ const cancelEditItem = (index) => {
   calculateAmounts();
 };
 
-// 计算单个项目的服务费（基于折扣后的金额）
-const calculateItemServiceFee = (item) => {
-  if (!generateServiceFee.value) return 0;
-
-  // 服务费是项目折扣后金额的10%
-  return parseFloat((item.amount * 0.1).toFixed(2));
-};
-
-// 重新分配所有项目的服务费（基于折扣后的金额）
-const redistributeServiceFee = () => {
-  if (!generateServiceFee.value) {
-    // 如果不生成服务费，将所有项目的服务费设为0
-    packageItems.value.forEach(item => {
-      item.serviceFee = 0;
-      updateItemTotalAmount(item);
-    });
-    return;
-  }
-
-  // 重新计算每个项目的服务费
-  packageItems.value.forEach(item => {
-    item.serviceFee = calculateItemServiceFee(item);
-    updateItemTotalAmount(item);
-  });
-};
-
 // 计算套餐金额和服务费
 const calculateAmounts = () => {
-  // 更新每个项目的折扣金额
+  // 更新每个项目的折扣金额和总金额
   packageItems.value.forEach(item => {
-    // 计算项目原价金额
     const originalAmount = (item.quantity || 1) * (item.unitPrice || 0.00);
-
-    // 应用折扣到项目金额
     let discountedAmount = originalAmount;
     if (discount.value && !isNaN(parseFloat(discount.value))) {
       const discountRate = parseFloat(discount.value) / 100;
       discountedAmount = originalAmount * (1 - discountRate);
     }
-
-    // 更新项目金额
     item.amount = parseFloat(discountedAmount.toFixed(2));
+    // serviceFee 由用户手动输入，不覆盖；只更新 totalAmount
+    item.totalAmount = parseFloat(((item.amount) + (item.serviceFee || 0)).toFixed(2));
   });
 
-  // 重新分配所有项目的服务费
-  redistributeServiceFee();
+  // 汇总各明细行服务费到基本信息服务费（只读展示）
+  serviceFee.value = parseFloat(packageItems.value.reduce((sum, item) => sum + (item.serviceFee || 0), 0).toFixed(2));
 
-  // 计算套餐总服务费
-  if (generateServiceFee.value) {
-    serviceFee.value = parseFloat(packageItems.value.reduce((sum, item) => sum + (item.serviceFee || 0), 0).toFixed(2));
-  } else {
-    serviceFee.value = 0;
-  }
-
-  // 计算套餐总金额（折扣后金额 + 服务费）
-  const totalAmount = packageItems.value.reduce((sum, item) => sum + (item.amount || 0), 0);
-  packageAmount.value = parseFloat((totalAmount + serviceFee.value).toFixed(2));
+  // 套餐总金额 = 各行折扣后金额之和 + 各行服务费之和
+  const totalAmount = packageItems.value.reduce((sum, item) => sum + (item.amount || 0) + (item.serviceFee || 0), 0);
+  packageAmount.value = parseFloat(totalAmount.toFixed(2));
 };
 
 const itemNameRefs = ref([]);
@@ -1890,7 +1875,6 @@ const handleAdd = (row, index) => {
           ElMessage.success('删除成功');
           getInspectionTypeList();
         }).catch(error => {
-          console.error('删除检验类型失败:', error);
           ElMessage.error('删除失败: ' + (error.response?.data?.msg || '未知错误'));
         });
       } else {
@@ -2230,14 +2214,15 @@ const handleSave = () => {
     unit: item.unit,
     unitPrice: item.unitPrice,
     amount: item.amount,
-    serviceFee: item.serviceFee,
-    totalAmount: item.totalAmount,
+    serviceFee: item.serviceFee || 0,
+    totalAmount: parseFloat(((item.amount || 0) + (item.serviceFee || 0)).toFixed(2)),
     origin: item.origin,
     createTime: new Date().toISOString(),
     updateTime: new Date().toISOString()
   }));
 
-  // 调用保存API（暂时使用模拟保存，后续对接真实API）
+
+  // 调用保存API
   savePackageData(basicInfo, detailData);
 };
 
@@ -2708,7 +2693,7 @@ onMounted(async () => {
   // 1. 启动其他基础数据的加载（这些不需要等待，并行执行即可）
   loadParentTypes();
   getInspectionTypeList();
-  getLisGroupList();
+  // getLisGroupList(); // 改为点击下拉框时懒加载
 
   // 2. 【关键】等待机构列表加载完成
   // 等函数执行完成
diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
index 17769d57..03c27bba 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
@@ -482,6 +482,8 @@ const organizationOptions = ref([])
 const diagnosisTreatmentList = ref([])
 // 过滤后的诊疗项目列表（用于搜索）
 const filteredDiagnosisList = ref([])
+// lis分组列表
+const lisGroupOptions = ref([])
 // 加载状态
 const loading = ref(false)
 
@@ -738,11 +740,27 @@ onMounted(async () => {
     // 加载卫生机构列表（只获取启用的租户）
     await loadOrganizationList()
 
+    // 加载lis分组列表
+    await loadLisGroupList()
+
   } catch (error) {
     console.error('✗ 初始化数据失败:', error)
   }
 })
 
+// 加载lis分组列表
+async function loadLisGroupList() {
+  try {
+    const response = await listLisGroup({ pageNum: 1, pageSize: 100 })
+    if (response && response.code === 200 && response.data) {
+      const items = response.data.records || response.data.rows || (Array.isArray(response.data) ? response.data : [])
+      lisGroupOptions.value = items
+    }
+  } catch (error) {
+    console.error('✗ 获取lis分组列表失败:', error)
+  }
+}
+
 // 加载卫生机构列表（从租户列表获取，只获取启用的）
 async function loadOrganizationList() {
   try {