提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -357,7 +357,11 @@ async function print() {
        ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
        nickName: userStore.nickName,
        orgName: userStore.orgName,
+<<<<<<< HEAD
        fixmedinsName: '长春大学医院',
+=======
+        fixmedinsName: '长春市朝阳区中医院医院',
+>>>>>>> v1.3
        queryTime: queryTime.value[0] + '~' + queryTime.value[1],
        zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
        feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
@@ -433,4 +437,4 @@ getPharmacyCabinetLists();
 .el-col {
  margin-right: 50px;
 }
-</style>
+</style>
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
@@ -218,13 +218,13 @@
        <el-col :span="5">
          <span class="label">省医保人次：</span>
          <span class="value">
-            {{ reportValue['229900reg'] ? reportValue['229900reg'] + ' 人' : '0 人' }}
+            {{ reportValue['229900reg'] ? reportValue['229900reg'] + '人' : '0 人' }}
          </span>
        </el-col>
        <el-col :span="5">
          <span class="label">市医保人次：</span>
          <span class="value">
-            {{ reportValue['220100reg'] ? reportValue['220100reg'] + ' 人' : '0 人' }}
+            {{ (reportValue['220100reg'] || 0) + (reportValue['220199reg'] || 0) + ' 人' }}
          </span>
        </el-col>
        <!-- <el-col :span="5">
@@ -273,19 +273,27 @@
      >
        <el-col :span="5">
          <span class="label">市医保现金：</span>
-          <span class="value">{{ formatValue(reportValue['220100cash']) }}</span>
+          <span class="value">{{
+            formatValue((reportValue['220100cash'] || 0) + (reportValue['220199cash'] || 0))
+          }}</span>
        </el-col>
        <el-col :span="5">
          <span class="label">市医保统筹：</span>
-          <span class="value">{{ formatValue(reportValue['220100tcSum']) }}</span>
+          <span class="value">{{
+            formatValue((reportValue['220100tcSum'] || 0) + (reportValue['220199tcSum'] || 0))
+          }}</span>
        </el-col>
        <el-col :span="5">
          <span class="label">市医保账户：</span>
-          <span class="value">{{ formatValue(reportValue['220100zhSum']) }}</span>
+          <span class="value">{{
+            formatValue((reportValue['220100zhSum'] || 0) + (reportValue['220199zhSum'] || 0))
+          }}</span>
        </el-col>
        <el-col :span="5">
          <span class="label">市医保基金：</span>
-          <span class="value">{{ formatValue(reportValue['220100fundSum']) }}</span>
+          <span class="value">{{
+            formatValue((reportValue['220100fundSum'] || 0) + (reportValue['220199fundSum'] || 0))
+          }}</span>
        </el-col>
      </el-row>
      <el-row
@@ -329,6 +337,7 @@
            {{
              formatValue(
                (reportValue['220100cash'] || 0) +
+                  (reportValue['220199cash'] || 0) +
                  (reportValue['229900cash'] || 0) +
                  (reportValue['0000cash'] || 0)
              )
@@ -443,16 +452,37 @@ function processObjectWithFinType(obj) {
 async function print() {
  // const selectedRows = proxy.$refs['tableRef'].getSelectionRows();
  console.log(reportValue.value, '==reportValue.value==');
+  // 计算市医保相关字段
+  const municipalYbReg =
+    (reportValue.value['220100reg'] || 0) + (reportValue.value['220199reg'] || 0);
+  const municipalYbCash =
+    (reportValue.value['220100cash'] || 0) + (reportValue.value['220199cash'] || 0);
+  const municipalYbTcSum =
+    (reportValue.value['220100tcSum'] || 0) + (reportValue.value['220199tcSum'] || 0);
+  const municipalYbZhSum =
+    (reportValue.value['220100zhSum'] || 0) + (reportValue.value['220199zhSum'] || 0);
+  const municipalYbFundSum =
+    (reportValue.value['220100fundSum'] || 0) + (reportValue.value['220199fundSum'] || 0);
+  const municipalYbTotal = municipalYbZhSum + municipalYbFundSum;
+  const totalCash =
+    municipalYbCash + (reportValue.value['229900cash'] || 0) + (reportValue.value['0000cash'] || 0);
+
  const result = {
    data: [
      {
        ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
        nickName: userStore.nickName,
        orgName: userStore.orgName,
+<<<<<<< HEAD
        fixmedinsName:  userStore.hospitalName,
+=======
+        fixmedinsName: userStore.hospitalName,
+>>>>>>> v1.3
        createTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'),
        scheduler: userStore.nickName,
        timeRange: queryTime.value[0] + '~' + queryTime.value[1],
+
+        // 计算字段
        zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
        feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)
          .add(reportValue.value.CHECK_FEE || 0)
@@ -465,14 +495,23 @@ async function print() {
          .add(reportValue.value.REGISTRATION_FEE || 0)
          .add(reportValue.value.OTHER_FEE || 0)
          .add(reportValue.value.SANITARY_MATERIALS_FEE || 0),
+
+        // 省医保相关
        provinceYbTotal:
-          (reportValue.value['229900zhSum'] || 0) + (reportValue.value['229900fundSum'] || 0),
-        municipalYbTotal:
-          (reportValue.value['220100zhSum'] || 0) + (reportValue.value['220100fundSum'] || 0),
-        totalCash:
-          (reportValue.value['220100cash'] || 0) +
-          (reportValue.value['229900cash'] || 0) +
-          (reportValue.value['0000cash'] || 0),
+          (reportValue.value['229900fundSum'] || 0) + (reportValue.value['229900zhSum'] || 0),
+
+        // 市医保相关（220100和220199）
+        municipalYbReg,
+        municipalYbCash,
+        municipalYbTcSum,
+        municipalYbZhSum,
+        municipalYbFundSum,
+        municipalYbTotal,
+
+        // 现金收入总额
+        totalCash,
+
+        // 体检人次
        physicalExaminationCount: getPhysicalExaminationCount(),
      },
    ],
@@ -546,4 +585,4 @@ function formatValue(value) {
  background-color: #000;
  margin: 20px 0;
 }
-</style>
+</style>
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
@@ -92,3 +92,18 @@ export function printBloodCode (query) {
    params: query,
  });
 }
+<<<<<<< HEAD
+=======
+
+
+/**
+ * 获取本次就诊处方单
+ */
+export function getEnPrescriptionInfo(data) {
+  return request({
+    url: '/doctor-station/main/prescription-page-info',
+    method: 'get',
+    params: data,
+  });
+}
+>>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
@@ -6,8 +6,11 @@
      "paperType": "A5",
      "height": 210,
      "width": 148,
+      "paperHeader": 0,
+      "paperFooter": 592.4409448818898,
      "paperNumberDisabled": true,
      "paperNumberContinue": true,
+      "expandCss": "",
      "overPrintOptions": {
        "content": "",
        "opacity": 0.7,
@@ -24,20 +27,24 @@
        "format": "YYYY-MM-DD HH:mm"
      },
      "panelLayoutOptions": {},
-      "paperHeader": 0,
-      "paperFooter": 841.8897637795277,
      "printElements": [
        {
          "options": {
-            "left": 169.5,
+            "left": 0,
            "top": 22.5,
            "height": 12,
+<<<<<<< HEAD
            "width": 88.5,
            "title": "长春大学医院",
+=======
+            "width": 420,
+            "title": "长春市朝阳区中医院",
+>>>>>>> v1.3
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontSize": 13.5,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "textAlign": "center"
          },
          "printElementType": {
            "title": "文本",
@@ -46,15 +53,16 @@
        },
        {
          "options": {
-            "left": 189,
+            "left": 0,
            "top": 45,
            "height": 9.75,
-            "width": 42,
+            "width": 420,
            "title": "处置单",
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontSize": 11.25,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "textAlign": "center"
          },
          "printElementType": {
            "title": "文本",
@@ -331,4 +339,4 @@
      ]
    }
  ]
-}
+}
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
@@ -8,7 +8,11 @@
    @close="close"
  >
    <el-table :data="recordList" highlight-current-row max-height="650" style="width: 100%" border>
+<<<<<<< HEAD
      <el-table-column prop="occurrenceTime" label="执行时间" align="center" />
+=======
+      <el-table-column prop="recordTime" label="执行时间" align="center" />
+>>>>>>> v1.3
      <el-table-column prop="statusEnum_enumText" label="执行状态" align="center" />
      <el-table-column prop="orgName" label="执行科室" align="center" />
      <el-table-column prop="practitionerName" label="执行人" align="center" />
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
@@ -37,7 +37,11 @@
            "top": 16.5,
            "height": 22.5,
            "width": 120,
+<<<<<<< HEAD
            "title": "长春大学医院",
+=======
+            "title": "长春市朝阳区中医院医院",
+>>>>>>> v1.3
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontFamily": "Microsoft YaHei",
@@ -637,4 +641,4 @@
      ]
    }
  ]
