测试合并v4

测试合并v3
Merge pull request 'document' (#2 ) from document into develop
2026-01-15 16:42:56 +08:00 · 2026-01-15 15:54:22 +08:00 · 2026-01-15 07:37:39 +00:00 · 2026-01-15 07:37:39 +00:00 · 2026-01-15 07:37:39 +00:00 · 2026-01-15 15:34:34 +08:00
8 changed files with 596 additions and 622 deletions
--- a/md/test.html
+++ b/md/test.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-    <title>测试合并1</title>
+    <title>测试合并11111</title>
 </head>
 <body>
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java
@@ -4,7 +4,7 @@ import com.core.common.core.domain.R;
 import com.openhis.check.domain.LisGroupInfo;
 public interface ILisGroupInfoAppService {
-    R<?> getLisGroupInfoList();
+    R<?> getLisGroupInfoList(Integer pageNum, Integer pageSize);
    R<?> add(LisGroupInfo lisGroupInfo);
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
@@ -1,6 +1,7 @@
 package com.openhis.web.check.appservice.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.check.domain.LisGroupInfo;
 import com.openhis.check.service.ILisGroupInfoService;
@@ -17,11 +18,14 @@ public class LisGroupInfoAppServiceImpl implements ILisGroupInfoAppService {
    @Resource
    private ILisGroupInfoService lisGroupInfoService;
    @Override
-    public R<?> getLisGroupInfoList() {
+    public R<?> getLisGroupInfoList(Integer pageNum, Integer pageSize) {
-        List<LisGroupInfo> list = lisGroupInfoService.list();
+        Page<LisGroupInfo> page = new Page<>(pageNum, pageSize);
        Page<LisGroupInfo> list = lisGroupInfoService.page(page);
        return R.ok(list);
    }
    @Override
    public R<?> add(LisGroupInfo lisGroupInfo) {
        if (ObjectUtil.isEmpty(lisGroupInfo)) {
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java
@@ -19,8 +19,8 @@ public class LisGroupInfoController {
    *
    * */
    @GetMapping("/list")
-    public R<?> getLisGroupInfoList(){
+    public R<?> getLisGroupInfoList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize){
-        return R.ok(lisGroupInfoAppService.getLisGroupInfoList());
+        return R.ok(lisGroupInfoAppService.getLisGroupInfoList(pageNum, pageSize));
    }
    /*
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -44,9 +44,9 @@
        abi.dosage_instruction,
        abi.chrgitm_lv
        FROM (
-        <choose>
+        <!-- 确保至少有一个查询被执行以避免语法错误 -->
-            <when test="adviceTypes != null and !adviceTypes.isEmpty()">
+        <if test="adviceTypes != null and !adviceTypes.isEmpty() and (adviceTypes.contains(1) or adviceTypes.contains(2) or adviceTypes.contains(3))">
-                <trim prefixOverrides="UNION ALL">
+            <!-- 如果有有效的adviceTypes，则执行对应的查询 -->
            <if test="adviceTypes.contains(1)">
                (SELECT
                DISTINCT ON (T1.ID)
@@ -113,10 +113,10 @@
                </if>
                AND T5.instance_table = #{medicationTableName}
                )
                <if test="adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
            </if>
            <if test="adviceTypes.contains(2)">
                        UNION ALL
                (SELECT
                DISTINCT ON (T1.ID)
                T1.tenant_id,
@@ -176,10 +176,10 @@
                AND T4.instance_table = #{deviceTableName}
                AND T1.status_enum = #{statusEnum}
                )
                <if test="adviceTypes.contains(3)">UNION ALL</if>
            </if>
            <if test="adviceTypes.contains(3)">
                        UNION ALL
                (SELECT
                DISTINCT ON (T1.ID)
                T1.tenant_id,
@@ -240,52 +240,51 @@
                AND T1.status_enum = #{statusEnum}
                )
            </if>
-                </trim>
+        </if>
-            </when>
+        <!-- 如果没有有效的adviceTypes，提供一个空的默认查询以避免语法错误 -->
-            <otherwise>
+        <if test="adviceTypes == null or adviceTypes.isEmpty() or (!adviceTypes.contains(1) and !adviceTypes.contains(2) and !adviceTypes.contains(3))">
                -- 当没有指定adviceTypes或adviceTypes为空时，返回空结果集但保持正确的SQL语法
            SELECT
-                    NULL::varchar AS tenant_id,
+                mmd.tenant_id,
-                    NULL::integer AS advice_type,
+                CAST(0 AS INTEGER) AS advice_type,
-                    NULL::varchar AS bus_no,
+                CAST('' AS VARCHAR) AS bus_no,
-                    NULL::varchar AS category_code,
+                CAST('' AS VARCHAR) AS category_code,
-                    NULL::varchar AS pharmacology_category_code,
+                CAST('' AS VARCHAR) AS pharmacology_category_code,
-                    NULL::numeric AS part_percent,
+                CAST(0 AS NUMERIC) AS part_percent,
-                    NULL::numeric AS unit_conversion_ratio,
+                CAST(0 AS NUMERIC) AS unit_conversion_ratio,
-                    NULL::integer AS part_attribute_enum,
+                CAST(0 AS INTEGER) AS part_attribute_enum,
-                    NULL::integer AS tho_part_attribute_enum,
+                CAST(0 AS INTEGER) AS tho_part_attribute_enum,
-                    NULL::integer AS skin_test_flag,
+                CAST(0 AS INTEGER) AS skin_test_flag,
-                    NULL::integer AS inject_flag,
+                CAST(0 AS INTEGER) AS inject_flag,
-                    NULL::bigint AS advice_definition_id,
+                CAST(0 AS BIGINT) AS advice_definition_id,
-                    NULL::varchar AS advice_name,
+                CAST('' AS VARCHAR) AS advice_name,
-                    NULL::varchar AS advice_bus_no,
+                CAST('' AS VARCHAR) AS advice_bus_no,
-                    NULL::varchar AS py_str,
+                CAST('' AS VARCHAR) AS py_str,
-                    NULL::varchar AS wb_str,
+                CAST('' AS VARCHAR) AS wb_str,
-                    NULL::varchar AS yb_no,
+                CAST('' AS VARCHAR) AS yb_no,
-                    NULL::varchar AS product_name,
+                CAST('' AS VARCHAR) AS product_name,
-                    NULL::integer AS activity_type,
+                CAST(0 AS INTEGER) AS activity_type,
-                    NULL::varchar AS unit_code,
+                CAST('' AS VARCHAR) AS unit_code,
-                    NULL::varchar AS min_unit_code,
+                CAST('' AS VARCHAR) AS min_unit_code,
-                    NULL::numeric AS volume,
+                CAST(0 AS NUMERIC) AS volume,
-                    NULL::varchar AS method_code,
+                CAST('' AS VARCHAR) AS method_code,
-                    NULL::varchar AS rate_code,
+                CAST('' AS VARCHAR) AS rate_code,
-                    NULL::bigint AS org_id,
+                CAST(0 AS BIGINT) AS org_id,
-                    NULL::bigint AS location_id,
+                CAST(0 AS BIGINT) AS location_id,
-                    NULL::varchar AS dose,
+                CAST('' AS VARCHAR) AS dose,
-                    NULL::varchar AS dose_unit_code,
+                CAST('' AS VARCHAR) AS dose_unit_code,
-                    NULL::varchar AS supplier,
+                CAST('' AS VARCHAR) AS supplier,
-                    NULL::bigint AS supplier_id,
+                CAST(0 AS BIGINT) AS supplier_id,
-                    NULL::varchar AS manufacturer,
+                CAST('' AS VARCHAR) AS manufacturer,
-                    NULL::bigint AS charge_item_definition_id,
+                CAST(0 AS BIGINT) AS charge_item_definition_id,
-                    NULL::varchar AS advice_table_name,
+                CAST('' AS VARCHAR) AS advice_table_name,
-                    NULL::bigint AS position_id,
+                CAST(0 AS BIGINT) AS position_id,
-                    NULL::integer AS restricted_flag,
+                CAST(0 AS INTEGER) AS restricted_flag,
-                    NULL::varchar AS restricted_scope,
+                CAST('' AS VARCHAR) AS restricted_scope,
-                    NULL::varchar AS dosage_instruction,
+                CAST('' AS VARCHAR) AS dosage_instruction,
-                    NULL::integer AS chrgitm_lv
+                CAST(0 AS INTEGER) AS chrgitm_lv
-                WHERE 1 = 0  -- 确保不返回任何行
+            FROM med_medication_definition mmd
-            </otherwise>
+            WHERE 1 = 0  -- 仍然确保不返回任何行，但使用真实表确保类型正确
-        </choose>
+        </if>
        ) AS abi
        ${ew.customSqlSegment}
    </select>
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -198,6 +198,9 @@ watch(
    // 直接更新查询参数
    queryParams.value.searchKey = newValue.searchKey || '';
    // 更新categoryCode
    queryParams.value.categoryCode = newValue.categoryCode || '';
    // 处理类型筛选
    if (newValue.adviceType !== undefined && newValue.adviceType !== null && newValue.adviceType !== '') {
      // 单个类型
@@ -215,9 +218,19 @@ getList();
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
  if (row.priceList && row.priceList.length > 0) {
-    const price = row.priceList[0].price || 0;
+    const price = row.priceList[0].price;
    // 检查价格是否为有效数字
    if (price !== undefined && price !== null && !isNaN(price) && isFinite(price)) {
      return Number(price).toFixed(2) + ' 元';
    }
    // 如果价格无效，尝试从其他可能的字段获取价格
    if (row.totalPrice !== undefined && row.totalPrice !== null && !isNaN(row.totalPrice) && isFinite(row.totalPrice)) {
      return Number(row.totalPrice).toFixed(2) + ' 元';
    }
    if (row.price !== undefined && row.price !== null && !isNaN(row.price) && isFinite(row.price)) {
      return Number(row.price).toFixed(2) + ' 元';
    }
  }
  return '-';
 }
 function getList() {
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -96,7 +96,7 @@
                      ' ' +
                      scope.row.volume +
                      ' [' +
-                      Number(scope.row.unitPrice).toFixed(2) +
+                      (scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) && isFinite(scope.row.unitPrice) ? Number(scope.row.unitPrice).toFixed(2) : '-') +
                      ' 元' +
                      '/' +
                      scope.row.unitCode_dictText +
@@ -145,7 +145,7 @@
                  <span class="medicine-info"> 注射药品：{{ scope.row.injectFlag_enumText }} </span>
                  <span class="total-amount">
                    总金额：{{
-                      scope.row.totalPrice
+                      (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice))
                        ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
                        : '0.00 元'
                    }}
@@ -631,7 +631,7 @@
                          " " +
                          scope.row.volume +
                          " [" +
-                          Number(scope.row.unitPrice).toFixed(2) +
+                          (scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) && isFinite(scope.row.unitPrice) ? Number(scope.row.unitPrice).toFixed(2) : '-') +
                          " 元" +
                          "/" +
                          scope.row.unitCode_dictText +
@@ -687,7 +687,7 @@
                      </el-form-item>
                      <span class="total-amount">
                        总金额：{{
-                          scope.row.totalPrice
+                          (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice))
                            ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
                            : '0.00 元'
                        }}
@@ -702,7 +702,7 @@
                  <span style="font-size: 16px; font-weight: 600">
                    {{ scope.row.adviceName }}
                    {{
-                      scope.row.unitPrice
+                      (scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) && isFinite(scope.row.unitPrice))
                        ? Number(scope.row.unitPrice).toFixed(2) + '/次'
                        : '-' + '元'
                    }}
@@ -748,7 +748,7 @@
                    <span class="total-amount">
                      总金额：
                      {{
-                        scope.row.totalPrice
+                        (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice))
                          ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
                          : '0.00 元'
                      }}
@@ -782,6 +782,19 @@
                    // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
                    prescriptionList[scope.$index].adviceName = undefined;
                    adviceQueryParams.adviceType = value;
                    // 根据选择的类型设置categoryCode，用于药品分类筛选
                    if (value == 1) { // 西药
                      adviceQueryParams.categoryCode = '2';
                    } else if (value == 2) { // 中成药
                      adviceQueryParams.categoryCode = '1';
                    } else if (value == 3) { // 耗材
                      adviceQueryParams.categoryCode = ''; // 耗材不需要categoryCode筛选
                    } else if (value == 4) { // 诊疗
                      adviceQueryParams.categoryCode = ''; // 诊疗不需要categoryCode筛选
                    } else {
                      adviceQueryParams.categoryCode = ''; // 全部类型
                    }
                  }
                "
                @clear="
@@ -907,7 +920,7 @@
      <el-table-column label="总金额" align="right" prop="" header-align="center" width="100">
        <template #default="scope">
          <span v-if="!scope.row.isEdit" style="text-align: right">
-            {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
+            {{ (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice)) ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
          </span>
        </template>
      </el-table-column>
@@ -2852,12 +2865,25 @@ function getGroupMarkers() {
 function calculateTotalPrice(row, index) {
  nextTick(() => {
    if (row.adviceType == 3) {
      // 检查价格是否为有效数字
      if (row.unitPrice !== undefined && row.unitPrice !== null && !isNaN(row.unitPrice) && isFinite(row.unitPrice)) {
        row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
      } else {
        row.totalPrice = '0.000000'; // 或者设置为 0
      }
    } else {
      if (row.unitCode == row.minUnitCode) {
        if (row.minUnitPrice !== undefined && row.minUnitPrice !== null && !isNaN(row.minUnitPrice) && isFinite(row.minUnitPrice)) {
          row.totalPrice = (row.minUnitPrice * row.quantity).toFixed(6);
        } else {
          row.totalPrice = '0.000000';
        }
      } else {
        if (row.unitPrice !== undefined && row.unitPrice !== null && !isNaN(row.unitPrice) && isFinite(row.unitPrice)) {
          row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
        } else {
          row.totalPrice = '0.000000';
        }
      }
    }
  });
--- a/openhis-ui-vue3/src/views/maintainSystem/lisGroup/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/lisGroup/index.vue
@@ -24,7 +24,7 @@
        <tr
            v-for="(item, index) in tableData"
            :key="item.id || index"
-            :class="{ 'editing-row': item.editing }"
+            :class="{ 'editing-row': item.editing, 'success-row': item.success, 'deleting-row': item.deleting }"
        >
          <td>{{ index + 1 }}</td>
          <td>
@@ -32,10 +32,8 @@
              <input
                  type="text"
                  v-model="item.healthInstitution"
-                  placeholder="请输入卫生机构"
+                  disabled
                  :class="{ 'error-input': item.errors?.healthInstitution }"
              >
                <span v-if="item.errors?.healthInstitution" class="error-message">{{ item.errors.healthInstitution }}</span>
            </template>
            <template v-else>
              {{ item.healthInstitution }}
@@ -55,7 +53,7 @@
                  type="text"
                  v-model="item.lisGroupName"
                  placeholder="请输入分组名称"
-                      :class="{ 'error-input': item.errors?.lisGroupName }"
+                  :class="{ 'error-input': item.errors?.lisGroupName, 'focus-target': item.isNew }"
              >
              <span v-if="item.errors?.lisGroupName" class="error-message">{{ item.errors.lisGroupName }}</span>
            </template>
@@ -108,21 +106,26 @@
    <!-- 分页区域 -->
    <div class="pagination">
-        <button class="pagination-btn">‹</button>
+      <button class="pagination-btn" @click="prevPage" :disabled="currentPage <= 1">‹</button>
-        <span>1</span>
+      <span>{{ currentPage }}</span>
-        <button class="pagination-btn">›</button>
+      <button class="pagination-btn" @click="nextPage" :disabled="currentPage >= totalPages">›</button>
    </div>
  </div>
 </template>
 <script>
-import {computed, onMounted, reactive, ref} from 'vue'
+import {computed, nextTick, onMounted, reactive, ref} from 'vue'
 import {addLisGroup, delLisGroup, listLisGroup, updateLisGroup} from '@/api/system/checkType'
 import {getDicts} from "@/api/system/dict/data";
 import useUserStore from '@/store/modules/user';
 import {ElMessage, ElMessageBox} from 'element-plus';
 export default {
  name: 'LisGroupMaintain',
  setup() {
    // 获取用户store
    const userStore = useUserStore();
    // 加载状态
    const loading = ref(false)
@@ -138,7 +141,6 @@ export default {
          bloodTubeOptions.value = response.data.map(item => item.label || item.dictLabel);
        }
      } catch (error) {
        console.error('获取采血管颜色字典失败:', error);
        // 如果字典获取失败，使用默认选项作为备选
        bloodTubeOptions.value = ['黄管', '紫管', '蓝管'];
      }
@@ -154,6 +156,11 @@ export default {
      return Math.ceil(totalItems.value / pageSize.value)
    })
    // 获取当前用户的卫生机构名称
    const getCurrentHospital = () => {
      return userStore.hospitalName || userStore.orgName || '演示医院';
    };
    // 表格数据
    const tableData = reactive([])
@@ -181,172 +188,58 @@ export default {
          pageSize: pageSize.value
        }
        console.log('准备调用接口，查询参数:', query)
        // 调用接口获取数据
        // 注意：根据checkType.js中的定义，这个接口使用GET方法和params参数
        const response = await listLisGroup(query)
        console.log('接口返回结果类型:', typeof response)
        console.log('接口返回结果:', response)
        console.log('响应是否包含code字段:', response && 'code' in response)
        console.log('响应是否包含data字段:', response && 'data' in response)
        // 清空现有数据
        tableData.splice(0, tableData.length)
        totalItems.value = 0
-        // 适配可能的不同响应格式
+        // 处理明确的数据结构
-        let items = []
+        if (response && response.code === 200) {
-        let total = 0
+          // 清空现有数据
          tableData.splice(0, tableData.length);
-        // 检查响应是否存在
+          // 获取最内层的数据结构
-        if (response) {
+          const innerResponse = response.data;
-          // 处理标准响应格式
+          if (innerResponse && innerResponse.code === 200) {
-          if (typeof response === 'object') {
+            const data = innerResponse.data;
-            // 检查是否是标准API响应格式 {code, data, msg}
+            if (data && Array.isArray(data.records)) {
-            if ('code' in response) {
+              // 更新总记录数
-              console.log('响应包含code字段:', response.code)
+              totalItems.value = data.total || 0;
-              // 成功状态码处理
+              // 处理每条记录
-              if (response.code === 200 || response.code === '200' || response.code === 0) {
+              data.records.forEach((item, index) => {
-                console.log('响应状态码为成功状态')
+                const formattedItem = {
                  id: item.id,
                  healthInstitution: item.hospital,
                  date: item.date,
                  lisGroupName: item.groupName,
                  bloodCollectionTube: item.tube,
                  remark: item.remark || '',
                  editing: false
                };
-                // 检查data字段
+                tableData.push(formattedItem);
-                if ('data' in response) {
+              });
-                  console.log('响应包含data字段，数据类型:', typeof response.data)
+            } else {
-                  
+              totalItems.value = 0;
                  // 格式1: {data: {rows: [], total: number}}
                  if (response.data && typeof response.data === 'object') {
                    // 处理双重嵌套格式 {data: {code, msg, data: []}}
                    if (response.data.data && (Array.isArray(response.data.data) || typeof response.data.data === 'object')) {
                      console.log('匹配到格式: 双重嵌套 data.data');
                      // 如果data.data是数组，直接使用
                      if (Array.isArray(response.data.data)) {
                        items = response.data.data;
                        total = items.length;
                        console.log('双重嵌套格式1: data.data是数组，数据量:', items.length);
                      }
                      // 如果data.data是对象，检查是否有rows字段
                      else if (Array.isArray(response.data.data.rows)) {
                        items = response.data.data.rows;
                        total = response.data.data.total !== undefined ? response.data.data.total : items.length;
                        console.log('双重嵌套格式2: data.data包含rows，数据量:', items.length, '，总数:', total);
                      }
                    }
                    // 标准格式检查
                    else if (Array.isArray(response.data.rows)) {
                      items = response.data.rows
                      total = response.data.total !== undefined ? response.data.total : items.length
                      console.log('匹配到格式1: response.data.rows，数据量:', items.length, '，总数:', total)
                    }
                    // 格式2: {data: []}
                    else if (Array.isArray(response.data)) {
                      items = response.data
                      total = items.length
                      console.log('匹配到格式2: response.data直接是数组，数据量:', items.length)
                    }
                    // 检查是否有其他可能的格式
                    else {
                      console.log('响应data不是预期格式，详细数据:', response.data)
                      // 尝试将整个data对象作为单个条目处理（有些API可能直接返回单个对象）
                      if (response.data) {
                        items = [response.data]
                        total = 1
                        console.log('尝试将整个data对象作为单个条目处理')
                      }
                    }
            }
          } else {
-                  console.log('响应不包含data字段')
+            totalItems.value = 0;
          }
        } else {
          // 非成功状态码
          const errorMsg = response.msg || response.message || `请求失败，状态码: ${response.code}`
                console.error('请求失败:', errorMsg)
          showMessage(errorMsg, 'error')
-              }
+          totalItems.value = 0;
            }
            // 格式3: 响应本身是一个对象但没有code字段，可能是单个记录
            else if (!Array.isArray(response)) {
              console.log('响应是对象但没有code字段，尝试作为单个记录处理')
              items = [response]
              total = 1
            }
          }
          // 格式4: 响应本身是数组
          if (Array.isArray(response)) {
            items = response
            total = items.length
            console.log('匹配到格式4: 响应本身是数组，数据量:', items.length)
          }
          // 记录最终解析到的数据量
          console.log('最终解析到的数据量:', items.length, '，总数:', total)
        } else {
          console.error('接口返回空数据')
          showMessage('获取LIS分组数据失败：服务器返回空响应', 'error')
        }
        // 处理获取到的数据
        if (items && items.length > 0) {
          // 处理每条数据，确保字段正确映射
          items.forEach((item, index) => {
            // 确保item是对象类型
            if (typeof item === 'object' && item !== null) {
              console.log(`处理记录 ${index + 1} 原始数据:`, item);
              // 创建格式化后的对象，确保字段存在
              // 根据网络响应截图更正字段映射关系
              const formattedItem = {
                id: item.id || `temp_${Date.now()}_${index}`, // 确保有ID
                // 更正字段映射：hospital -> healthInstitution
                healthInstitution: item.hospital || item.org || item.healthInstitution || '',
                // 优先使用date字段
                date: item.date || item.createTime || item.createDate || '',
                // 更正字段映射：groupName -> lisGroupName
                lisGroupName: item.groupName || item.name || item.lisGroupName || '',
                // 更正字段映射：tube -> bloodCollectionTube
                bloodCollectionTube: item.tube || item.property || item.bloodCollectionTube || item.bloodTube || '',
                remark: item.remark || item.note || '',
                editing: false,
                // 保留原始对象的所有其他属性
                ...item
              };
              tableData.push(formattedItem);
              console.log(`处理记录 ${index + 1} 格式化后数据:`, {
                id: formattedItem.id,
                healthInstitution: formattedItem.healthInstitution,
                date: formattedItem.date,
                lisGroupName: formattedItem.lisGroupName,
                bloodCollectionTube: formattedItem.bloodCollectionTube,
                remark: formattedItem.remark
              });
            } else {
              console.warn(`记录 ${index + 1} 不是有效对象，跳过处理:`, item);
            }
          });
          totalItems.value = total;
          console.log('数据加载完成，表格显示', tableData.length, '条记录，总数:', totalItems.value);
        } else {
          console.log('未获取到有效数据，表格为空');
        }
      } catch (error) {
-        // 详细的错误信息记录
+        // 提取错误信息
        console.error('加载LIS分组数据异常:', error)
        // 提取更详细的错误信息
        let errorMessage = '加载LIS分组数据失败，请稍后重试'
        if (error.response) {
          // 服务器响应了，但状态码不是2xx
          console.error('HTTP错误状态:', error.response.status)
          console.error('HTTP错误响应体:', error.response.data)
          if (error.response.data) {
            errorMessage = error.response.data.msg ||
                error.response.data.message ||
@@ -355,36 +248,18 @@ export default {
          } else {
            errorMessage = `服务器错误 (${error.response.status})`
          }
          // 额外记录响应体详情便于调试
          if (typeof error.response.data === 'object') {
            console.error('响应体详细结构:', JSON.stringify(error.response.data, null, 2))
          }
        } else if (error.request) {
          // 请求已发出，但未收到响应
          console.error('请求已发送但未收到响应:', error.request)
          errorMessage = '网络错误，服务器未响应，请检查网络连接'
        } else if (error.message) {
          // 请求配置出错
          console.error('请求配置错误:', error.message)
          errorMessage = error.message
        } else {
          console.error('未知错误类型:', typeof error)
        }
        // 显示错误信息
        showMessage(errorMessage, 'error')
        // 确保表格状态正确
        console.log('异常处理后表格状态:', {
          tableDataLength: tableData.length,
          totalItems: totalItems.value,
          currentPage: currentPage.value
        })
      } finally {
        loading.value = false
        console.log('数据加载操作完成，loading状态已更新为false')
        console.log('最终表格数据量:', tableData.length, '，总数:', totalItems.value)
      }
    }
@@ -402,13 +277,6 @@ export default {
      // 清除之前的错误信息
      delete item.errors
      // 验证卫生机构
      if (!item.healthInstitution || item.healthInstitution.trim() === '') {
        errors.healthInstitution = '卫生机构不能为空'
      } else if (item.healthInstitution.length > 100) {
        errors.healthInstitution = '卫生机构名称不能超过100个字符'
      }
      // 验证LIS分组名称
      if (!item.lisGroupName || item.lisGroupName.trim() === '') {
        errors.lisGroupName = 'LIS分组名称不能为空'
@@ -436,15 +304,11 @@ export default {
    // 显示提示信息
    const showMessage = (message, type = 'success') => {
-      // 在实际项目中，这里可以使用Element Plus或其他UI库的消息组件
+      // 使用Element Plus的消息组件
      // 这里为了简单起见，使用浏览器的alert，但添加了类型标识
      if (type === 'error') {
-        console.error(message)
+        ElMessage.error(message)
        alert(`错误: ${message}`)
      } else {
-        console.log(message)
+        ElMessage.success(message)
        // 可以使用更友好的提示方式，这里暂时注释掉alert以避免频繁弹窗
        // alert(message)
      }
    }
@@ -504,17 +368,23 @@ export default {
          const isNewRecord = item.isNew
          delete item.isNew
          // 添加保存成功样式，包括新增记录
          item.success = true
          // 0.5秒后移除成功样式
          setTimeout(() => {
            item.success = false
          }, 500)
          showMessage('保存成功')
-          // 如果是新增，重新加载数据以确保数据一致性
+          // 修改完成后重新请求后端本页数据，确保数据准确性
-          if (isNewRecord) {
+          setTimeout(() => {
            loadLisGroups()
-          }
+          }, 500)
        } else {
          showMessage(`保存失败: ${response.msg || '未知错误'}`, 'error')
        }
      } catch (error) {
        console.error('保存LIS分组数据失败:', error)
        showMessage(`保存失败: ${error.message || '未知错误'}`, 'error')
      } finally {
        loading.value = false
@@ -543,13 +413,12 @@ export default {
          item.editing = false
        }
      } catch (error) {
        console.error('取消编辑失败:', error)
        showMessage('取消编辑失败', 'error')
      }
    }
    // 添加新行
-    const addRow = () => {
+    const addRow = async () => {
      // 检查是否已有正在编辑的行
      const editingRow = tableData.find(item => item.editing)
      if (editingRow) {
@@ -558,9 +427,11 @@ export default {
      }
      const newId = String(Math.max(...tableData.map(item => parseInt(item.id) || 0), 0) + 1)
      // 从用户信息中获取当前卫生机构
      const currentHospital = getCurrentHospital()
      tableData.push({
-        id: newId,
+        id: '',
-        healthInstitution: '', // 空默认值
+        healthInstitution: currentHospital, // 默认当前操作工号的卫生机构
        date: getCurrentDate(), // 默认当前系统时间
        lisGroupName: '',
        bloodCollectionTube: '',
@@ -570,7 +441,14 @@ export default {
        isNew: true // 标记为新记录
      })
-      showMessage('请填写新记录信息')
+      // 等待DOM更新后聚焦到第一个输入框
      await nextTick()
      const focusElement = document.querySelector('.focus-target')
      if (focusElement) {
        focusElement.focus()
        // 清除focus-target类，避免下次添加行时影响
        focusElement.classList.remove('focus-target')
      }
    }
    // 删除行
@@ -582,10 +460,26 @@ export default {
        return
      }
      if (confirm(`确定要删除"${item.lisGroupName}"这条记录吗？`)) {
      try {
        // 使用Element Plus的确认对话框
        await ElMessageBox.confirm(
          `确定要删除"${item.lisGroupName}"这条记录吗？`,
          '删除确认',
          {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning'
          }
        )
        loading.value = true
        // 添加删除行标记，触发渐隐效果
        item.deleting = true
        // 等待300ms，让渐隐效果完成
        await new Promise(resolve => setTimeout(resolve, 300))
        // 如果是新添加的记录，直接从数组中移除
        if (item.isNew) {
          tableData.splice(index, 1)
@@ -596,23 +490,37 @@ export default {
          const response = await delLisGroup(item.id)
          if (response.code === 200) {
              tableData.splice(index, 1)
              showMessage('删除成功')
            // 更新总数
            totalItems.value--
            // 检查当前页码是否仍然有效
            const newTotalPages = Math.ceil(totalItems.value / pageSize.value)
            if (currentPage.value > newTotalPages && newTotalPages > 0) {
              // 如果当前页码大于总页数且总页数大于0，调整为最后一页
              currentPage.value = newTotalPages
            }
            // 重新加载当前页数据，保持页码不变
            loadLisGroups()
            showMessage('删除成功')
          } else {
            showMessage(`删除失败: ${response.msg || '未知错误'}`, 'error')
            // 如果删除失败，移除删除标记
            item.deleting = false
          }
        }
      } catch (error) {
-          console.error('删除LIS分组数据失败:', error)
+        if (error !== 'cancel') {
          showMessage(`删除失败: ${error.message || '未知错误'}`, 'error')
          // 如果删除失败，移除删除标记
          if (tableData[index]) {
            tableData[index].deleting = false
          }
        }
      } finally {
        loading.value = false
      }
    }
    }
    // 分页方法
    const prevPage = () => {
@@ -680,7 +588,7 @@ export default {
  align-items: center;
 }
-.header h1 {
+.header h2 {
  font-size: 18px;
  font-weight: 500;
  color: #333;
@@ -718,6 +626,12 @@ export default {
  background-color: #f0f8ff;
 }
 /* 保存成功行样式 */
 .success-row {
  background-color: #f6ffed !important;
  transition: background-color 0.3s ease;
 }
 .actions {
  white-space: nowrap;
 }
@@ -732,7 +646,7 @@ export default {
 /* 分页样式 */
 .pagination {
  display: flex;
-  justify-content: flex-end;
+  justify-content: center;
  align-items: center;
  padding: 16px 0;
  margin-top: 8px;
@@ -741,6 +655,14 @@ export default {
 .pagination span {
  font-size: 14px;
  margin: 0 16px;
  background-color: #1890FF;
  color: white;
  width: 32px;
  height: 32px;
  display: flex;
  align-items: center;
  justify-content: center;
  border-radius: 4px;
 }
 .pagination-btn {
@@ -957,7 +879,8 @@ input:disabled {
  .data-table {
    font-size: 12px;
-    min-width: 600px; /* 确保表格在小屏幕上可以横向滚动 */
+    border-collapse: collapse;
    min-width: 768px; /* 确保表格在小屏幕上可以横向滚动 */
  }
  .data-table th,
@@ -984,7 +907,16 @@ input:disabled {
 /* 平滑过渡效果 */
 .btn,
 .pagination-btn,
-.editing-row {
+.editing-row,
 tr {
  transition: all 0.3s ease;
 }
 /* 删除行渐隐效果 */
 .deleting-row {
  opacity: 0;
  height: 0;
  overflow: hidden;
  transition: all 0.3s ease;
 }
Author	SHA1	Message	Date
玉狻猊	700e353b79	测试合并v4	2026-01-15 16:42:56 +08:00
玉狻猊	0b2c19d2c5	测试合并v3	2026-01-15 15:54:22 +08:00
wangyizhe	47394de43c	Merge pull request 'document' (#2 ) from document into develop Reviewed-on: #2	2026-01-15 07:37:39 +00:00
玉狻猊	f0f1dde6b6	测试合并	2026-01-15 07:37:39 +00:00
玉狻猊	1ab1165697	测试合并	2026-01-15 07:37:39 +00:00
chenqi	a8f1b1fdfa	feat(doctorstation): 添加医嘱类型对应的药品分类筛选功能 - 在处方列表组件中根据医嘱类型自动设置categoryCode筛选条件 - 为西药类型设置categoryCode为'2' - 为中成药类型设置categoryCode为'1' - 为耗材和诊疗类型清空categoryCode筛选条件 - 更新基础医嘱列表组件以接收并应用categoryCode查询参数 - 实现医嘱类型改变时的联动筛选逻辑	2026-01-15 15:34:34 +08:00
chenqi	3b94d19199	Merge remote-tracking branch 'origin/develop' into develop	2026-01-15 15:13:20 +08:00
chenqi	db1139a14f	fix(prescription): 解决处方列表中价格显示的空值异常问题 - 在处方列表组件中添加对unitPrice和totalPrice的空值检查，防止NaN显示 - 优化价格计算逻辑，确保无效价格值被正确处理并显示为默认值 - 更新数据库查询中的条件判断，改进UNION查询的逻辑结构 - 添加对adviceTypes参数的有效性验证，确保查询条件的正确执行	2026-01-15 15:13:09 +08:00
chenjinyang	bea74aeac2	使用element-plus进行提示替换HTML原生弹窗	2026-01-15 15:01:05 +08:00
chenjinyang	634a1f45f9	根据LIS分组开发手册完成功能	2026-01-15 14:36:54 +08:00