提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -1,10 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <el-dialog v-model="dialogVisible" title="补费" width="90%" :close-on-click-modal="false">
-    <!-- 弹窗内容 - 左右布局 -->
-    <div style="display: flex; gap: 20px; height: 70vh">
-      <!-- 左侧：收费组套列表 - 卡片式布局 -->
-=======
  <el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
    <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px">
      患者信息：{{
@@ -50,7 +44,6 @@
    </div>
    <!-- 弹窗内容 - 左右布局 -->
    <div style="display: flex; gap: 20px; height: 70vh">
->>>>>>> v1.3
      <div
        style="
          width: 250px;
@@ -60,27 +53,6 @@
          flex-direction: column;
        "
      >
-<<<<<<< HEAD
-        <!-- 搜索框 -->
-        <div style="padding: 10px; border-bottom: 1px solid #e4e7ed">
-          <el-input v-model="groupSearchText" placeholder="输入组套名称" clearable />
-        </div>
-        <!-- 收费组套列表 - 卡片式布局 -->
-        <div style="flex: 1; overflow-y: auto; padding: 10px">
-          <div
-            v-for="group in chargeGroups"
-            :key="group.id"
-            class="group-card"
-            @click="selectChargeGroup(group)"
-          >
-            <div class="group-status">
-              <span class="status-dot"></span>
-              {{ getGroupType(group.name) }}
-            </div>
-            <div class="group-name">{{ group.name }}</div>
-            <div class="group-info">
-              {{ getGroupInfo(group.id) }}
-=======
        <!-- 诊疗耗材 -->
        <div
          style="flex: 1; overflow-y: auto; padding: 10px; min-height: 200px"
@@ -112,16 +84,11 @@
            <div class="item-name" v-if="item.adviceType === 2">
              库存数量：
              {{ handleQuantity(item) }}
->>>>>>> v1.3
            </div>
          </div>
          <!-- 只显示暂无数据文本 -->
          <div
-<<<<<<< HEAD
-            v-if="chargeGroups.length === 0"
-=======
            v-if="AdviceBaseInfoList.length === 0"
->>>>>>> v1.3
            style="text-align: center; color: #909399; padding: 20px"
          >
            暂无数据
@@ -134,17 +101,6 @@
        <!-- 费用项目表格 -->
        <el-table :data="feeItemsList" border style="width: 100%; flex: 1">
          <el-table-column label="收费项目" prop="itemName" min-width="200">
-<<<<<<< HEAD
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.itemName"
-                placeholder="请输入收费项目"
-                style="width: 100%"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="单价" prop="unitPrice" width="100" align="center">
-=======
            <!-- <template #default="scope">
              <el-input
                v-model="scope.row.adviceName"
@@ -161,53 +117,23 @@
          </el-table-column>
          <!-- 单价 - 简化版 -->
          <el-table-column label="单价" width="200" align="center">
->>>>>>> v1.3
            <template #default="scope">
              <el-input-number
                v-model="scope.row.unitPrice"
                :min="0"
                :step="0.01"
-<<<<<<< HEAD
-                precision="2"
-                style="width: 100px"
-                @change="calculateTotalAmount"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="计费数量" prop="quantity" width="100" align="center">
-=======
                precision="6"
                style="width: 150px"
              />
            </template>
          </el-table-column>
          <el-table-column label="计费数量" prop="quantity" width="150" align="center">
->>>>>>> v1.3
            <template #default="scope">
              <el-input-number
                v-model="scope.row.quantity"
                :min="1"
                :step="1"
                style="width: 100px"
-<<<<<<< HEAD
-                @change="calculateTotalAmount"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="金额" prop="amount" width="100" align="center" />
-          <el-table-column label="医保类型" prop="insuranceType" width="100" align="center">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.insuranceType"
-                placeholder="医保类型"
-                style="width: 100px"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="特限符合" prop="special" width="100" align="center">
-            <template #default="scope">
-              <el-switch v-model="scope.row.special" />
-=======
              />
            </template>
          </el-table-column>
@@ -283,31 +209,10 @@
              <el-button type="text" size="small" @click="feeItemsList.splice(scope.$index, 1)">
                删除
              </el-button>
->>>>>>> v1.3
            </template>
          </el-table-column>
        </el-table>

-<<<<<<< HEAD
-        <!-- 添加项目按钮 - 移到右侧费用项目表格下方 -->
-        <div
-          style="
-            margin-top: 10px;
-            padding: 15px;
-            border: 1px dashed #dcdfe6;
-            border-radius: 4px;
-            text-align: center;
-            cursor: pointer;
-            color: #409eff;
-            transition: all 0.3s;
-          "
-          @click="addEmptyItem"
-        >
-          + 添加项目
-        </div>
-
-=======
->>>>>>> v1.3
        <!-- 底部信息区域 -->
        <div style="margin-top: 20px; display: flex; flex-wrap: wrap; gap: 15px">
          <div style="display: flex; align-items: center">
@@ -321,42 +226,7 @@
              style="width: 200px"
            />
          </div>
-<<<<<<< HEAD
-
-          <div style="display: flex; align-items: center">
-            <span style="margin-right: 8px">执行科室：</span>
-            <el-select v-model="selectedDept" placeholder="选择科室" style="width: 150px">
-              <el-option
-                v-for="dept in departmentOptions"
-                :key="dept.value"
-                :label="dept.label"
-                :value="dept.value"
-              />
-            </el-select>
-          </div>
-
-          <div style="display: flex; align-items: center">
-            <span style="margin-right: 8px">开方医生：</span>
-            <el-select v-model="selectedDoctor" placeholder="选择医生" style="width: 150px">
-              <el-option label="内科医生" value="doctor1" />
-              <el-option label="外科医生" value="doctor2" />
-              <el-option label="儿科医生" value="doctor3" />
-            </el-select>
-          </div>
-
-          <div style="display: flex; align-items: center">
-            <span style="margin-right: 8px">执行人：</span>
-            <el-select v-model="executor" placeholder="选择执行人" style="width: 150px">
-              <el-option label="系统管理员" value="admin" />
-              <el-option label="护士甲" value="nurse1" />
-              <el-option label="护士乙" value="nurse2" />
-            </el-select>
-          </div>
        </div>
-
-=======
-        </div>
->>>>>>> v1.3
        <!-- 总金额和操作按钮 -->
        <div
          style="
@@ -367,11 +237,7 @@
          "
        >
          <div style="font-size: 14px; font-weight: bold; text-align: right">
-<<<<<<< HEAD
-            本次补费总金额：<span style="color: #ff4d4f">{{ totalAmount.toFixed(2) }}</span>
-=======
            本次补费总金额：<span style="color: #ff4d4f">{{ totalAmount.toFixed(6) }}</span>
->>>>>>> v1.3
          </div>
          <div>
            <el-button @click="handleCancel">取消</el-button>
@@ -384,11 +250,6 @@
 </template>

 <script setup>
-<<<<<<< HEAD
-import { ref, computed, onMounted, watch } from 'vue';
-import { ElMessage } from 'element-plus';
-import { formatDateStr } from '@/utils/index';
-=======
 import { ref, computed, onMounted, watch, reactive } from 'vue';
 import { ElMessage } from 'element-plus';
 import { formatDateStr } from '@/utils/index';
@@ -396,7 +257,6 @@ import { getAdviceBaseInfo, getOrgList, getDiseaseTreatmentInitLoc } from './api
 import useUserStore from '@/store/modules/user';
 import { get } from 'lodash';
 import { lo } from 'element-plus/es/locales.mjs';
->>>>>>> v1.3

 // Props定义
 const props = defineProps({
@@ -409,13 +269,8 @@ const props = defineProps({
    default: () => [],
  },
  patientInfo: {
-<<<<<<< HEAD
-    type: String,
-    default: '',
-=======
    type: Object, // 通常这类信息是对象，这里假设你已经修正了类型
    default: () => ({}),
->>>>>>> v1.3
  },
 });

@@ -427,25 +282,6 @@ const dialogVisible = computed({
  get: () => props.visible,
  set: (value) => emit('update:visible', value),
 });
-<<<<<<< HEAD
-const searchItemText = ref('');
-const selectedItemName = ref('');
-const feeTabs = ref('chargeItems');
-const feeItemsList = ref([]);
-const executeTime = ref('');
-const selectedDept = ref('');
-const selectedDoctor = ref('');
-const executor = ref('');
-const departmentOptions = ref([]);
-// 收费组套相关数据
-const chargeGroups = ref([]);
-const groupSearchText = ref('');
-
-// 计算总金额
-const totalAmount = computed(() => {
-  return feeItemsList.value.reduce((sum, item) => {
-    return sum + (item.unitPrice || 0) * (item.quantity || 0);
-=======
 const adviceTypeList = ref([
  { label: '耗材', value: 2 },
  { label: '诊疗', value: 3 },
@@ -543,31 +379,11 @@ const totalAmount = computed(() => {
    const price = Number(item.unitPrice) || 0;
    const quantity = Number(item.quantity) || 0;
    return sum + price * quantity;
->>>>>>> v1.3
  }, 0);
 });

 // 初始化
 onMounted(() => {
-<<<<<<< HEAD
-  // 加载科室选项
-  loadDepartmentOptions();
-  // 加载收费组套数据
-  loadChargeGroups();
-});
-
-// 监听初始数据变化
-watch(
-  () => props.initialData,
-  (newData) => {
-    if (newData && newData.length > 0) {
-      initFeeDialogData(newData);
-    }
-  },
-  { deep: true }
-);
-
-=======
  const userStore = useUserStore();
  userId.value = userStore.id;
  orgId.value = userStore.orgId;
@@ -578,21 +394,13 @@ watch(
  getDiseaseInitLoc();
 });

->>>>>>> v1.3
 // 监听弹窗显示状态
 watch(
  () => props.visible,
  (visible) => {
    if (visible) {
-<<<<<<< HEAD
-      // 设置默认执行时间为当前时间
      executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
    } else {
-      // 弹窗关闭时重置数据
-=======
-      executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
-    } else {
->>>>>>> v1.3
      resetData();
    }
  }
@@ -600,153 +408,6 @@ watch(

 // 加载科室选项
 function loadDepartmentOptions() {
-<<<<<<< HEAD
-  // 模拟科室数据
-  departmentOptions.value = [
-    { label: '内科', value: 'internal' },
-    { label: '外科', value: 'surgery' },
-    { label: '儿科', value: 'pediatrics' },
-    { label: '妇产科', value: 'obstetrics' },
-    { label: '其他科室', value: 'others' },
-  ];
-}
-
-// 加载收费组套数据
-function loadChargeGroups() {
-  // 模拟收费组套数据
-  chargeGroups.value = [
-    { id: '1', name: '血常规检查组套' },
-    { id: '2', name: '生化检查组套' },
-    { id: '3', name: '心电图检查组套' },
-    { id: '4', name: 'CT检查组套' },
-    { id: '5', name: '输液治疗组套' },
-  ];
-}
-
-// 获取组套类型
-function getGroupType(name) {
-  if (name.includes('检查')) return '检查';
-  if (name.includes('治疗')) return '治疗';
-  return '常规';
-}
-
-// 获取组套信息
-function getGroupInfo(id) {
-  const infoMap = {
-    1: '检验科/基础检查',
-    2: '检验科/生化项目',
-    3: '心电图室/常规检查',
-    4: '影像科/影像学检查',
-    5: '内科/治疗项目',
-  };
-  return infoMap[id] || '标准收费项目';
-}
-
-// 初始化费用数据
-function initFeeDialogData(selectedRows) {
-  // 将选中的项目转换为弹窗中的费用项目格式
-  feeItemsList.value = selectedRows.map((row) => ({
-    itemName: row.chargeItem,
-    unitPrice: row.unitPrice,
-    quantity: row.quantity,
-    amount: row.unitPrice * row.quantity,
-    dept: '内科',
-    special: false,
-    insuranceType: '',
-  }));
-}
-
-// 选择收费组套
-function selectChargeGroup(group) {
-  // 模拟根据选中的组套添加对应的费用项目
-  const groupItems = {
-    1: [
-      {
-        itemName: '红细胞计数',
-        unitPrice: 15.0,
-        quantity: 1,
-        dept: '检验科',
-        special: false,
-        insuranceType: '甲类',
-      },
-    ],
-    2: [
-      {
-        itemName: '肝功能检查',
-        unitPrice: 80.0,
-        quantity: 1,
-        dept: '检验科',
-        special: false,
-        insuranceType: '甲类',
-      },
-    ],
-    3: [
-      {
-        itemName: '心电图检查',
-        unitPrice: 45.0,
-        quantity: 1,
-        dept: '心电图室',
-        special: false,
-        insuranceType: '甲类',
-      },
-    ],
-    4: [
-      {
-        itemName: 'CT扫描',
-        unitPrice: 300.0,
-        quantity: 1,
-        dept: '影像科',
-        special: false,
-        insuranceType: '乙类',
-      },
-    ],
-    5: [
-      {
-        itemName: '静脉输液',
-        unitPrice: 20.0,
-        quantity: 1,
-        dept: '内科',
-        special: false,
-        insuranceType: '甲类',
-      },
-    ],
-  };
-
-  const items = groupItems[group.id] || [];
-  // 计算金额
-  items.forEach((item) => {
-    item.amount = item.unitPrice * item.quantity;
-  });
-
-  // 添加到费用项目列表
-  feeItemsList.value = [...feeItemsList.value, ...items];
-}
-
-// 添加空白项目
-function addEmptyItem() {
-  const newItem = {
-    itemName: '', // 空白项目名称
-    unitPrice: 0, // 默认单价为0
-    quantity: 1, // 默认数量为1
-    amount: 0, // 默认金额为0
-    dept: '内科', // 默认科室
-    special: false, // 默认特限不符合
-    insuranceType: '', // 空白医保类型
-  };
-
-  // 添加到费用项目列表
-  feeItemsList.value.push(newItem);
-
-  // 显示提示信息
-  ElMessage.success('已添加空白项目，请填写相关信息');
-}
-
-// 计算总金额（当数量变化时调用）
-function calculateTotalAmount() {
-  // 更新每个项目的金额
-  feeItemsList.value.forEach((item) => {
-    item.amount = (item.unitPrice || 0) * (item.quantity || 0);
-=======
  getOrgList().then((res) => {
    if (res.data && res.data.records && res.data.records.length > 0) {
      departmentOptions.value = res.data.records[0].children || [];
@@ -858,7 +519,6 @@ function selectChange(row) {
    quantity: 1,
    // positionId: row.positionId === null || row.positionId === undefined ? orgId : row.positionId, // 默认执行科室
    selectUnitCode: row.minUnitCode, // 默认选择小单位
->>>>>>> v1.3
  });
 }

@@ -870,30 +530,6 @@ function handleCancel() {

 // 确认操作
 function handleConfirm() {
-<<<<<<< HEAD
-  // 构建提交数据
-  const submitData = {
-    feeItems: feeItemsList.value,
-    executeTime: executeTime.value,
-    department: selectedDept.value,
-    doctor: selectedDoctor.value,
-    executor: executor.value,
-    totalAmount: totalAmount.value,
-  };
-
-  // 发送确认事件
-  emit('confirm', submitData);
-  dialogVisible.value = false;
-}
-
-// 重置数据
-function resetData() {
-  feeItemsList.value = [];
-  executeTime.value = '';
-  selectedDept.value = '';
-  selectedDoctor.value = '';
-  executor.value = '';
-=======
  if (feeItemsList.value.length === 0) {
    ElMessage.warning('请至少添加一项费用项目');
    return;
@@ -995,7 +631,6 @@ function resetData() {
  adviceType.value = '';
  searchText.value = '';
  executeTime.value = '';
->>>>>>> v1.3
 }
 </script>

@@ -1003,20 +638,7 @@ function resetData() {
 :deep(.el-dialog__body) {
  padding: 20px;
 }
-<<<<<<< HEAD
-
-/* 添加项目按钮样式 */
-:deep(
-    .el-dialog div[style*='flex: 1; display: flex; flex-direction: column'] > div:nth-child(2):hover
-  ) {
-  background-color: #ecf5ff;
-}
-
-/* 收费组套卡片样式 */
-.group-card {
-=======
 .item-card {
->>>>>>> v1.3
  background: #ffffff;
  border: 1px solid #e4e7ed;
  border-radius: 6px;
@@ -1026,22 +648,12 @@ function resetData() {
  transition: all 0.3s ease;
  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
-<<<<<<< HEAD
-
-.group-card:hover {
-=======
 .item-card:hover {
->>>>>>> v1.3
  border-color: #409eff;
  background-color: #ecf5ff;
  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
 }
-<<<<<<< HEAD
-
-.group-status {
-=======
 .item-status {
->>>>>>> v1.3
  display: flex;
  align-items: center;
  margin-bottom: 8px;
@@ -1049,10 +661,6 @@ function resetData() {
  font-weight: 500;
  color: #606266;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> v1.3
 .status-dot {
  width: 8px;
  height: 8px;
@@ -1060,28 +668,11 @@ function resetData() {
  border-radius: 50%;
  margin-right: 6px;
 }
-<<<<<<< HEAD
-
-.group-name {
-=======
 .item-name {
->>>>>>> v1.3
  font-size: 16px;
  font-weight: 600;
  color: #303133;
  margin-bottom: 8px;
  word-break: break-word;
 }
-<<<<<<< HEAD
-
-.group-info {
-  font-size: 12px;
-  color: #909399;
-  border-top: 1px dashed #ebeef5;
-  padding-top: 8px;
-  margin-top: 4px;
-}
 </style>
-=======
-</style>
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/OrderBilling.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/OrderBilling.vue
@@ -213,11 +213,7 @@
 <script setup>
 import { ref, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
-<<<<<<< HEAD
-import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
->>>>>>> v1.3
 import { formatDateStr } from '@/utils/index';

 // 响应式数据
@@ -453,11 +449,7 @@ function filterFeeList() {
 // 查询按钮点击
 function handleQuery() {
  if (patientInfoList.value.length === 0) {
-<<<<<<< HEAD
-    ElMessage.warning('请先选择患者');
-=======
    // ElMessage.warning('请先选择患者');
->>>>>>> v1.3
    return;
  }

--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import request from '@/utils/request'
-=======
 import request from '@/utils/request';
->>>>>>> v1.3

 /**
 * 获取住院患者列表
@@ -11,13 +7,8 @@ export function getPatientList(queryParams) {
  return request({
    url: '/nurse-station/advice-process/inpatient',
    method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-=======
    params: queryParams,
  });
->>>>>>> v1.3
 }

 /**
@@ -27,12 +18,6 @@ export function getWardList(queryParams) {
  return request({
    url: '/app-common/practitioner-ward',
    method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-}
-
-=======
    params: queryParams,
  });
 }
@@ -45,7 +30,6 @@ export function getOrgList() {
    method: 'get',
  });
 }
->>>>>>> v1.3
 /**
 * 获取当前选中患者全部医嘱
 */
@@ -53,13 +37,8 @@ export function getPrescriptionList(queryParams) {
  return request({
    url: '/nurse-station/advice-process/inpatient-advice',
    method: 'get',
-<<<<<<< HEAD
-    params: queryParams
-  })
-=======
    params: queryParams,
  });
->>>>>>> v1.3
 }

 /**
@@ -69,13 +48,8 @@ export function adviceExecute(data) {
  return request({
    url: '/nurse-station/advice-process/advice-execute',
    method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
    data: data,
  });
->>>>>>> v1.3
 }

 /**
@@ -85,11 +59,6 @@ export function adviceCancel(data) {
  return request({
    url: '/nurse-station/advice-process/advice-cancel',
    method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-}
-=======
    data: data,
  });
 }
@@ -149,4 +118,3 @@ export function getCostDetail(queryParams) {
    params: queryParams,
  });
 }
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/billingList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/billingList.vue
@@ -1,9 +1,5 @@
 <template>
-<<<<<<< HEAD
-  <div style="height: calc(100vh - 126px)">
-=======
  <div style="height: calc(100vh - 126px); display: flex; flex-direction: column">
->>>>>>> v1.3
    <!-- 操作工具栏 -->
    <div
      style="
@@ -13,10 +9,7 @@
        align-items: center;
        justify-content: space-between;
        padding: 0 15px;
-<<<<<<< HEAD
-=======
        flex-shrink: 0;
->>>>>>> v1.3
      "
    >
      <div style="display: flex; align-items: center">
@@ -30,11 +23,7 @@
        >
          <el-tab-pane label="今日" name="today"></el-tab-pane>
          <el-tab-pane label="昨日" name="yesterday"></el-tab-pane>
-<<<<<<< HEAD
-          <el-tab-pane label="其他" name="other"></el-tab-pane>
-=======
          <el-tab-pane label="自定义" name="custom"></el-tab-pane>
->>>>>>> v1.3
        </el-tabs>

        <!-- 日期选择器 -->
@@ -47,99 +36,15 @@
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @change="handleDatePickerChange"
-<<<<<<< HEAD
-          style="width: 240px; margin-right: 20px"
-        />
-
-        <!-- 执行科室选择 -->
-        <el-select
-          v-model="execDepartment"
-          placeholder="请选择执行科室"
-          clearable
-          style="width: 150px; margin-right: 20px"
-        >
-          <el-option
-            v-for="dept in departmentOptions"
-            :key="dept.value"
-            :label="dept.label"
-            :value="dept.value"
-          />
-        </el-select>
-
-=======
          :disabled="dateRange !== 'custom'"
          style="width: 240px; margin-right: 20px"
        />

->>>>>>> v1.3
        <!-- 查询按钮 -->
        <el-button type="primary" @click="handleQuery">查询</el-button>
      </div>

      <div style="display: flex; align-items: center">
-<<<<<<< HEAD
-        <!-- 全选开关 -->
-        <div style="display: flex; align-items: center; margin-right: 20px">
-          <span style="margin-right: 8px">全选：</span>
-          <el-switch v-model="selectAll" @change="handleSelectAll" />
-        </div>
-
-        <!-- 计费按钮 -->
-        <el-button type="primary" @click="handleCalculate">计费</el-button>
-
-        <!-- 批量划价按钮 -->
-        <el-button type="primary" plain @click="handleBatchPrice" style="margin-left: 20px"
-          >批量划价</el-button
-        >
-      </div>
-    </div>
-
-    <!-- 费用列表区域 -->
-    <div
-      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
-      v-loading="loading"
-    >
-      <el-table
-        ref="tableRef"
-        :data="billingList"
-        border
-        style="width: 100%"
-        :header-cell-style="{ background: '#eef9fd !important' }"
-      >
-        <el-table-column type="selection" align="center" width="50" />
-        <el-table-column label="医嘱内容" prop="orderContent" min-width="200" />
-        <el-table-column label="应执行日期" prop="executeDate" width="120" align="center" />
-        <el-table-column label="执行收费项目" prop="chargeItem" min-width="180" />
-        <el-table-column label="单价" prop="unitPrice" width="100" align="center">
-          <template #default="scope">
-            <el-input-number
-              v-model="scope.row.unitPrice"
-              :min="0"
-              :step="0.01"
-              style="width: 100px"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="使用数量" prop="quantity" width="100" align="center">
-          <template #default="scope">
-            <el-input-number v-model="scope.row.quantity" :min="1" :step="1" style="width: 100px" />
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="100" align="center">
-          <template #default="scope">
-            <!-- <el-button type="primary" size="small" @click="handlePrice(scope.row)">划价</el-button> -->
-
-            <el-button type="primary" size="small" @click="handleDelete(scope.row)">撤销</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 无数据提示 -->
-      <el-empty v-if="!loading && billingList.length === 0" description="暂无数据" />
-    </div>
-
-    <!-- 使用计费弹窗组件 -->
-=======
        <!-- 新增划价 -->
        <el-button type="primary" @click="handAddBilling">新增划价</el-button>
      </div>
@@ -346,7 +251,6 @@
    </div>

    <!-- 计费弹窗 -->
->>>>>>> v1.3
    <FeeDialog
      v-model:visible="dialogVisible"
      :initial-data="selectedFeeItems"
@@ -358,243 +262,6 @@
 </template>

 <script setup>
-<<<<<<< HEAD
-import { ref, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
-import { formatDateStr } from '@/utils/index';
-import FeeDialog from './FeeDialog.vue';
-
-// 响应式数据
-const loading = ref(false);
-const billingList = ref([]);
-const dateRange = ref('today'); // today, yesterday, other
-const dateRangeValue = ref([]);
-const execDepartment = ref('');
-const selectAll = ref(false);
-const departmentOptions = ref([]);
-const tableRef = ref(null);
-
-// 计费弹窗相关数据
-const dialogVisible = ref(false);
-const selectedFeeItems = ref([]);
-const currentPatientInfo = ref('');
-
-// 初始化
-onMounted(() => {
-  // 设置默认日期
-  const today = new Date();
-  dateRangeValue.value = [formatDateStr(today, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
-
-  // 加载科室选项
-  loadDepartmentOptions();
-});
-
-// 加载科室选项
-function loadDepartmentOptions() {
-  // 模拟科室数据
-  departmentOptions.value = [
-    { label: '内科', value: 'internal' },
-    { label: '外科', value: 'surgery' },
-    { label: '儿科', value: 'pediatrics' },
-    { label: '妇产科', value: 'obstetrics' },
-    { label: '其他科室', value: 'others' },
-  ];
-}
-
-// 处理日期tabs点击
-function handleDateTabClick(tab) {
-  const rangeType = tab.paneName;
-  const today = new Date();
-  const yesterday = new Date();
-  yesterday.setDate(today.getDate() - 1);
-
-  switch (rangeType) {
-    case 'today':
-      dateRangeValue.value = [
-        formatDateStr(today, 'YYYY-MM-DD'),
-        formatDateStr(today, 'YYYY-MM-DD'),
-      ];
-      break;
-    case 'yesterday':
-      dateRangeValue.value = [
-        formatDateStr(yesterday, 'YYYY-MM-DD'),
-        formatDateStr(yesterday, 'YYYY-MM-DD'),
-      ];
-      break;
-    // other 情况保持用户选择的值
-  }
-}
-
-// 处理日期选择器变化
-function handleDatePickerChange() {
-  if (dateRangeValue.value.length > 0) {
-    dateRange.value = 'other';
-  }
-}
-
-// 生成模拟数据
-function generateMockData() {
-  const mockData = [
-    {
-      orderContent: '血常规检查',
-      executeDate: dateRangeValue.value[0],
-      chargeItem: '血液分析',
-      unitPrice: 35.0,
-      quantity: 1,
-      id: '1',
-    },
-    {
-      orderContent: '静脉注射',
-      executeDate: dateRangeValue.value[0],
-      chargeItem: '静脉输液',
-      unitPrice: 20.0,
-      quantity: 2,
-      id: '2',
-    },
-    {
-      orderContent: 'CT检查',
-      executeDate: dateRangeValue.value[0],
-      chargeItem: '胸部CT平扫',
-      unitPrice: 320.0,
-      quantity: 1,
-      id: '3',
-    },
-    {
-      orderContent: '药物治疗',
-      executeDate: dateRangeValue.value[0],
-      chargeItem: '抗生素注射',
-      unitPrice: 58.5,
-      quantity: 1,
-      id: '4',
-    },
-  ];
-
-  // 根据科室筛选模拟数据
-  if (execDepartment.value) {
-    // 模拟根据科室筛选
-    return mockData.filter((_, index) => index % 2 === 0);
-  }
-
-  return mockData;
-}
-
-// 查询按钮点击
-function handleQuery() {
-  if (patientInfoList.value.length === 0) {
-    ElMessage.warning('请先选择患者');
-    return;
-  }
-
-  loading.value = true;
-
-  // 模拟API调用延迟
-  setTimeout(() => {
-    // 使用模拟数据
-    billingList.value = generateMockData();
-    loading.value = false;
-  }, 500);
-}
-
-// 全选/取消全选
-function handleSelectAll(value) {
-  selectAll.value = value;
-  if (tableRef.value) {
-    if (value) {
-      tableRef.value.toggleAllSelection();
-    } else {
-      // 取消全选
-      tableRef.value.clearSelection();
-    }
-  }
-}
-
-// 打开计费弹窗
-function handleCalculate() {
-  // 获取选中的数据
-  const selectedRows = getSelectedRows();
-  // if (selectedRows.length === 0) {
-  //   ElMessage.warning('请先选择要计费的项目');
-  //   return;
-  // }
-
-  // 设置弹窗初始数据
-  selectedFeeItems.value = [...selectedRows];
-
-  // 设置患者信息
-  if (patientInfoList.value.length > 0) {
-    const patient = patientInfoList.value[0];
-    currentPatientInfo.value = `${patient.patientName || '未知患者'}`;
-  }
-
-  // 显示弹窗
-  dialogVisible.value = true;
-}
-
-// 处理计费弹窗确认
-function handleFeeDialogConfirm(data) {
-  // 模拟计费操作
-  setTimeout(() => {
-    ElMessage.success('计费成功');
-    // 刷新数据
-    handleQuery();
-  }, 300);
-}
-
-// 处理计费弹窗取消
-function handleFeeDialogCancel() {
-  // 可以在这里添加取消后的处理逻辑
-}
-
-// 批量划价
-function handleBatchPrice() {
-  // 获取选中的数据
-  const selectedRows = getSelectedRows();
-  if (selectedRows.length === 0) {
-    ElMessage.warning('请先选择要划价的项目');
-    return;
-  }
-
-  // 模拟批量划价操作
-  setTimeout(() => {
-    ElMessage.success(`批量划价成功，共${selectedRows.length}项`);
-    // 更新状态，模拟已划价
-    selectedRows.forEach((row) => {
-      row.status = 'priced';
-    });
-  }, 300);
-}
-
-// 单项划价
-function handlePrice(row) {
-  // 模拟单项划价操作
-  setTimeout(() => {
-    ElMessage.success('划价成功');
-    // 更新状态，模拟已划价
-    row.status = 'priced';
-  }, 300);
-}
-function handleDelete(row) {
-  // 从数据列表中删除当前行
-  const index = billingList.value.findIndex((item) => item.id === row.id);
-  if (index !== -1) {
-    billingList.value.splice(index, 1);
-    ElMessage.success('撤销成功');
-  }
-}
-
-// 获取选中的行
-function getSelectedRows() {
-  if (tableRef.value) {
-    return tableRef.value.selection || [];
-  }
-  return [];
-}
-
-// 暴露方法供父组件调用
-defineExpose({
-  handleQuery,
-=======
 import { ref, onMounted, computed, nextTick, watch } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 // Element Plus 图标导入
@@ -1065,30 +732,10 @@ onMounted(() => {

  // 初始化统计信息
  calculateTotalStats.value;
->>>>>>> v1.3
 });
 </script>

 <style scoped>
-<<<<<<< HEAD
-/* 日期tabs样式 */
-.date-tabs .el-tabs__header {
-  margin-bottom: 0;
-}
-
-.date-tabs .el-tabs__content {
-  display: none;
-}
-
-:deep(.el-table__header th) {
-  background-color: #eef9fd !important;
-}
-
-:deep(.el-table__row:hover > td) {
-  background-color: #eef9fd !important;
-}
-</style>
-=======
 /* 基础样式 */
 .font-bold {
  font-weight: 600;
@@ -1270,4 +917,3 @@ onMounted(() => {
  text-overflow: ellipsis;
 }
 </style>
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue
@@ -170,11 +170,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
-<<<<<<< HEAD
-import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
->>>>>>> v1.3
 import { getSinglePatient } from '../store/patient.js'; // 导入获取单选患者信息的方法
 import { formatDateStr } from '@/utils/index';

--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/feeDetailQuery.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/feeDetailQuery.vue
@@ -22,11 +22,7 @@
        >
          <el-tab-pane label="今日" name="today"></el-tab-pane>
          <el-tab-pane label="昨日" name="yesterday"></el-tab-pane>
-<<<<<<< HEAD
-          <el-tab-pane label="其他" name="other"></el-tab-pane>
-=======
          <!-- <el-tab-pane label="其他" name="other"></el-tab-pane> -->
->>>>>>> v1.3
        </el-tabs>

        <!-- 日期选择器 -->
@@ -44,21 +40,13 @@

        <!-- 费用类型选择 -->
        <el-select
-<<<<<<< HEAD
-          v-model="feeType"
-=======
          v-model="formParams.chargeItemEnum"
->>>>>>> v1.3
          placeholder="请选择费用类型"
          clearable
          style="width: 150px; margin-right: 20px"
        >
          <el-option
-<<<<<<< HEAD
-            v-for="type in feeTypeOptions"
-=======
            v-for="type in med_chrgitm_type"
->>>>>>> v1.3
            :key="type.value"
            :label="type.label"
            :value="type.value"
@@ -67,35 +55,21 @@

        <!-- 执行科室选择 -->
        <el-select
-<<<<<<< HEAD
-          v-model="execDepartment"
-=======
          v-model="formParams.orgId"
->>>>>>> v1.3
          placeholder="请选择执行科室"
          clearable
          style="width: 150px; margin-right: 20px"
        >
          <el-option
-<<<<<<< HEAD
-            v-for="dept in departmentOptions"
-            :key="dept.value"
-            :label="dept.label"
-            :value="dept.value"
-=======
            v-for="dept in orgOptions"
            :key="dept.id"
            :label="dept.name"
            :value="dept.id"
->>>>>>> v1.3
          />
        </el-select>

        <!-- 查询按钮 -->
-<<<<<<< HEAD
-=======
        <el-button type="primary" @click="onReset">重置</el-button>
->>>>>>> v1.3
        <el-button type="primary" @click="handleQuery">查询</el-button>
      </div>

@@ -104,11 +78,7 @@
        <el-button @click="handleExport">导出</el-button>

        <!-- 打印按钮 -->
-<<<<<<< HEAD
-        <el-button @click="handlePrint" style="margin-left: 15px">打印</el-button>
-=======
        <!-- <el-button @click="handlePrint" style="margin-left: 15px">打印</el-button> -->
->>>>>>> v1.3
      </div>
    </div>

@@ -118,19 +88,6 @@
      v-loading="loading"
    >
      <!-- 费用汇总信息 -->
-<<<<<<< HEAD
-      <div style="background-color: white; padding: 15px; margin-bottom: 10px; border-radius: 4px;">
-        <div style="display: flex; justify-content: space-between; align-items: center">
-          <div>
-            <h3 style="margin: 0; font-weight: normal; color: #303133;">费用汇总</h3>
-            <p style="margin: 5px 0; color: #606266; font-size: 14px;">费用周期：{{ formatDateRange() }}</p>
-          </div>
-          <div style="text-align: right;">
-            <p style="margin: 0; font-size: 18px; font-weight: bold; color: #ff4d4f;">
-              合计金额：¥{{ totalAmount.toFixed(2) }}
-            </p>
-            <p style="margin: 5px 0; color: #606266; font-size: 14px;">明细项数：{{ feeDetailList.length }}项</p>
-=======
      <div style="background-color: white; padding: 15px; margin-bottom: 10px; border-radius: 4px">
        <div style="display: flex; justify-content: space-between; align-items: center">
          <div>
@@ -146,7 +103,6 @@
            <p style="margin: 5px 0; color: #606266; font-size: 14px">
              明细项数：{{ feeDetailList.length }}项
            </p>
->>>>>>> v1.3
          </div>
        </div>
      </div>
@@ -156,28 +112,6 @@
        :data="feeDetailList"
        border
        style="width: 100%"
-<<<<<<< HEAD
-        :header-cell-style="{ background: '#eef9fd !important' }"
-        @sort-change="handleSortChange"
-      >
-        <el-table-column label="项目名称" prop="itemName" min-width="200" />
-        <el-table-column label="费用类型" prop="feeTypeName" width="120" align="center" />
-        <el-table-column label="单价" prop="unitPrice" width="100" align="center" sortable />
-        <el-table-column label="数量" prop="quantity" width="100" align="center" sortable />
-        <el-table-column label="金额" prop="amount" width="100" align="center" sortable>
-          <template #default="scope">
-            <span style="color: #ff4d4f">{{ scope.row.amount.toFixed(2) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="执行科室" prop="execDept" width="120" align="center" />
-        <el-table-column label="执行人" prop="executor" width="100" align="center" />
-        <el-table-column label="执行日期" prop="executeDate" width="120" align="center" />
-        <el-table-column label="医保类型" prop="insuranceType" width="100" align="center">
-          <template #default="scope">
-            <el-tag v-if="scope.row.insuranceType" size="small">{{ scope.row.insuranceType }}</el-tag>
-          </template>
-        </el-table-column>
-=======
        max-height="400px"
        :header-cell-style="{ background: '#eef9fd !important' }"
        @sort-change="handleSortChange"
@@ -211,22 +145,14 @@

        <el-table-column label="医保类型" prop="chrgitmLv_enumText" width="100" align="center">
        </el-table-column>
->>>>>>> v1.3
        <el-table-column label="备注" prop="remark" min-width="150" />
      </el-table>

      <!-- 分页 -->
-<<<<<<< HEAD
-      <div style="margin-top: 15px; display: flex; justify-content: flex-end;">
-        <el-pagination
-          v-model:current-page="currentPage"
-          v-model:page-size="pageSize"
-=======
      <div style="margin-top: 15px; display: flex; justify-content: flex-end">
        <el-pagination
          v-model:current-page="formParams.pageNo"
          v-model:page-size="formParams.pageSize"
->>>>>>> v1.3
          :page-sizes="[10, 20, 50, 100]"
          layout="total, sizes, prev, pager, next, jumper"
          :total="total"
@@ -240,26 +166,6 @@
    </div>

    <!-- 打印预览弹窗 -->
-<<<<<<< HEAD
-    <el-dialog v-model="printDialogVisible" title="打印预览" width="80%" :close-on-click-modal="false">
-      <div id="print-content">
-        <div style="text-align: center; margin-bottom: 20px;">
-          <h2 style="margin: 0;">费用明细清单</h2>
-          <p style="margin: 5px 0;">患者姓名：{{ patientInfo || '未选择患者' }}</p>
-          <p style="margin: 5px 0;">费用周期：{{ formatDateRange() }}</p>
-        </div>
-        
-        <table style="width: 100%; border-collapse: collapse;">
-          <thead>
-            <tr style="background-color: #eef9fd;">
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">项目名称</th>
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">费用类型</th>
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">单价</th>
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">数量</th>
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">金额</th>
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">执行科室</th>
-              <th style="border: 1px solid #e4e7ed; padding: 8px;">执行日期</th>
-=======
    <el-dialog
      v-model="printDialogVisible"
      title="打印预览"
@@ -283,26 +189,10 @@
              <th style="border: 1px solid #e4e7ed; padding: 8px">金额</th>
              <th style="border: 1px solid #e4e7ed; padding: 8px">执行科室</th>
              <th style="border: 1px solid #e4e7ed; padding: 8px">执行日期</th>
->>>>>>> v1.3
            </tr>
          </thead>
          <tbody>
            <tr v-for="item in feeDetailList" :key="item.id">
-<<<<<<< HEAD
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.itemName }}</td>
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.feeTypeName }}</td>
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.unitPrice.toFixed(2) }}</td>
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.quantity }}</td>
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.amount.toFixed(2) }}</td>
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.execDept }}</td>
-              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.executeDate }}</td>
-            </tr>
-          </tbody>
-          <tfoot>
-            <tr style="background-color: #f5f7fa;">
-              <td colspan="4" style="border: 1px solid #e4e7ed; padding: 8px; text-align: right; font-weight: bold;">合计：</td>
-              <td colspan="3" style="border: 1px solid #e4e7ed; padding: 8px; color: #ff4d4f; font-weight: bold;">¥{{ totalAmount.toFixed(2) }}</td>
-=======
              <td style="border: 1px solid #e4e7ed; padding: 8px">{{ item.itemName }}</td>
              <td style="border: 1px solid #e4e7ed; padding: 8px">{{ item.feeTypeName }}</td>
              <td style="border: 1px solid #e4e7ed; padding: 8px">
@@ -333,16 +223,10 @@
              >
                ¥{{ totalAmount.toFixed(2) }}
              </td>
->>>>>>> v1.3
            </tr>
          </tfoot>
        </table>
      </div>
-<<<<<<< HEAD
-      
-=======
-
->>>>>>> v1.3
      <template #footer>
        <el-button @click="printDialogVisible = false">关闭</el-button>
        <el-button type="primary" @click="doPrint">打印</el-button>
@@ -352,12 +236,6 @@
 </template>

 <script setup>
-<<<<<<< HEAD
-import { ref, computed, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
-import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
-import { formatDateStr } from '@/utils/index';
-=======
 import { ref, computed, onMounted, watch, reactive } from 'vue';
 import moment from 'moment';
 import { ElMessage } from 'element-plus';
@@ -367,28 +245,17 @@ import { getCostDetail } from './api.js';
 import { getOrgList } from '../../../basicmanage/ward/components/api.js';
 const { proxy } = getCurrentInstance();
 const { med_chrgitm_type } = proxy.useDict('med_chrgitm_type');
->>>>>>> v1.3

 // 响应式数据
 const loading = ref(false);
 const feeDetailList = ref([]);
 const dateRange = ref('today'); // today, yesterday, other
 const dateRangeValue = ref([]);
-<<<<<<< HEAD
-const feeType = ref('');
-=======
->>>>>>> v1.3
 const execDepartment = ref('');
 const departmentOptions = ref([]);
 const feeTypeOptions = ref([]);
 const tableRef = ref(null);
 const patientInfo = ref('');
-<<<<<<< HEAD
-
-// 分页相关
-const currentPage = ref(1);
-const pageSize = ref(20);
-=======
 const orgOptions = ref([]);
 const formParams = reactive({
  chargeItemEnum: undefined,
@@ -406,7 +273,6 @@ const props = defineProps({
 });

 // 分页相关
->>>>>>> v1.3
 const total = ref(0);

 // 打印相关
@@ -415,11 +281,7 @@ const printDialogVisible = ref(false);
 // 计算总金额
 const totalAmount = computed(() => {
  return feeDetailList.value.reduce((sum, item) => {
-<<<<<<< HEAD
-    return sum + (item.amount || 0);
-=======
    return sum + (item.totalPrice || 0);
->>>>>>> v1.3
  }, 0);
 });

@@ -428,19 +290,6 @@ onMounted(() => {
  // 设置默认日期
  const today = new Date();
  dateRangeValue.value = [formatDateStr(today, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
-<<<<<<< HEAD
-
-  // 加载科室选项
-  loadDepartmentOptions();
-  
-  // 加载费用类型选项
-  loadFeeTypeOptions();
-  
-  // 监听患者选择变化
-  watchPatientSelection();
-});
-
-=======
 });

 watch(
@@ -481,17 +330,12 @@ const getTableList = async () => {
  } catch (error) {}
 };

->>>>>>> v1.3
 // 监听患者选择变化
 function watchPatientSelection() {
  // 定期检查患者选择状态变化
  setInterval(() => {
    if (patientInfoList.value && patientInfoList.value.length > 0) {
-<<<<<<< HEAD
-      const selectedPatient = patientInfoList.value.find(patient => patient.selected === true);
-=======
      const selectedPatient = patientInfoList.value.find((patient) => patient.selected === true);
->>>>>>> v1.3
      if (selectedPatient) {
        patientInfo.value = selectedPatient.patientName || '';
      } else {
@@ -503,21 +347,6 @@ function watchPatientSelection() {
  }, 300);
 }

-<<<<<<< HEAD
-// 加载科室选项
-function loadDepartmentOptions() {
-  // 模拟科室数据
-  departmentOptions.value = [
-    { label: '内科', value: 'internal' },
-    { label: '外科', value: 'surgery' },
-    { label: '儿科', value: 'pediatrics' },
-    { label: '妇产科', value: 'obstetrics' },
-    { label: '检验科', value: 'laboratory' },
-    { label: '影像科', value: 'imaging' },
-    { label: '其他科室', value: 'others' },
-  ];
-}
-=======
 /** 查询科室 */
 const getLocationInfo = () => {
  getOrgList().then((res) => {
@@ -545,7 +374,6 @@ const onReset = () => {
  formParams.recordedTimeETime = dateRangeValue.value[1] + ' ' + '23:59:59';
  getTableList();
 };
->>>>>>> v1.3

 // 加载费用类型选项
 function loadFeeTypeOptions() {
@@ -582,26 +410,19 @@ function handleDateTabClick(tab) {
      break;
    // other 情况保持用户选择的值
  }
-<<<<<<< HEAD
-=======
  if (!(dateRangeValue.value == null || dateRangeValue.value == undefined)) {
    formParams.recordedTimeSTime = dateRangeValue.value[0] + ' ' + '00:00:00';
    formParams.recordedTimeETime = dateRangeValue.value[1] + ' ' + '23:59:59';
  }
->>>>>>> v1.3
 }

 // 处理日期选择器变化
 function handleDatePickerChange() {
  if (dateRangeValue.value.length > 0) {
-<<<<<<< HEAD
-    dateRange.value = 'other';
-=======
    // dateRange.value = 'other';
  } else {
    formParams.recordedTimeSTime = undefined;
    formParams.recordedTimeETime = undefined;
->>>>>>> v1.3
  }
 }

@@ -613,195 +434,15 @@ function formatDateRange() {
  return '';
 }

-<<<<<<< HEAD
-// 生成模拟数据
-function generateMockData() {
-  // 费用类型映射
-  const feeTypeMap = {
-    'examine': '检查费',
-    'treatment': '治疗费',
-    'medicine': '药品费',
-    'material': '材料费',
-    'bed': '床位费',
-    'others': '其他费用'
-  };
-  
-  // 科室映射
-  const deptMap = {
-    'internal': '内科',
-    'surgery': '外科',
-    'pediatrics': '儿科',
-    'obstetrics': '妇产科',
-    'laboratory': '检验科',
-    'imaging': '影像科',
-    'others': '其他科室'
-  };
-  
-  // 项目数据池
-  const itemPools = {
-    'examine': ['血常规检查', '尿常规检查', '肝功能检查', '肾功能检查', '胸部CT', '心电图', 'B超'],
-    'treatment': ['静脉输液', '肌肉注射', '氧气吸入', '导尿', '换药', '雾化吸入'],
-    'medicine': ['抗生素注射液', '维生素C片', '感冒药', '止痛药', '降压药', '消炎药'],
-    'material': ['一次性输液器', '注射器', '医用棉花', '纱布', '胶带', '一次性手套'],
-    'bed': ['普通病房床位', 'ICU床位', '单人病房床位', '双人病房床位'],
-    'others': ['护理费', '诊疗费', '挂号费', '病历费']
-  };
-  
-  // 合并所有项目到allItems数组中（修复：添加这部分代码）
-  let allItems = [];
-  Object.keys(itemPools).forEach(type => {
-    itemPools[type].forEach(item => {
-      allItems.push({
-        type: type,
-        name: item
-      });
-    });
-  });
-  
-  // 筛选条件
-  if (feeType.value) {
-    allItems = allItems.filter(item => item.type === feeType.value);
-  }
-  
-  // 生成模拟数据
-  const mockData = [];
-  const baseDate = new Date(dateRangeValue.value[0]);
-  const endDate = new Date(dateRangeValue.value[1]);
-  const daysDiff = Math.ceil((endDate - baseDate) / (1000 * 60 * 60 * 24)) + 1;
-  
-  // 执行人池
-  const executors = ['护士A', '护士B', '医生A', '医生B', '技师A'];
-  
-  // 生成数据
-  let id = 1;
-  for (let day = 0; day < daysDiff; day++) {
-    const currentDate = new Date(baseDate);
-    currentDate.setDate(baseDate.getDate() + day);
-    const dateStr = formatDateStr(currentDate, 'YYYY-MM-DD');
-    
-    // 每天生成3-8条记录
-    const recordsCount = Math.floor(Math.random() * 6) + 3;
-    for (let i = 0; i < recordsCount; i++) {
-      // 随机选择一个项目
-      const randomItemIndex = Math.floor(Math.random() * allItems.length);
-      const selectedItem = allItems[randomItemIndex];
-      
-      // 随机选择一个科室
-      const deptKeys = Object.keys(deptMap);
-      const randomDeptKey = deptKeys[Math.floor(Math.random() * deptKeys.length)];
-      
-      // 如果有科室筛选且不符合，则跳过
-      if (execDepartment.value && randomDeptKey !== execDepartment.value) {
-        continue;
-      }
-      
-      // 生成随机单价和数量
-      const unitPrice = Math.floor(Math.random() * 190) + 10; // 10-200元
-      const quantity = Math.floor(Math.random() * 3) + 1; // 1-4
-      
-      // 医保类型
-      const insuranceTypes = ['', '甲类', '乙类', '丙类'];
-      const insuranceType = insuranceTypes[Math.floor(Math.random() * insuranceTypes.length)];
-      
-      mockData.push({
-        id: `item-${id++}`,
-        itemName: selectedItem.name,
-        feeType: selectedItem.type,
-        feeTypeName: feeTypeMap[selectedItem.type],
-        unitPrice: unitPrice,
-        quantity: quantity,
-        amount: unitPrice * quantity,
-        execDept: deptMap[randomDeptKey],
-        executor: executors[Math.floor(Math.random() * executors.length)],
-        executeDate: dateStr,
-        insuranceType: insuranceType,
-        remark: ''
-      });
-    }
-  }
-  
-  return mockData;
-}
-
-// 查询按钮点击
-function handleQuery() {
-  // 添加调试日志，查看患者列表数据结构
-  console.log('患者列表数据:', patientInfoList.value);
-  
-  // 更灵活的患者选择检测逻辑
-  let selectedPatient = null;
-  
-  if (patientInfoList.value && patientInfoList.value.length > 0) {
-    // 尝试查找选中状态的患者
-    selectedPatient = patientInfoList.value.find(patient => 
-      patient.selected === true || 
-      patient.checked === true || 
-      patient.isChecked === true ||
-      (typeof patient.selected === 'string' && patient.selected === '1')
-    );
-    
-    // 如果没有明确选中的患者，就使用列表中的第一个患者
-    if (!selectedPatient) {
-      selectedPatient = patientInfoList.value[0];
-    }
-  }
-  
-  // 即使没有明确选中的患者标志，也应该允许查询
-  if (!selectedPatient) {
-    ElMessage.warning('请先选择患者');
-    return;
-  }
-  
-  // 更新患者信息显示 - 修复：确保正确获取患者姓名
-  const patientName = selectedPatient.patientName || 
-                     selectedPatient.name || 
-                     selectedPatient.patientInfo || 
-                     selectedPatient.patient || 
-                     '未命名患者';
-  patientInfo.value = patientName;
-  
-  loading.value = true;
-
-  // 模拟API调用延迟
-  setTimeout(() => {
-    try {
-      // 使用模拟数据
-      const allData = generateMockData();
-      total.value = allData.length;
-      
-      // 分页处理
-      const start = (currentPage.value - 1) * pageSize.value;
-      const end = start + pageSize.value;
-      feeDetailList.value = allData.slice(start, end);
-    } catch (error) {
-      console.error('查询错误:', error);
-      ElMessage.error('查询失败，请重试');
-      feeDetailList.value = [];
-      total.value = 0;
-    } finally {
-      loading.value = false;
-    }
-  }, 500);
-=======
 // 查询按钮点击
 function handleQuery() {
  console.log('params=======>', formParams);
  getTableList();
->>>>>>> v1.3
 }

 // 处理排序变化
 function handleSortChange({ prop, order }) {
  const sortedData = [...feeDetailList.value];
-<<<<<<< HEAD
-  
-  if (order === 'ascending') {
-    sortedData.sort((a, b) => (a[prop] > b[prop]) ? 1 : -1);
-  } else if (order === 'descending') {
-    sortedData.sort((a, b) => (a[prop] < b[prop]) ? 1 : -1);
-  }
-  
-=======

  if (order === 'ascending') {
    sortedData.sort((a, b) => (a[prop] > b[prop] ? 1 : -1));
@@ -809,50 +450,28 @@ function handleSortChange({ prop, order }) {
    sortedData.sort((a, b) => (a[prop] < b[prop] ? 1 : -1));
  }

->>>>>>> v1.3
  feeDetailList.value = sortedData;
 }

 // 处理分页大小变化
 function handleSizeChange(newSize) {
-<<<<<<< HEAD
-  pageSize.value = newSize;
-  currentPage.value = 1;
-  handleQuery();
-=======
  formParams.pageSize = newSize;
  formParams.pageNo = 1;
  getTableList();
->>>>>>> v1.3
 }

 // 处理当前页变化
 function handleCurrentChange(newCurrent) {
-<<<<<<< HEAD
-  currentPage.value = newCurrent;
-  handleQuery();
-}
-
-// 导出
-function handleExport() {
-=======
  formParams.pageNo = newCurrent;
  getTableList();
 }

 // 导出
 async function handleExport() {
->>>>>>> v1.3
  if (feeDetailList.value.length === 0) {
    ElMessage.warning('暂无数据可导出');
    return;
  }
-<<<<<<< HEAD
-  
-  // 模拟导出操作
-  ElMessage.success('导出成功');
-  // 实际项目中这里应该调用导出API或使用Excel库生成文件
-=======

  try {
    // 实际项目中这里应该调用导出API或使用Excel库生成文件
@@ -864,7 +483,6 @@ async function handleExport() {
      `dict_${new Date().getTime()}.xlsx`
    );
  } catch (error) {}
->>>>>>> v1.3
 }

 // 打印预览
@@ -873,11 +491,6 @@ function handlePrint() {
    ElMessage.warning('暂无数据可打印');
    return;
  }
-<<<<<<< HEAD
-  
-=======
-
->>>>>>> v1.3
  printDialogVisible.value = true;
 }

@@ -886,17 +499,10 @@ function doPrint() {
  try {
    // 获取要打印的内容
    const printContent = document.getElementById('print-content').innerHTML;
-<<<<<<< HEAD
-    
-    // 创建临时窗口
-    const printWindow = window.open('', '_blank');
-    
-=======

    // 创建临时窗口
    const printWindow = window.open('', '_blank');

->>>>>>> v1.3
    // 写入内容
    printWindow.document.write(`
      <html>
@@ -916,11 +522,6 @@ function doPrint() {
        </body>
      </html>
    `);
-<<<<<<< HEAD
-    
-=======
-
->>>>>>> v1.3
    // 打印
    printWindow.document.close();
    printWindow.focus();
@@ -954,8 +555,4 @@ defineExpose({
 :deep(.el-table__row:hover > td) {
  background-color: #eef9fd !important;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/index.vue
@@ -23,17 +23,11 @@
        <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
          <PatientList />
        </el-tab-pane>
-<<<<<<< HEAD
-        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
-          <PatientList />
-        </el-tab-pane>
-=======
        <!-- 隐藏tab 
        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
          <PatientList />
        </el-tab-pane>
        -->
->>>>>>> v1.3
      </el-tabs>
    </div>

@@ -44,15 +38,11 @@
        <el-tab-pane label="划价确费" name="billing">
          <BillingList ref="billingRef" />
        </el-tab-pane>
-<<<<<<< HEAD
-        <el-tab-pane label="医嘱计费" name="orderBilling">
-=======
        <el-tab-pane label="费用明细查询" name="expenseDetail">
          <!-- <FeeDetailQuery :activeTab="activeTab" ref="feeDetailQueryRef" /> -->
          <NewfeeDetailQuery :activeTab="activeTab" ref="feeDetailQueryRef" />
        </el-tab-pane>
        <!--  <el-tab-pane label="医嘱计费" name="orderBilling">
->>>>>>> v1.3
          <OrderBilling ref="orderBillingRef" />
        </el-tab-pane>
        <el-tab-pane label="费用明细查询" name="expenseDetail">
@@ -61,11 +51,7 @@
        <el-tab-pane label="预交金查询" name="depositQuery">
          <deposit-query ref="depositQueryRef" />
        </el-tab-pane>
-<<<<<<< HEAD
-        <!-- <el-tab-pane label="患者流转日志" name="patientFlow">
-=======
        <el-tab-pane label="患者流转日志" name="patientFlow">
->>>>>>> v1.3
          <div style="padding: 20px; text-align: center; color: #909399">患者流转日志功能区域</div>
        </el-tab-pane> -->
      </el-tabs>
@@ -76,16 +62,10 @@
 <script setup>
 import { ref, onMounted, nextTick } from 'vue';
 import { ElMessage } from 'element-plus';
-<<<<<<< HEAD
-import PatientList from '../medicalOrderExecution/components/patientList.vue';
-import BillingList from './components/billingList.vue';
-import FeeDetailQuery from './components/feeDetailQuery.vue';
-=======
 import PatientList from '../components/patientList.vue';
 import BillingList from './components/billingList.vue';
 import FeeDetailQuery from './components/feeDetailQuery.vue';
 import NewfeeDetailQuery from './components/newfeeDetailQuery.vue';
->>>>>>> v1.3
 import DepositQuery from './components/depositQuery.vue';
 import OrderBilling from './components/OrderBilling.vue';

@@ -115,11 +95,7 @@ function handleTabChange() {
  // 切换到划价确费标签时，刷新数据
  if (activeTab.value === 'billing' && billingRef.value) {
    nextTick(() => {
-<<<<<<< HEAD
-      billingRef.value.handleQuery();
-=======
      // billingRef.value.handleQuery();
->>>>>>> v1.3
    });
  }
  // 切换到医嘱计费标签时，刷新数据
--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
@@ -164,11 +164,7 @@

 <script setup>
 import { getPrescriptionList, adviceExecute, adviceCancel, medicineSummary } from './api';
-<<<<<<< HEAD
-import { patientInfoList } from '../store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
->>>>>>> v1.3
 import { formatDate, formatDateStr } from '@/utils/index';
 import { ref, getCurrentInstance } from 'vue';
 import useUserStore from '@/store/modules/user';
@@ -207,58 +203,6 @@ function handleGetPrescription() {
      therapyEnum: therapyEnum.value,
      exeStatus: props.exeStatus,
      requestStatus: props.requestStatus,
-<<<<<<< HEAD
-    }).then((res) => {
-      // try {
-      // 根据encounterId分组
-      const groupedPrescriptions = res.data.records.reduce((groups, prescription) => {
-        let times = new Set();
-        let rate = {};
-        let checkedRates = {};
-        // 汇总时间点 默认全部汇总
-        prescription.dispenseIds = [];
-        prescription.medicineSummaryParamList.forEach((item) => {
-          // 已汇总的时间点不需要显示
-          if (item.dispenseStatus != 8) {
-            prescription.dispenseIds.push({
-              dispenseId: item.dispenseId,
-              receiverId: userStore.id,
-            });
-
-            // 将全部的时间点拆分 把日期去重，页面显示示例 05-15 [01:30 02:30 03:30]
-            let time = item.dispenseTime.substring(5, 10);
-            let rateTime = item.dispenseTime.substring(11, 16);
-            times.add(time);
-            rate[time] = rate[time] || [];
-            rate[time].push({ rate: rateTime, dispenseId: item.dispenseId });
-            checkedRates[time] = checkedRates[time] || [];
-            checkedRates[time].push(rateTime);
-          }
-        });
-
-        prescription.times = Array.from(times);
-        prescription.rate = rate;
-        prescription.checkedRates = checkedRates;
-        // 把相同encounterId的医嘱放在同一个数组中
-        const encounterId = prescription.encounterId;
-        if (!groups[encounterId]) {
-          groups[encounterId] = [];
-        }
-        if (!activeNames.value.includes(encounterId)) {
-          activeNames.value.push(encounterId);
-        }
-        groups[encounterId].push(prescription);
-        return groups;
-      }, {});
-
-      // 将分组结果转换为数组形式
-      prescriptionList.value = Object.values(groupedPrescriptions);
-      loading.value = false;
-      // } catch {
-      //   loading.value = false;
-      // }
-    });
-=======
    })
      .then((res) => {
        // try {
@@ -319,7 +263,6 @@ function handleGetPrescription() {
            next({ path: '/' });
          });
      });
->>>>>>> v1.3
    chooseAll.value = false;
  } else {
    prescriptionList.value = [];
@@ -391,8 +334,4 @@ defineExpose({
  font-size: 15px;
  font-weight: 500;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
@@ -49,11 +49,7 @@

 <script setup>
 import { getMedicineSummary, getMedicineSummaryDetail } from './api';
-<<<<<<< HEAD
-import { patientInfoList } from '../store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
->>>>>>> v1.3
 import { ref, getCurrentInstance } from 'vue';

 const medicineSummaryFormList = ref([]);
--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
@@ -6,17 +6,6 @@
          height: 40px;
          display: flex;
          align-items: center;
-<<<<<<< HEAD
-          justify-content: flex-end;
-          border-bottom: solid 2px #e4e7ed;
-        "
-      >
-        <el-icon
-          @click="refresh"
-          class="refresh-icon"
-          style="cursor: pointer; font-size: 20px; margin-right: 10px"
-        >
-=======
          justify-content: space-between;
          border-bottom: solid 2px #e4e7ed;
          padding: 0 10px;
@@ -26,7 +15,6 @@
          <ArrowLeft />
        </el-icon> -->
        <el-icon @click="refresh" class="refresh-icon" style="cursor: pointer; font-size: 20px">
->>>>>>> v1.3
          <Refresh />
        </el-icon>
      </div>
@@ -34,39 +22,6 @@
        <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
          <PatientList />
        </el-tab-pane>
-<<<<<<< HEAD
-        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
-          <PatientList />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <div style="width: 100%">
-      <div
-        style="
-          height: 40px;
-          display: flex;
-          align-items: center;
-          border-bottom: solid 2px #e4e7ed;
-          padding: 0 15px;
-          background: linear-gradient(90deg, #f0f8ff, #e6f7ff);
-        "
-      >
-        <div class="nav-button-group">
-          <el-button
-            v-for="nav in navigationButtons"
-            :key="nav.path"
-            :type="currentRoute.path === nav.path ? 'primary' : 'default'"
-            size="small"
-            @click="navigateTo(nav.path)"
-            class="nav-button"
-            :class="{ 'active-nav': currentRoute.path === nav.path }"
-          >
-            <el-icon v-if="nav.icon"><component :is="nav.icon" /></el-icon>
-            <span>{{ nav.label }}</span>
-          </el-button>
-        </div>
-      </div>
-=======
        <!-- 隐藏转科列表 
        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
          <PatientList />
@@ -76,7 +31,6 @@
    </div>
    <div style="width: 100%">
      <!-- <NurseNavBar :navs="navigationButtons" /> -->
->>>>>>> v1.3
      <div
        style="
          height: 50px;
@@ -148,16 +102,6 @@

 <script setup>
 import { getCurrentInstance, ref } from 'vue';
-<<<<<<< HEAD
-import { useRoute, useRouter } from 'vue-router';
-import PatientList from './components/patientList.vue';
-import PrescriptionList from './components/prescriptionList.vue';
-import SummaryMedicineList from './components/summaryMedicineList.vue';
-
-const { proxy } = getCurrentInstance();
-const router = useRouter();
-const currentRoute = useRoute();
-=======
 import { useRouter } from 'vue-router';
 import PatientList from '../components/patientList.vue';
 import NurseNavBar from '../components/NurseNavBar.vue';
@@ -167,7 +111,6 @@ import { inpatientNurseNavs } from '../constants/navigation';

 const { proxy } = getCurrentInstance();
 const router = useRouter();
->>>>>>> v1.3

 const activeName = ref('preparation');
 const active = ref('first');
@@ -181,53 +124,7 @@ const isDetails = ref('1');
 // 存储子组件引用的对象
 const prescriptionRefs = ref();

-<<<<<<< HEAD
-// 导航按钮配置
-const navigationButtons = ref([
-  {
-    label: '入出转',
-    path: '/inHospital/statistics/inOut',
-    icon: 'Document',
-  },
-  {
-    label: '护理记录',
-    path: '/inHospital/statistics/nursingRecord',
-    icon: 'MedicineBox',
-  },
-  {
-    label: '三测单',
-    path: '/inHospital/statistics/tprChart',
-    icon: 'List',
-  },
-  {
-    label: '医嘱执行',
-    path: '/inHospital/statistics/medicalOrderExecution',
-    icon: 'Back',
-  },
-  {
-    label: '医嘱校对',
-    path: '/inHospital/statistics/medicalOrderProofread',
-    icon: 'Back',
-  },
-  {
-    label: '汇总发药申请',
-    path: '/inHospital/statistics/drugDistribution',
-    icon: 'Back',
-  },
-  {
-    label: '住院记账',
-    path: '/inHospital/statistics/InpatientBilling',
-    icon: 'Back',
-  },
-]);
-
-// 页面导航方法
-const navigateTo = (path) => {
-  router.push(path);
-};
-=======
 const navigationButtons = inpatientNurseNavs;
->>>>>>> v1.3

 // 定义处方列表tabs配置
 const prescriptionTabs = [
@@ -282,13 +179,10 @@ function handleExecute() {
  proxy.$refs['prescriptionRefs'].handleMedicineSummary();
 }

-<<<<<<< HEAD
-=======
 function handleBack() {
  router.back();
 }

->>>>>>> v1.3
 provide('handleGetPrescription', (value) => {
  prescriptionRefs.value.handleGetPrescription();
 });
@@ -316,31 +210,4 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
  margin: 0;
 }
-<<<<<<< HEAD
-
-.nav-button-group {
-  display: flex;
-  gap: 10px;
-}
-
-.nav-button {
-  transition: all 0.3s ease;
-  border-radius: 20px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.nav-button:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
-}
-
-.nav-button.active-nav {
-  box-shadow: 0 4px 8px rgba(64, 158, 255, 0.3);
-}
-
-.nav-button :deep(.el-icon) {
-  margin-right: 5px;
-}
-=======
->>>>>>> v1.3
 </style>
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
@@ -226,12 +226,8 @@

 <script setup>
 import { getPrescriptionList, adviceExecute, adviceCancel, adviceNoExecute } from './api';
-<<<<<<< HEAD
-import { patientInfoList } from '../store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
 import { lotNumberMatch } from '@/api/public';
->>>>>>> v1.3
 import { formatDate, formatDateStr } from '@/utils/index';
 import { ref, getCurrentInstance, nextTick } from 'vue';

@@ -465,27 +461,6 @@ function handleNoExecute() {
  });
 }

-<<<<<<< HEAD
-// 不执行
-function handleNoExecute() {
-  let list = getSelectRows();
-  list = list.map((item) => {
-    return {
-      requestId: item.requestId,
-      encounterId: item.encounterId,
-      patientId: item.patientId,
-      adviceTable: item.adviceTable,
-      executeTimes: item.executeTimes,
-    };
-  });
-  console.log(list, 'list');
-  adviceNoExecute({ adviceExecuteDetailList: list }).then((res) => {
-    if (res.code == 200) {
-      handleGetPrescription();
-    }
-  });
-}
-
 // 取消执行
 function handleCancel() {
  let list = getSelectRows();
@@ -500,22 +475,6 @@ function handleCancel() {
      })
    );
  });
-=======
-// 取消执行
-function handleCancel() {
-  let list = getSelectRows();
-  let producerIds = [];
-  list.forEach((item) => {
-    producerIds.push(
-      ...item.procedureIds.map((value) => {
-        return {
-          procedureId: value,
-          therapyEnum: item.therapyEnum,
-        };
-      })
-    );
-  });
->>>>>>> v1.3
  adviceCancel({ adviceExecuteDetailList: producerIds }).then((res) => {
    if (res.code == 200) {
      handleGetPrescription();
@@ -564,18 +523,6 @@ function getDateRange(startDate, endDate) {

 function handleRateChange(value, date, time, row, rateItem) {
  // 拼接当前选中时间
-<<<<<<< HEAD
-  let tiemStr = row.year + '-' + date + ' ' + time + ':00';
-  let index = row.executeTimes.indexOf(tiemStr);
-  debugger;
-  if (value) {
-    row.executeTimes.push(tiemStr);
-    row.procedureIds.push(rateItem.producerId);
-  } else {
-    row.executeTimes.splice(row.executeTimes.indexOf(tiemStr), 1);
-    row.procedureIds.splice(row.executeTimes.indexOf(rateItem.producerId), 1);
-  }
-=======
  let timeStr = row.year + '-' + date + ' ' + time + ':00';
  let timeIndex = row.executeTimes.indexOf(timeStr);

@@ -606,7 +553,6 @@ function handleRateChange(value, date, time, row, rateItem) {
  nextTick(() => {
    checkAndToggleRowSelection(row);
  });
->>>>>>> v1.3
 }

 function handelSwicthChange(value) {