-}
+}
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
@@ -44,14 +44,24 @@
                <el-table-column prop="patientName" label="姓名" align="center" />
                <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
                <el-table-column prop="age" label="年龄" align="center" />
+<<<<<<< HEAD
+=======
+                <el-table-column prop="receptionTime" label="挂号时间" align="center" />
+>>>>>>> v1.3
              </el-table>
              <pagination
                v-show="total > 0"
                :total="total"
                v-model:page="queryParams.pageNo"
                v-model:limit="queryParams.pageSize"
+<<<<<<< HEAD
                layout="total, sizes, prev, pager, next"
                @pagination="getPatientList"
+=======
+                @pagination="getPatientList"
+                :pager-count="1"
+                :layout="'total, prev, pager, next'"
+>>>>>>> v1.3
              />
            </el-col>
          </el-row>
@@ -96,6 +106,10 @@
            >
              打印处置单
            </el-button>
+<<<<<<< HEAD
+=======
+            <el-button type="primary" plain @click.stop="getEnPrescription()"> 处方单 </el-button>
+>>>>>>> v1.3
          </el-col>
          <el-col :xs="24" :sm="12" :md="6">
            <el-form
@@ -282,16 +296,28 @@
                </template>
              </el-table-column>
              <el-table-column align="center" header-align="center" prop="unitPrice" label="单价">
+<<<<<<< HEAD
                <template #default="scope">
                  <span>
                    {{ scope.unitPrice ? scope.unitPrice.toFixed(2) : '0.00' + ' 元' }}
+=======
+                <template #default="{ row }">
+                  <span>
+                    {{ row.unitPrice ? row.unitPrice.toFixed(2) : '0.00' + ' 元' }}
+>>>>>>> v1.3
                  </span>
                </template>
              </el-table-column>
              <el-table-column align="center" header-align="center" prop="totalPrice" label="总价">
+<<<<<<< HEAD
                <template #default="scope">
                  <span>
                    {{ scope.totalPrice ? scope.totalPrice.toFixed(2) : '0.00' + ' 元' }}
+=======
+                <template #default="{ row }">
+                  <span>
+                    {{ row.totalPrice ? row.totalPrice.toFixed(2) : '0.00' + ' 元' }}
+>>>>>>> v1.3
                  </span>
                </template>
              </el-table-column>
@@ -301,6 +327,11 @@
      </el-col>
    </el-row>
    <PerformRecordDialog :open="openDialog" :recordList="recordList" @close="openDialog = false" />
+    <PrescriptionInfo
+      :open="openPrescriptionDialog"
+      :precriptionInfo="prescriptionInfo"
+      @close="openPrescriptionDialog = false"
+    />
  </div>
 </template>

@@ -311,20 +342,27 @@ import {
  getDisposalList,
  execute,
  cancel,
+  getEnPrescriptionInfo,
  getPerformRecord,
  listWesternmedicine,
  printBloodCode,
 } from './components/api';
 import PerformRecordDialog from './components/performRecordDialog';
+import PrescriptionInfo from '../../doctorstation/components/prescription/prescriptionInfo.vue';
 import templateJson from './components/template.json';
 import prescriptionTemplate from './components/prescriptionTemplate.json';
 import bloodTemplate from './components/bloodTemplate.json';
 import disposalTemplate from './components/disposalTemplate.json';
+import { advicePrint, getAdjustPriceSwitchState, lotNumberMatch } from '@/api/public';
 import { formatDateStr } from '@/utils';
 import { hiprint } from 'vue-plugin-hiprint';
-import { advicePrint } from '@/api/public';
 import useUserStore from '@/store/modules/user';
 import { getGroupMarkers } from '@/utils/his';
+<<<<<<< HEAD
+=======
+
+import { simplePrint, PRINT_TEMPLATE } from '@/utils/printUtils.js';
+>>>>>>> v1.3
 // 患者搜索
 const queryParams = ref({
  pageNo: 1,
@@ -334,6 +372,10 @@ const receptionTime = ref([
  formatDateStr(new Date(), 'YYYY-MM-DD'),
  formatDateStr(new Date(), 'YYYY-MM-DD'),
 ]);
+
+const openPrescriptionDialog = ref(false);
+const prescriptionInfo = ref([]);
+
 const total = ref(0);
 // 患者数据
 const patientList = ref([]);
@@ -408,6 +450,10 @@ function handleServiceCategoryChange(value) {
      deviceList.value = res.data.records.filter((item) => {
        return item.requestTable == 'wor_device_request';
      });
+<<<<<<< HEAD
+=======
+
+>>>>>>> v1.3
      activityList.value = res.data.records.filter((item) => {
        return (
          item.requestTable == 'wor_service_request' ||
@@ -424,10 +470,23 @@ function handleServiceCategoryChange(value) {
 function handlePatientSelect(row) {
  loading.value = true;
  currentPatient.value = row;
+  getAdjustPriceSwitchState().then((res) => {
+    if (res.data) {
+      lotNumberMatch({ encounterIdList: row.encounterId }).then(() => {
+        getAllList(row);
+      });
+    } else {
+      getAllList(row);
+    }
+  });
+}
+
+function getAllList(row) {
  getDisposalList(row.encounterId).then((res) => {
    deviceList.value = res.data.records.filter((item) => {
      return item.requestTable == 'wor_device_request';
    });
+    console.log('耗材列表=====>', JSON.stringify(deviceList.value));
    activityList.value = res.data.records.filter((item) => {
      return (
        item.requestTable == 'wor_service_request' || item.requestTable == 'med_medication_request'
@@ -478,6 +537,47 @@ function handleBatchValidate(type) {
        };
      });

+<<<<<<< HEAD
+=======
+// 批量操作校验
+function handleBatchValidate(type) {
+  let params = [];
+  // 是否批量选择了数据
+  if (isMultiple.value) {
+    proxy.$modal.msgError('请选择要执行的项目');
+    return;
+  }
+  if (type === 'execute') {
+    let activityList = activitySelectedList.value
+      .filter((item) => {
+        return item.chargeStatus === 5;
+      })
+      .map((item) => {
+        return {
+          requestId: item.requestId,
+          dispenseId: item.dispenseId,
+          requestTable: item.requestTable,
+          chargeStatus: item.chargeStatus_enumText,
+          dispenseStatus: item.dispenseStatus_enumText,
+          name: item.itemName,
+        };
+      });
+    let deviceList = deviceSelectedList.value
+      .filter((item) => {
+        return item.dispenseStatus === 2;
+      })
+      .map((item) => {
+        return {
+          requestId: item.requestId,
+          dispenseId: item.dispenseId,
+          requestTable: item.requestTable,
+          chargeStatus: item.chargeStatus_enumText,
+          dispenseStatus: item.dispenseStatus_enumText,
+          name: item.itemName,
+        };
+      });
+
+>>>>>>> v1.3
    return [...activityList, ...deviceList];
  } else if (type === 'cancel') {
    let list = [...activitySelectedList.value, ...deviceSelectedList.value];
@@ -642,6 +742,26 @@ function printPrescription() {
    }); //开始打印
  });
 }
+<<<<<<< HEAD
+=======
+// 查看本次就诊处方单
+function getEnPrescription() {
+  getEnPrescriptionInfo({ encounterId: currentPatient.value.encounterId }).then((res) => {
+    console.log('处方单 res', res);
+    let dataArr = res.data.records || [];
+    if (dataArr.length <= 0) {
+      ElMessage({
+        type: 'error',
+        message: '暂无处方单',
+      });
+      return;
+    }
+    prescriptionInfo.value = res.data.records;
+    openPrescriptionDialog.value = true;
+  });
+}
+
+>>>>>>> v1.3
 // 打印处置单
 function printDisposal() {
  let requestIds = deviceActivityList.value
@@ -749,7 +869,104 @@ function handleCancel(row) {
  });
 }
 // 打印瓶贴
+<<<<<<< HEAD
 function printBottleLabel() {
+=======
+// function printBottleLabel() {
+//   let result = [];
+//   // 过滤出全部输液药品
+//   let selectRows = activityListRef.value.getSelectionRows();
+//   let printLiist = [];
+//   // 有选中的优先打印选中行，没有的话打印全部的输液药品
+//   if (selectRows.length > 0) {
+//     printLiist = selectRows.filter((item) => {
+//       return item.medCategory == '2' || item.medCategory == '1';
+//     });
+//   } else {
+//     printLiist = activityList.value.filter((item) => {
+//       return item.medCategory == '2' || item.medCategory == '1';
+//     });
+//   }
+//   // 按照groupId分组，但将多天的项目展开为独立项目
+//   let expandedList = [];
+
+//   printLiist.forEach((item) => {
+//     // 如果用药天数大于1，则创建多个项目
+//     if (item.dispensePerDuration && item.dispensePerDuration > 1) {
+//       // 为每一天创建一个项目
+//       for (let i = 0; i < item.dispensePerDuration; i++) {
+//         // 克隆项目并调整数量
+//         const clonedItem = {
+//           ...item,
+//           // 数量除以天数
+//           quantity: item.quantity ? item.quantity / item.dispensePerDuration : item.quantity,
+//           // 可以添加一个字段表示是第几天
+//           dayIndex: i + 1,
+//           totalDays: item.dispensePerDuration,
+//           data: item.itemName + ' ' + item.size + ' ' + item.methodCode_dictText,
+//         };
+
+//         // 获取当前时间做执行日期，如果用药天数大于1，依次累加
+//         const date = new Date();
+//         date.setDate(date.getDate() + i);
+//         clonedItem.performDateTime = formatDateStr(date, 'YYYY-MM-DD');
+
+//         // 将克隆的项目添加到展开列表中，不按groupId分组
+//         expandedList.push(clonedItem);
+//       }
+//     } else {
+//       // 天数为1或没有设置天数，直接使用原项目
+//       item.data = item.itemName + ' ' + item.size + ' ' + item.methodCode_dictText;
+//       expandedList.push(item);
+//     }
+//   });
+
+//   // 重新按groupId分组，但每个展开的项目都是独立的
+//   const groupedByGroupId = expandedList.reduce((acc, item) => {
+//     // 为展开的项目生成新的唯一groupId
+//     const groupId = item.dayIndex
+//       ? `${item.groupId || item.requestId}_day${item.dayIndex}`
+//       : item.groupId || item.requestId;
+
+//     if (!acc[groupId]) {
+//       acc[groupId] = [];
+//     }
+//     acc[groupId].push(item);
+//     return acc;
+//   }, {});
+//   const resultList = Object.values(groupedByGroupId);
+//   console.log(resultList, '23456789');
+
+//   result = resultList.map((item) => {
+//     return {
+//       patientName: currentPatient.value.patientName,
+//       prepareName: userStore.nickName,
+//       genderEnum_enumText: currentPatient.value.genderEnum_enumText,
+//       age: currentPatient.value.age,
+//       date: item[0].performDateTime,
+//       infuseData: item,
+//     };
+//   });
+//   const printElements = templateJson;
+//   var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+//   console.log(result, '打印机列表');
+//   hiprintTemplate.print2(result, {
+//     // printer: 'Xprinter XP-365B',
+//     height: 210,
+//     width: 148,
+//   });
+//   // 直接打印回调
+//   // 发送任务到打印机成功
+//   hiprintTemplate.on('printSuccess', function (e) {
+//     console.log('打印成功');
+//   });
+//   // 发送任务到打印机失败
+//   hiprintTemplate.on('printError', function (e) {
+//     console.log('打印失败');
+//   });
+// }
+async function printBottleLabel() {
+>>>>>>> v1.3
  let result = [];
  // 过滤出全部输液药品
  let selectRows = activityListRef.value.getSelectionRows();
@@ -795,6 +1012,9 @@ function printBottleLabel() {
      // 天数为1或没有设置天数，直接使用原项目
      item.data = item.itemName + ' ' + item.size + ' ' + item.methodCode_dictText;
      expandedList.push(item);
+      //将当前时间传到expandedList中
+      const date = new Date();
+      item.performDateTime = formatDateStr(date, 'YYYY-MM-DD');
    }
  });

@@ -815,6 +1035,7 @@ function printBottleLabel() {
  console.log(resultList, '23456789');

  result = resultList.map((item) => {
+    console.log(item, '111323item');
    return {
      patientName: currentPatient.value.patientName,
      prepareName: userStore.nickName,
@@ -824,6 +1045,7 @@ function printBottleLabel() {
      infuseData: item,
    };
  });
+<<<<<<< HEAD
  const printElements = templateJson;
  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
  console.log(result, '打印机列表');
@@ -832,15 +1054,39 @@ function printBottleLabel() {
    height: 210,
    width: 148,
  });
+=======
+  console.log(result, '打印数据');
+  await simplePrint(PRINT_TEMPLATE.OUTPATIENT_INFUSION, result);
+  // console.log('打印成功');
+  // const printElements = templateJson;
+  // var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+  // console.log(result, '打印机列表');
+  // hiprintTemplate.print2(result, {
+  //   height: 210,
+  //   width: 148,
+  // });
+>>>>>>> v1.3
  // 直接打印回调
  // 发送任务到打印机成功
-  hiprintTemplate.on('printSuccess', function (e) {
-    console.log('打印成功');
-  });
-  // 发送任务到打印机失败
-  hiprintTemplate.on('printError', function (e) {
-    console.log('打印失败');
-  });
+  // hiprintTemplate.on('printSuccess', function (e) {
+  //   console.log('打印成功');
+  // });
+  // // 发送任务到打印机失败
+  // hiprintTemplate.on('printError', function (e) {
+  //   console.log('打印失败');
+  // });
+}
+
+// 选择框改变时的处理
+function handleSelectionChange(selection, row) {
+  const isSelected = selection.some((item) => item.requestId === row.requestId);
+  activityList.value
+    .filter((item) => {
+      return item.groupId && item.groupId == row?.groupId;
+    })
+    .forEach((row) => {
+      activityListRef.value.toggleRowSelection(row, isSelected);
+    });
 }

 // 选择框改变时的处理
@@ -1039,4 +1285,8 @@ function getRecord(row) {
 :deep(.el-table__body) tr:hover td.no-hover-column {
  background-color: inherit !important;
 }
-</style>
+<<<<<<< HEAD
+</style>
+=======
+</style>
+>>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
@@ -12,6 +12,16 @@
            width="100"
          />
          <el-table-column label="门诊号" align="center" prop="iptOtpNo" />
+          <el-table-column label="患者姓名" align="center" prop="patnName" />
+          <el-table-column label="身份证号" align="center" prop="certno" />
+          <el-table-column label="诊断名" align="center" prop="conditionName" />
+          <el-table-column
+            label="慢性诊断名"
+            align="center"
+            prop="specialConditionName"
+            width="180"
+          />
+
          <el-table-column label="请求数量" align="center" prop="quantity" />
          <el-table-column label="请求单位" align="center" prop="unitCode" />
          <el-table-column label="审核状态" align="center" prop="statusEnum_enumText" />
@@ -38,8 +48,7 @@
          <el-table-column label="给药间隔" align="center" prop="dispenseInterval" />
          <el-table-column label="单次发药数" align="center" prop="dispensePerQuantity" />
          <el-table-column label="每次发药供应天数" align="center" prop="dispensePerDuration" />
-          <el-table-column label="患者姓名" align="center" prop="patnName" />
-          <el-table-column label="身份证号" align="center" prop="certno" />
+
          <el-table-column label="开方医生名" align="center" prop="practitionerName" />
          <el-table-column label="挂号科室" align="center" prop="mdtrtDeptName" />
          <el-table-column label="开单科室" align="center" prop="prscDeptName" />
@@ -53,7 +62,6 @@
              {{ formatDate(scope.row.prscTime) }}
            </template>
          </el-table-column>
-          <el-table-column label="诊断名" align="center" prop="conditionName" />
        </el-table>
        <!-- <pagination
          v-show="total > 0"
--- a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
@@ -27,7 +27,11 @@
          <span>CF0000000001</span>
        </div>
        <div style="text-align: center">
+<<<<<<< HEAD
          <h2>长春大学医院</h2>
+=======
+          <h2>长春市朝阳区中医院医院</h2>
+>>>>>>> v1.3
        </div>
        <div style="text-align: center">
          <h3>处方单</h3>
@@ -235,4 +239,4 @@ getList();
  width: 80px;
  display: inline-block;
 }
-</style>
+</style>
--- a/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
@@ -8,32 +8,73 @@
        </div>
      </template>
      <div style="width: 100%">
-        <el-input v-model="queryParams.searchKey" placeholder="搜索患者"
-          style="width: 48%; margin-bottom: 10px; margin-right: 15px" @keyup.enter="getEncounterList">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="搜索患者"
+          style="width: 48%; margin-bottom: 10px; margin-right: 15px"
+          @keyup.enter="getEncounterList"
+        >
          <template #append>
            <el-button icon="Search" @click="getEncounterList" />
          </template>
        </el-input>
-        <el-select v-model="queryParams.refundEnum" style="width: 48%; margin-bottom: 10px" placeholder="收费状态"
-          @change="getEncounterList">
-          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+        <el-select
+          v-model="queryParams.refundEnum"
+          style="width: 48%; margin-bottom: 10px"
+          placeholder="收费状态"
+          @change="getEncounterList"
+        >
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
        </el-select>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
-          style="width: 85%; margin-bottom: 10px" value-format="YYYY-MM-DD" placement="bottom"
-          @change="getEncounterList" />
-        <el-button type="primary" @click="getEncounterList" style="margin-bottom: 10px; margin-left: 18px">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 85%; margin-bottom: 10px"
+          value-format="YYYY-MM-DD"
+          placement="bottom"
+          @change="getEncounterList"
+        />
+        <el-button
+          type="primary"
+          @click="getEncounterList"
+          style="margin-bottom: 10px; margin-left: 18px"
+        >
          搜索
        </el-button>
      </div>
-      <el-table :data="encounterList" border style="width: 100%" height="calc(100vh - 300px)" highlight-current-row
-        @cell-click="handleGetReturnDrugList">
-        <el-table-column prop="patientName" align="center" label="姓名" width="130" show-overflow-tooltip />
-        <el-table-column prop="genderEnum_enumText" align="center" label="性别" show-overflow-tooltip />
+      <el-table
+        :data="encounterList"
+        border
+        style="width: 100%"
+        height="calc(100vh - 300px)"
+        highlight-current-row
+        @cell-click="handleGetReturnDrugList"
+      >
+        <el-table-column
+          prop="patientName"
+          align="center"
+          label="姓名"
+          width="130"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="genderEnum_enumText"
+          align="center"
+          label="性别"
+          show-overflow-tooltip
+        />
        <el-table-column align="center" width="140" label="就诊日期" show-overflow-tooltip>
          <template #default="scope">
            {{
-          scope.row.receptionTime ? formatDateStr(scope.row.receptionTime, 'YYYY-MM-DD') : '-'
-        }}
+              scope.row.receptionTime ? formatDateStr(scope.row.receptionTime, 'YYYY-MM-DD') : '-'
+            }}
          </template>
        </el-table-column>
        <!-- <el-table-column label="状态" align="center" prop="refundEnum_enumText" /> -->
@@ -52,16 +93,35 @@
        </div>
      </template>

-      <el-button type="primary" :disabled="!selectedMedicines.length" @click="handleReturnDrug(undefined)"
-        style="margin-bottom: 10px">
+      <el-button
+        type="primary"
+        :disabled="!selectedMedicines.length"
+        @click="handleReturnDrug(undefined)"
+        style="margin-bottom: 10px"
+      >
        确认退药
      </el-button>
      <el-button type="primary" @click="handleScan()" style="margin-bottom: 10px"> 扫码 </el-button>
-      <el-table ref="returnDrugRef" :data="returDrugList" style="width: 100%" height="calc(100vh - 300px)" border
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+      <el-table
+        ref="returnDrugRef"
+        :data="returDrugList"
+        style="width: 100%"
+        height="calc(100vh - 300px)"
+        border
+        @select="handleSelection"
+        @selection-change="handelSelectRows"
+        :span-method="handelSpanMethod"
+        class="no-hover-table"
+      >
+        <el-table-column type="selection" width="55" align="center" />
        <el-table-column prop="itemName" label="药品名称" show-overflow-tooltip align="center" />
-        <el-table-column prop="totalPrice" label="总价" width="100" align="right" header-align="center">
+        <el-table-column
+          prop="totalPrice"
+          label="总价"
+          width="100"
+          align="right"
+          header-align="center"
+        >
          <template #default="scope">
            {{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) + ' 元' : '-' }}
          </template>
@@ -74,29 +134,30 @@
        </el-table-column>
        <el-table-column prop="reqStatus_enumText" label="退药状态" width="100" align="center">
          <template #default="scope">
-            {{
-          scope.row.reqStatus_enumText == null
-            ? scope.row.refundEnum_enumText
-            : scope.row.reqStatus_enumText
-        }}
+            {{ scope.row.refundEnum_enumText }}
          </template>
        </el-table-column>
        <el-table-column prop="waitingQuantity" label="退药数量" width="100" align="center">
          <template #default="scope">
            <span>{{
-          scope.row.quantity
-            ? Math.abs(scope.row.quantity)
-            : '0' + ' ' + scope.row.unitCode_dictText
-        }}</span>
+              scope.row.quantity
+                ? Math.abs(scope.row.quantity) + ' ' + scope.row.unitCode_dictText
+                : '0' + ' ' + scope.row.unitCode_dictText
+            }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="doctorName" label="开单医生" align="center" width="180" />
        <el-table-column label="操作" width="100" align="center" fixed="right">
          <template #default="scope">
-            <el-popconfirm width="150" hide-after="10" title="操作确认" placement="top-start"
-              @confirm="handleReturnDrug(scope.row)">
+            <el-popconfirm
+              width="150"
+              hide-after="10"
+              title="操作确认"
+              placement="top-start"
+              @confirm="handleReturnDrug(scope.row)"
+            >
              <template #reference>
-                <el-button type="primary" link :disabled="scope.row.reqStatus != 11">
+                <el-button type="primary" link :disabled="scope.row.refundEnum != 16">
                  退药
                </el-button>
              </template>
@@ -113,13 +174,17 @@
        </div>
      </div>
    </el-card>
-    <TraceNoDialog :ypName="ypName" :openDialog="openTraceNoDialog" @submit="submit"
-      @cancel="openTraceNoDialog = false" />
+    <TraceNoDialog
+      :ypName="ypName"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      @cancel="openTraceNoDialog = false"
+    />
  </div>
 </template>

 <script setup name="ReturnDrug">
-import { getCurrentInstance } from 'vue';
+import { getCurrentInstance, nextTick } from 'vue';
 import { getList, getReturnDrugList, returnDrug, init, itemTraceNo } from './components/api';
 import { formatDateStr } from '@/utils/index';
 import { debounce } from 'lodash-es';
@@ -128,7 +193,7 @@ import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 const queryParams = ref({
  pageSize: 50,
  pageNum: 1,
-  refundEnum: 5,
+  refundEnum: 16,
 });
 const openTraceNo = ref(false);
 const traceNoList = ref([]);
@@ -138,8 +203,10 @@ const encounterId = ref('');
 const returDrugList = ref([]);
 const selectedMedicines = ref([]);
 const statusOptions = ref([]);
-const dateRange = ref([formatDateStr(new Date(), 'YYYY-MM-DD'),
-formatDateStr(new Date(), 'YYYY-MM-DD'),]);
+const dateRange = ref([
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+  formatDateStr(new Date(), 'YYYY-MM-DD'),
+]);
 const traceNoTemp = ref('');
 const traceNoTempRef = ref();
 const totalAmount = ref(0);
@@ -226,14 +293,16 @@ function handleReturnDrug(row) {
  console.log(row);
  let saveList = [];
  if (row) {
-    saveList = [
-      {
-        requestId: row.requestId,
-        dispenseId: row.dispenseId,
-        tableName: row.serviceTable,
-        traceNo: row.traceNo,
-      },
-    ];
+    saveList = returDrugList.value
+      .filter((item) => item.requestId == row.requestId)
+      .map((item) => {
+        return {
+          requestId: item.requestId,
+          dispenseId: item.dispenseId,
+          tableName: item.serviceTable,
+          traceNo: item.traceNo,
+        };
+      });
  } else {
    saveList = proxy.$refs.returnDrugRef.getSelectionRows().map((item) => {
      return {
@@ -248,7 +317,7 @@ function handleReturnDrug(row) {
  returnDrug(saveList).then((res) => {
    if (res.code === 200) {
      proxy.$modal.msgSuccess('退药成功');
-      getEncounterList()
+      getEncounterList();
      getReturnDrugList({
        encounterId: encounterId.value,
        refundStatus: queryParams.value.refundEnum,
@@ -259,12 +328,79 @@ function handleReturnDrug(row) {
  });
 }

-function handleSelectionChange(selectRows) {
-  selectedMedicines.value = selectRows;
-  totalAmount.value = selectRows.reduce((accumulator, currentRow) => {
+// 选择框改变时的处理
+function handleSelection(selection, row) {
+  const isSelected = selection.some((item) => item.dispenseId === row.dispenseId);
+  returDrugList.value
+    .filter((item) => {
+      return item.requestId == row.requestId;
+    })
+    .forEach((row) => {
+      proxy.$refs['returnDrugRef'].toggleRowSelection(row, isSelected);
+    });
+  nextTick(() => {
+    selectedMedicines.value = proxy.$refs['returnDrugRef'].getSelectionRows();
+    totalAmount.value = selectedMedicines.value.reduce((accumulator, currentRow) => {
+      return accumulator + (currentRow.totalPrice || 0);
+    }, 0);
+  });
+}
+
+function handelSelectRows(selection) {
+  selectedMedicines.value = selection;
+  totalAmount.value = selectedMedicines.value.reduce((accumulator, currentRow) => {
    return accumulator + (currentRow.totalPrice || 0);
  }, 0);
 }
+
+// 根据 requestId 合并相同行的方法（只合并药品名称和总价列）
+function handelSpanMethod({ row, column, rowIndex, columnIndex }) {
+  // 定义需要合并的列索引
+  // 1: 药品名称列, 2: 总价列
+  const mergeColumns = [1, 2, 5, 7, 8];
+
+  // 检查当前列是否需要合并
+  if (!mergeColumns.includes(columnIndex)) {
+    return [1, 1];
+  }
+
+  // 获取当前行的 requestId
+  const currentRequestId = row.requestId;
+
+  // 如果没有 requestId，不进行合并
+  if (!currentRequestId) {
+    return [1, 1];
+  }
+
+  // 查找具有相同 requestId 的连续行
+  let rowspan = 1;
+  let colspan = 1;
+
+  // 向上查找相同 requestId 的行
+  let startIndex = rowIndex;
+  while (startIndex > 0 && returDrugList.value[startIndex - 1].requestId === currentRequestId) {
+    startIndex--;
+    rowspan++;
+  }
+
+  // 如果当前行不是合并组的第一行，则不显示
+  if (startIndex !== rowIndex) {
+    return [0, 0];
+  }
+
+  // 向下查找相同 requestId 的行
+  let endIndex = rowIndex;
+  while (
+    endIndex < returDrugList.value.length - 1 &&
+    returDrugList.value[endIndex + 1].requestId === currentRequestId
+  ) {
+    endIndex++;
+    rowspan++;
+  }
+
+  // 只有当 rowspan > 1 时才进行合并
+  return rowspan > 1 ? [rowspan, colspan] : [1, 1];
+}
 </script>

 <style lang="scss" scoped>
@@ -339,4 +475,8 @@ function handleSelectionChange(selectRows) {
 ::v-deep.el-textarea .el-textarea__inner {
  resize: none !important;
 }
+
+:deep(.no-hover-table) .el-table__body tr:hover > td {
+  background: inherit !important;
+}
 </style>
--- a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/component/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/component/api.js
@@ -1,34 +1,77 @@
-import request from '@/utils/request'
+import request from '@/utils/request';

-export function listSkinRecord(query) {
+/**
+ * 获取患者列表
+ */
+export function getList(queryParams) {
  return request({
-    url: '/outpatient-manage/skin-test/outpatient-record-page',
+    url: '/outpatient-manage/treatment/encounter-list',
    method: 'get',
-    params: query
-  })
+    params: queryParams,
+  });
 }

+/**
+ * 获取皮试记录列表
+ */
+export function listSkinRecord(queryParams) {
+  return request({
+    url: '/outpatient-manage/skin-test/record-info',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+/**后台没有对应接口，暂无
+ * 更新护士签名
+ */
+export function updateNurseSign(data) {
+  return request({
+    url: '/outpatient-manage/skin-test/nurse-sign',
+    method: 'put',
+    data: data,
+  });
+}
+
+/**
+ * 更新皮试记录
+ */
+export function updateSkinTestRecord(data) {
+  return request({
+    url: '/outpatient-manage/skin-test/save-record-info',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 初始化选项
+ */
 export function lists() {
  return request({
    url: '/outpatient-manage/skin-test/init',
    method: 'get',
-  })
+  });
 }

+/**
+ * 获取护士列表
+ */
+export function getNurseList(queryParams) {
+  return request({
+    url: '/app-common/nurse-list',
+    method: 'get',
+    params: queryParams,
+  });
+}

-export function updateSkinTestRecord(data) {
-    return request({
-      url: '/outpatient-manage/skin-test/outpatient-record-skin-test',
-      method: 'put',
-      data: data
-    })
-  }
-
-  
-  export function updateNurseSign(data) {
-      return request({
-        url: '/outpatient-manage/skin-test/outpatient-record-sign-check',
-        method: 'put',
-        data: data
-      })
-    }
+/**
+ * 新增皮试记录
+ */
+export function addSkinTestRecord(data) {
+  return request({
+    url: '/outpatient-manage/skin-test/save-record-info',
+    method: 'post',
+    data: data,
+  });
+}
--- a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue