diff --git a/.env.cas b/.env.cas
new file mode 100644
index 0000000..ab26350
--- /dev/null
+++ b/.env.cas
@@ -0,0 +1,16 @@
+# 页面标题
+VITE_APP_TITLE = 平安水电
+
+# CAS 专用构建环境（生产模式）
+VITE_APP_ENV = production
+
+# 生产环境后端前缀
+VITE_APP_BASE_API = '/prod-api'
+
+# 启用 gzip 压缩
+VITE_BUILD_COMPRESS = gzip
+
+# CAS 配置（启用CAS模式打包）
+VITE_APP_CAS_ENABLE = true
+VITE_APP_CAS_SERVER_URL = https://rsso.gxsdxy.cn
+VITE_APP_CAS_VALIDATE_URL = https://rsso.gxsdxy.cn/p3/serviceValidate
\ No newline at end of file
diff --git a/.env.production b/.env.production
index ae3f82e..3b751b2 100644
--- a/.env.production
+++ b/.env.production
@@ -2,10 +2,15 @@
 VITE_APP_TITLE = 平安水电
 
 # 生产环境配置
-VITE_APP_ENV = 'production'
+VITE_APP_ENV = production
 
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
\ No newline at end of file
+VITE_BUILD_COMPRESS = gzip
+
+# CAS 配置（非CAS模式打包）
+VITE_APP_CAS_ENABLE = false
+VITE_APP_CAS_SERVER_URL = https://rsso.gxsdxy.cn
+VITE_APP_CAS_VALIDATE_URL = https://rsso.gxsdxy.cn/p3/serviceValidate
\ No newline at end of file
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index a050a4b..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/package.json b/package.json
index 34c6e77..d28e7fd 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,14 @@
   "name": "ruoyi",
   "version": "3.8.8",
   "description": "平安水电",
-  "author": "若依",
+  "author": "厚溥",
   "license": "MIT",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build:prod": "vite build",
     "build:stage": "vite build --mode staging",
+    "build:cas": "vite build --mode cas",
     "preview": "vite preview"
   },
   "repository": {
diff --git a/src/api/healthcare/outpatientService/patientDiagnosis.js b/src/api/healthcare/outpatientService/patientDiagnosis.js
index cfa3f0c..0c4bd59 100644
--- a/src/api/healthcare/outpatientService/patientDiagnosis.js
+++ b/src/api/healthcare/outpatientService/patientDiagnosis.js
@@ -1,23 +1,30 @@
 import request from '@/utils/request'
 
-// 查询患者诊断信息列表
+const defaultYearDate = () => new Date()
+const withYearDate = (query) => ({
+  yearDate: (query && query.yearDate) || defaultYearDate(),
+  ...(query || {})
+})
+
+// 查询患者诊断信息列�?
 export function listPatientDiagnosis(query) {
   return request({
     url: '/outpatientService/patientDiagnosis/list',
     method: 'get',
-    params: query
+    params: withYearDate(query)
   })
 }
 
-// 查询患者诊断信息详细
+// 查询患者诊断信息详�?
 export function getPatientDiagnosis(id) {
   return request({
     url: '/outpatientService/patientDiagnosis/getInfo/' + id,
-    method: 'get'
+    method: 'get',
+    params: { yearDate: defaultYearDate() }
   })
 }
 
-// 新增患者诊断信息
+// 新增患者诊断信�?
 export function addPatientDiagnosis(data) {
   return request({
     url: '/outpatientService/patientDiagnosis/add',
@@ -26,7 +33,7 @@ export function addPatientDiagnosis(data) {
   })
 }
 
-// 修改患者诊断信息
+// 修改患者诊断信�?
 export function updatePatientDiagnosis(data) {
   return request({
     url: '/outpatientService/patientDiagnosis/update',
@@ -35,11 +42,12 @@ export function updatePatientDiagnosis(data) {
   })
 }
 
-// 删除患者诊断信息
+// 删除患者诊断信�?
 export function delPatientDiagnosis(id) {
   return request({
     url: '/outpatientService/patientDiagnosis/remove/' + id,
-    method: 'get'
+    method: 'get',
+    params: { yearDate: defaultYearDate() }
   })
 }
 
@@ -58,7 +66,7 @@ export function gainDrugPriceList(query) {
   return request({
     url: '/outpatientService/patientDiagnosis/gainDrugPriceList',
     method: 'get',
-    params: query
+    params: withYearDate(query)
   })
 }
 
@@ -67,6 +75,7 @@ export function gainDrugNameList() {
   return request({
     url: '/outpatientService/patientDiagnosis/gainMedicineNameList',
     method: 'get',
+    params: { yearDate: defaultYearDate() },
   })
 }
 
@@ -75,6 +84,7 @@ export function gainDrugNameListName(name) {
   return request({
     url: '/outpatientService/patientDiagnosis/gainMedicineNameListName?name=' + name,
     method: 'get',
+    params: { yearDate: defaultYearDate() },
   })
 }
 
@@ -83,7 +93,7 @@ export function gainMedicineArchiveList(query) {
   return request({
     url: '/outpatientService/patientDiagnosis/gainMedicineArchiveList',
     method: 'get',
-    params: query
+    params: withYearDate(query)
   })
 }
 
@@ -92,27 +102,29 @@ export function gainDrugInventoryList(query) {
   return request({
     url: '/outpatientService/patientDiagnosis/gainDrugInventoryList',
     method: 'get',
-    params: query
+    params: withYearDate(query)
   })
 }
 
-// 修改患者诊断状态 ( 修改为 已发药 )
+// 修改患者诊断状�?( 修改�?已发�?)
 export function deliverMedicine(id) {
   return request({
     url: '/outpatientService/patientDiagnosis/deliverMedicine/' + id,
-    method: 'get'
+    method: 'get',
+    params: { yearDate: defaultYearDate() }
   })
 }
 
-// 修改患者诊断状态 ( 修改为 已退药 )
+// 修改患者诊断状�?( 修改�?已退�?)
 export function returnedMedication(id) {
   return request({
     url: '/outpatientService/patientDiagnosis/returnedMedication/' + id,
-    method: 'get'
+    method: 'get',
+    params: { yearDate: defaultYearDate() }
   })
 }
 
-// 保存 患者 诊断 信息
+// 保存 患�?诊断 信息
 export function saveDiagnosis(data) {
   return request({
     url: '/outpatientService/patientDiagnosis/save',
@@ -121,7 +133,7 @@ export function saveDiagnosis(data) {
   })
 }
 
-// 保存 变成 待发  修改 库存  患者 诊断 信息
+// 保存 变成 待发  修改 库存  患�?诊断 信息
 export function saveAddDiagnosis(data) {
   return request({
     url: '/outpatientService/patientDiagnosis/saveAddDiagnosis',
@@ -130,7 +142,7 @@ export function saveAddDiagnosis(data) {
   })
 }
 
-// 保存 修改 患者 诊断 信息
+// 保存 修改 患�?诊断 信息
 export function saveUpdate(data) {
   return request({
     url: '/outpatientService/patientDiagnosis/saveUpdate',
@@ -145,6 +157,7 @@ export function gainPatientDiagnosisListXml() {
   return request({
     url: '/outpatientService/patientDiagnosis/gainPatientDiagnosisListXml',
     method: 'get',
+    params: { yearDate: defaultYearDate() },
   })
 }
 
@@ -153,6 +166,7 @@ export function gainPatientDiagnosisListTotalPriceXml() {
   return request({
     url: '/outpatientService/patientDiagnosis/gainPatientDiagnosisListTotalPriceXml',
     method: 'get',
+    params: { yearDate: defaultYearDate() },
   })
 }
 
@@ -164,7 +178,7 @@ export function obtainSymptomStatisticsNumber(query) {
   return request({
     url: '/outpatientService/patientDiagnosis/obtainSymptomStatisticsNumber',
     method: 'get',
-    params: query
+    params: withYearDate(query)
   })
 }
 
@@ -174,15 +188,33 @@ export function obtainSymptomStatisticsNumberMonth(query) {
   return request({
     url: '/outpatientService/patientDiagnosis/obtainSymptomStatisticsNumberMonth',
     method: 'get',
-    params: query
+    params: withYearDate(query)
   })
 }
-// 调用后端的代码判断是否可用医保
-export function verifyInsuranceStatus(idCard,name) {
+// 调用后端的代码判断是否可用医�?
+export function verifyInsuranceStatus(idCard, name) {
   return request({
     url: '/outpatientService/patientDiagnosis/verify',
     method: 'get',
-    params: { idCard,name}
+    params: withYearDate({ idCard, name })
+  })
+}
+
+// 获取历史医保报销累计金额（按患者ID�?
+export function getHistoryReimbursement(patientId, yearDate = new Date()) {
+  return request({
+    url: '/outpatientService/patientDiagnosis/getHistoryReimbursementByYear',
+    method: 'get',
+    params: { patientId, yearDate }
+  })
+}
+
+// 发药更正：仅调整医保与报销比率
+export function adjustBasic(data) {
+  return request({
+    url: '/outpatientService/patientDiagnosis/adjustBasic',
+    method: 'post',
+    data: data
   })
 }
 
diff --git a/src/api/inspection/abnormal.js b/src/api/inspection/abnormal.js
new file mode 100644
index 0000000..6e1eb23
--- /dev/null
+++ b/src/api/inspection/abnormal.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询巡检异常列表
+export function listAbnormal(query) {
+  return request({
+    url: '/inspection/abnormal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询巡检异常详细
+export function getAbnormal(id) {
+  return request({
+    url: '/inspection/abnormal/' + id,
+    method: 'get'
+  })
+}
+
+// 新增巡检异常
+export function addAbnormal(data) {
+  return request({
+    url: '/inspection/abnormal',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改巡检异常
+export function updateAbnormal(data) {
+  return request({
+    url: '/inspection/abnormal',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除巡检异常
+export function delAbnormal(id) {
+  return request({
+    url: '/inspection/abnormal/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/inspection/report.js b/src/api/inspection/report.js
index 05a4b23..e9b3456 100644
--- a/src/api/inspection/report.js
+++ b/src/api/inspection/report.js
@@ -33,4 +33,93 @@ export function RoundList(query) {
           method: 'get',
           params: query
         })
-      }
\ No newline at end of file
+      }
+
+// 按天趋势统计
+export function trendDaily(query) {
+  return request({
+    url: '/inspection/report/trendDaily',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增：按天双序列
+export function trendDailyDual(query) {
+  return request({
+    url: '/inspection/report/trendDailyDual',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增：按月双序列
+export function trendMonthlyDual(query) {
+  return request({
+    url: '/inspection/report/trendMonthlyDual',
+    method: 'get',
+    params: query
+  })
+}
+
+// 巡检类型占比
+export function typeProportion(query) {
+  return request({
+    url: '/inspection/report/typeProportion',
+    method: 'get',
+    params: query
+  })
+}
+
+// 覆盖率统计
+export function coverage(query) {
+  return request({
+    url: '/inspection/report/coverage',
+    method: 'get',
+    params: query
+  })
+}
+
+// 未巡检点清单
+export function uninspectedPoints(query) {
+  return request({
+    url: '/inspection/report/uninspectedPoints',
+    method: 'get',
+    params: query
+  })
+}
+
+// 点位类型已巡检次数（distinct）
+export function pointTypeCounts(query) {
+  return request({
+    url: '/inspection/report/pointTypeCounts',
+    method: 'get',
+    params: query
+  })
+}
+
+// 点位状态分布
+export function statusDistribution() {
+  return request({
+    url: '/inspection/report/statusDistribution',
+    method: 'get'
+  })
+}
+
+// 巡检人统计（三合一：总/月/日）
+export function inspectorStats3(query) {
+  return request({
+    url: '/inspection/report/inspectorStats3',
+    method: 'get',
+    params: query
+  })
+}
+
+// 巡检点统计（三合一：总/月/日）
+export function pointStats3(query) {
+  return request({
+    url: '/inspection/report/pointStats3',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/login.js b/src/api/login.js
index 7b7388f..9cd0fcd 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -57,4 +57,18 @@ export function getCodeImg() {
     method: 'get',
     timeout: 20000
   })
+}
+
+// CAS 登录方法（通过请求参数传递 ticket 与 service）
+export function casLogin(data) {
+  return request({
+    url: '/cas/login',
+    headers: {
+      isToken: false,
+      repeatSubmit: false
+    },
+    method: 'post',
+    // 后端使用 @RequestParam 接收参数
+    params: data
+  })
 }
\ No newline at end of file
diff --git a/src/components/Healthcare/OutpatientService/DiagnosisInformation/index.vue b/src/components/Healthcare/OutpatientService/DiagnosisInformation/index.vue
index 9240047..2581b17 100644
--- a/src/components/Healthcare/OutpatientService/DiagnosisInformation/index.vue
+++ b/src/components/Healthcare/OutpatientService/DiagnosisInformation/index.vue
@@ -171,7 +171,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <!--  6 是否医保  医保率 -->
+            <!--  6 是否医保  报销比率 -->
             <el-row v-if="controlData[0].data[0].colList[0].rowList[5].display">
               <!-- 6 是否医保 -->
               <el-col v-if="controlData[0].data[0].colList[0].rowList[5].colList[0].display" :span="12">
@@ -187,16 +187,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- 6  医保率 -->
+              <!-- 6  报销比率 -->
               <el-col v-if="controlData[0].data[0].colList[0].rowList[5].colList[1].display" :span="12">
                 <el-form-item v-if="
                     controlData[0].data[0].colList[0].rowList[5].colList[1].data[0]
                       .display && form.isInsured == 0
-                  " label="医保率" prop="value">
+                  " label="报销比率" prop="value">
                   <el-input :disabled="
                       controlData[0].data[0].colList[0].rowList[5].colList[1].data[0]
                         .prohibit
-                    " @input="calculationWholeTotal()" v-model="form.value" clearable placeholder="请输入医保率" />
+                    " @input="calculationWholeTotal()" v-model="form.value" clearable placeholder="请输入报销比率" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -297,13 +297,27 @@
       </el-row>
       <!-- 处方 -->
       <el-row v-if="controlData[3].display" v-for="(index, item) in form.prescriptionDetailsList" :key="item">
-        <PrescriptionList :controlButton="controlButtonPrescriptionList" :controlData="controlDataPrescriptionList" v-model:prescriptionData="form.prescriptionDetailsList[item]" />
+        <PrescriptionList
+          :controlButton="controlButtonPrescriptionList"
+          :controlData="controlDataPrescriptionList"
+          v-model:prescriptionData="form.prescriptionDetailsList[item]"
+          :isInsured="form.isInsured"
+          :reimbursementRate="form.value"
+        />
       </el-row>
-      <!-- 展示总价和 -->
+      <!-- 汇总展示 -->
       <el-row>
         <el-col :span="24">
-          <div style="text-align: right; margin-top: 20px;color: red">
-            <span>所有药品总价和: {{ totalPriceSum }} 元</span>
+          <div style="text-align: right; margin-top: 20px; color: red">
+            <span>
+              应收金额：{{ form.isInsured === 0 ? patientPay : ceilPrice(totalPriceSum) }} 元
+            </span>
+            <span style="margin-left: 16px; color: #666">
+              处方总金额：{{ ceilPrice(totalPriceSum) }} 元
+            </span>
+            <span v-if="form.isInsured === 0" style="margin-left: 16px; color: #333">
+              预计报销：{{ Number(currentReimbursement).toFixed(2) }} 元
+            </span>
           </div>
         </el-col>
       </el-row>
@@ -321,6 +335,16 @@
 //
 const { proxy } = getCurrentInstance()
 
+// 价格向上取整到小数点后两位（进一法）
+// 先缩放到整数避免浮点精度问题
+function ceilPrice(value) {
+  const num = Number(value)
+  if (isNaN(num)) return '0.00'
+  const scaled = Math.round(num * 10000)
+  const cents = Math.ceil(scaled / 100)
+  return (cents / 100).toFixed(2)
+}
+
 // 患者类型
 const { healthcare_os_patient_type } = proxy.useDict('healthcare_os_patient_type')
 // os_patient_type
@@ -348,6 +372,8 @@ const form = ref({})
 const checkId = ref(0)
 
 const totalPriceSum = ref(0) //所有药品总价和
+const currentReimbursement = ref(0)
+const patientPay = ref(0)
 
 //
 const props = defineProps({
@@ -593,7 +619,7 @@ const props = defineProps({
                   {
                     id: 5,
                     name: 'el-row',
-                    description: '6 是否医保  医保率 ',
+                    description: '6 是否医保  报销比率 ',
                     display: true,
                     colList: [
                       {
@@ -614,12 +640,12 @@ const props = defineProps({
                       {
                         id: 1,
                         name: 'el-col',
-                        description: '6 医保率 col',
+                        description: '6 报销比率 col',
                         display: true,
                         data: [
                           {
                             id: 0,
-                            name: '医保率',
+                            name: '报销比率',
                             display: true,
                             prohibit: false
                           }
@@ -844,11 +870,24 @@ watch(
       // title.value = '患者诊断信息'
       // console.log('获取数据111111111111：', form.value)
       // 更新总价和
-      totalPriceSum.value = form.value.prescriptionDetailsList
+      totalPriceSum.value = ceilPrice(form.value.prescriptionDetailsList
         .reduce((sum, prescription) => {
           return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
-        }, 0)
-        .toFixed(2)
+        }, 0))
+      const insured = form.value?.isInsured
+      const sumNum = Number(totalPriceSum.value || 0)
+      if (insured === 0) {
+        const rate = Number(form.value?.value || 0) / 100
+        const r = isNaN(rate) ? 0 : rate
+        // 先计算个人应付（向上取整）
+        const pay = ceilPrice(sumNum * (1 - r))
+        patientPay.value = pay
+        // 预计报销 = 总价 - 个人应付
+        currentReimbursement.value = (sumNum - Number(pay)).toFixed(2)
+      } else {
+        currentReimbursement.value = '0.00'
+        patientPay.value = ceilPrice(sumNum)
+      }
     })
   }
 )
diff --git a/src/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts b/src/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts
index cfd21e4..cbe2624 100644
--- a/src/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts
+++ b/src/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts
@@ -238,7 +238,7 @@ export default function () {
                                     {
                                         id: 5,
                                         name: "el-row",
-                                        description: "6 是否医保  医保率 ",
+                                        description: "6 是否医保  报销比率 ",
                                         display: true,
                                         colList: [
                                             {
@@ -259,12 +259,12 @@ export default function () {
                                             {
                                                 id: 1,
                                                 name: "el-col",
-                                                description: "6 医保率 col",
+                                                description: "6 报销比率 col",
                                                 display: true,
                                                 data: [
                                                     {
                                                         id: 0,
-                                                        name: "医保率",
+                                                        name: "报销比率",
                                                         display: true,
                                                         prohibit: true,
                                                     },
@@ -679,7 +679,7 @@ export default function () {
                                     {
                                         id: 5,
                                         name: "el-row",
-                                        description: "6 是否医保  医保率 ",
+                                        description: "6 是否医保  报销比率 ",
                                         display: true,
                                         colList: [
                                             {
@@ -700,12 +700,12 @@ export default function () {
                                             {
                                                 id: 1,
                                                 name: "el-col",
-                                                description: "6 医保率 col",
+                                                description: "6 报销比率 col",
                                                 display: true,
                                                 data: [
                                                     {
                                                         id: 0,
-                                                        name: "医保率",
+                                                        name: "报销比率",
                                                         display: true,
                                                         prohibit: false,
                                                     },
diff --git a/src/components/Healthcare/OutpatientService/PatientDossier/index.vue b/src/components/Healthcare/OutpatientService/PatientDossier/index.vue
index e5abcaf..38a11a6 100644
--- a/src/components/Healthcare/OutpatientService/PatientDossier/index.vue
+++ b/src/components/Healthcare/OutpatientService/PatientDossier/index.vue
@@ -183,6 +183,7 @@ function selectValue(row) {
   if (row != null) {
     console.log('获取患者信息', row)
     const data = {
+      id: row.id,
       patientType: row.patientType,
       studentId: row.studentId,
       name: row.name,
diff --git a/src/components/Healthcare/OutpatientService/PrescriptionList/index.vue b/src/components/Healthcare/OutpatientService/PrescriptionList/index.vue
index 68e0ba6..d60d311 100644
--- a/src/components/Healthcare/OutpatientService/PrescriptionList/index.vue
+++ b/src/components/Healthcare/OutpatientService/PrescriptionList/index.vue
@@ -274,7 +274,7 @@
             },
           ]">
           <el-button :disabled="controlData[8].prohibit" width="100%" @click="selectDrugPriceInput(item, scope)">
-            {{ prescription[scope.$index].unitPrice.toFixed(2) }}
+            {{ Number(prescription[scope.$index].unitPrice || 0).toFixed(2) }}
           </el-button>
         </el-form-item>
       </template>
@@ -289,7 +289,13 @@
               trigger: controlData[9].check[0].trigger,
             },
           ]">
-          {{ prescription[scope.$index].totalPrice.toFixed(2) }}元
+          {{
+            Number(isInsured) === 0
+              ? ceilPrice(
+                  (parseFloat(prescription[scope.$index].totalPrice || 0) * (1 - (parseFloat(reimbursementRate || 0) / 100)))
+                )
+              : ceilPrice(prescription[scope.$index].totalPrice || 0)
+          }}元
         </el-form-item>
       </template>
     </el-table-column>
@@ -339,6 +345,16 @@ import { listCommonUsage, listEatingTime, listFrequency } from '@/api/healthcare
 
 const { proxy } = getCurrentInstance()
 
+// 价格向上取整到小数点后两位（进一法）
+// 先缩放到整数避免浮点精度问题
+function ceilPrice(value) {
+  const num = Number(value)
+  if (isNaN(num)) return '0.00'
+  const scaled = Math.round(num * 10000)
+  const cents = Math.ceil(scaled / 100)
+  return (cents / 100).toFixed(2)
+}
+
 const { os_patient_type } = proxy.useDict('os_patient_type')
 // os_patient_type
 const { os_diagnosis_type } = proxy.useDict('os_diagnosis_type')
@@ -390,6 +406,14 @@ const props = defineProps({
   prescriptionData: {
     type: Array
   },
+  isInsured: {
+    type: [Number, String],
+    default: 1
+  },
+  reimbursementRate: {
+    type: [Number, String],
+    default: 0
+  },
   // 控制 纽约 的 显示 隐藏
   controlButton: {
     type: Array,
@@ -891,11 +915,10 @@ function calculationTotal(index) {
   }
   console.log('totalPrice11111:', form.value.prescription)
   // 更新总价和
-  totalPriceSum.value = form.value.prescription
+  totalPriceSum.value = ceilPrice(form.value.prescription
     .reduce((sum, prescri) => {
       return sum + prescri.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
-    }, 0)
-    .toFixed(2)
+    }, 0))
 }
 
 // 药品 档案 弹框
diff --git a/src/components/ReportAnalytics/CircularDiagram.vue b/src/components/ReportAnalytics/CircularDiagram.vue
index f4d7d0e..c4e174e 100644
--- a/src/components/ReportAnalytics/CircularDiagram.vue
+++ b/src/components/ReportAnalytics/CircularDiagram.vue
@@ -4,7 +4,7 @@
 
 <script setup>
 import * as echarts from "echarts";
-import { nextTick, onMounted, ref } from "vue";
+import { nextTick, onMounted, onUnmounted, ref, watch } from "vue";
 import { listCircularDiagram } from "@/api/sidebar/reportAnalytics.js";
 import { defineProps } from "vue";
 
@@ -53,10 +53,12 @@ var option = {
 };
 
 //监听到有新值传入，调用函数重新渲染
-watch(props, newData => {
-  option.series.data = newData.data;
-  freshEchart();
-});
+watch(() => props.data, (newData) => {
+  if (chartInstance && newData) {
+    option.series[0].data = newData;
+    freshEchart();
+  }
+}, { deep: true });
 
 onMounted(async () => {
   await nextTick(); //确保dow已经渲染完成
diff --git a/src/components/ReportAnalytics/lineChart.vue b/src/components/ReportAnalytics/lineChart.vue
index 2a2c48b..c977831 100644
--- a/src/components/ReportAnalytics/lineChart.vue
+++ b/src/components/ReportAnalytics/lineChart.vue
@@ -69,18 +69,22 @@ var option = {
 };
 
 const getList = function() {
-  // 初始化ECharts实例并设置配置项（这里以折线图为例，但可灵活替换）
-  onMounted(async () => {
-    await nextTick(); // 确保DOM已经渲染完成
-    chartInstance = echarts.init(chartDom.value);
-  });
   listLineChartTable().then(res => {
     const seriesList = res.data;
     option.series[0].data = seriesList;
-    chartInstance.setOption(option);
+    if (chartInstance) {
+      chartInstance.setOption(option);
+    }
   });
 };
 
+// 初始化ECharts实例并设置配置项
+onMounted(async () => {
+  await nextTick(); // 确保DOM已经渲染完成
+  chartInstance = echarts.init(chartDom.value);
+  getList(); // 初始化后获取数据
+});
+
 // 销毁ECharts实例
 onUnmounted(() => {
   if (chartInstance != null && chartInstance.dispose) {
diff --git a/src/components/ReportAnalytics/reportCircularDiagram.vue b/src/components/ReportAnalytics/reportCircularDiagram.vue
index caa2370..c5ae574 100644
--- a/src/components/ReportAnalytics/reportCircularDiagram.vue
+++ b/src/components/ReportAnalytics/reportCircularDiagram.vue
@@ -4,7 +4,7 @@
 
 <script setup>
 import * as echarts from "echarts";
-import { nextTick, onMounted, ref } from "vue";
+import { nextTick, onMounted, onUnmounted, ref, watch } from "vue";
 import { listCircularDiagram } from "@/api/sidebar/reportAnalytics.js";
 import { defineProps } from "vue";
 
@@ -51,10 +51,12 @@ var option = {
 };
 
 //监听到有新值传入，调用函数重新渲染
-watch(props, newData => {
-  option.series.data = newData.data;
-  freshEchart();
-});
+watch(() => props.data, (newData) => {
+  if (chartInstance && newData) {
+    option.series[0].data = newData;
+    freshEchart();
+  }
+}, { deep: true });
 
 onMounted(async () => {
   await nextTick(); //确保dow已经渲染完成
diff --git a/src/components/drugFiling/index.vue b/src/components/drugFiling/index.vue
index bcee4e4..521d767 100644
--- a/src/components/drugFiling/index.vue
+++ b/src/components/drugFiling/index.vue
@@ -165,7 +165,16 @@ function loadArchives() {
 
     // 合并 archiveList 和 drugFilings
     mergedData.value = formattedRows.flatMap(row => [
-      { ...row, filingId: null },
+      {
+        ...row,
+        filingId: null,
+        packCount: row.packCount ?? 0,
+        inventoryUnit: row.inventoryUnit,
+        splitUnit: row.splitUnit,
+        minNumber: row.minNumber,
+        unitQuantity: row.minNumber ?? row.unitQuantity,
+        isSplit: row.isSplit
+      },
       ...row.drugFilings.map(filing => ({
         medicineName: row.medicineName,
         manufacturer: row.manufacturer,
@@ -174,11 +183,18 @@ function loadArchives() {
         batch: filing.batch,
         expiryDate: filing.expiryDate,
         boxCount: filing.boxCount,
+        packCount: filing.packCount,
         retailPrice: filing.retailPrice,
+        minPrice: filing.minPrice,
+        minNumber: filing.minNumber ?? row.minNumber,
+        unitQuantity: filing.minNumber ?? row.minNumber,
+        inventoryUnit: filing.inventoryUnit ?? row.inventoryUnit,
+        splitUnit: filing.splitUnit ?? row.splitUnit,
         filingId: filing.id,
         archiveId: row.id,
         storeroomId: filing.storeroomId,
-        storeroomName: filing.storeroomName
+        storeroomName: filing.storeroomName,
+        isSplit: row.isSplit
       }))
     ]);
 
@@ -251,4 +267,4 @@ function handlePagination(pagination) {
   justify-content: space-between;
   align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 1af604d..d60f945 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -49,6 +49,7 @@
 
 <script setup>
 import { ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
@@ -64,6 +65,7 @@ import useSettingsStore from '@/store/modules/settings'
 const appStore = useAppStore()
 const userStore = useUserStore()
 const settingsStore = useSettingsStore()
+const router = useRouter()
 
 function toggleSideBar() {
   appStore.toggleSideBar()
@@ -89,7 +91,7 @@ function logout() {
     type: 'warning'
   }).then(() => {
     userStore.logOut().then(() => {
-      location.href = '/index';
+      router.replace('/login')
     })
   }).catch(() => { });
 }
diff --git a/src/permission.js b/src/permission.js
index 4d495ac..257e4fa 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -11,7 +11,7 @@ import usePermissionStore from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login', '/register'];
+const whiteList = ['/login', '/register', '/cas-callback'];
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
diff --git a/src/router/index.js b/src/router/index.js
index 3c1a231..08a195a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,6 +47,11 @@ export const constantRoutes = [
     component: () => import('@/views/register'),
     hidden: true
   },
+  {
+    path: '/cas-callback',
+    component: () => import('@/views/cas-callback'),
+    hidden: true
+  },
   {
     path: "/:pathMatch(.*)*",
     component: () => import('@/views/error/404'),
@@ -90,6 +95,19 @@ export const constantRoutes = [
     component: () => import('@/views/healthcare/inventory/DrugFiling/index.vue'),
     hidden: true,
   },
+  // 巡检大屏
+  {
+    path: '/inspection/report/big-screen',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/inspection/report/bigScreen.vue'),
+        name: 'InspectionBigScreen',
+        meta: { title: '巡检大屏', icon: 'chart' }
+      }
+    ]
+  },
 ]
 
 // 动态路由，基于用户权限动态去加载
@@ -167,7 +185,8 @@ export const dynamicRoutes = [
 ]
 
 const router = createRouter({
-  history: createWebHistory(),
+  // 使用构建时的 BASE_URL 作为路由基础路径，以兼容 /srs/ 与 /cas/ 部署
+  history: createWebHistory(import.meta.env?.BASE_URL || '/'),
   routes: constantRoutes,
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
diff --git a/src/settings.js b/src/settings.js
index bc2fe76..07f34fa 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,7 +2,7 @@ export default {
   /**
    * 网页标题
    */
-  title: import.meta.env.VITE_APP_TITLE,
+  title: import.meta.env?.VITE_APP_TITLE || '平安水电',
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light
    */
@@ -43,5 +43,22 @@ export default {
    * The default is only used in the production env
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
-  errorLog: 'production'
+  errorLog: 'production',
+
+  /**
+   * CAS登录配置
+   */
+  // 是否启用CAS登录 (true: CAS登录模式, false: 传统登录模式)
+  casEnable: (import.meta.env?.VITE_APP_CAS_ENABLE || 'false') === 'true',
+  
+  // CAS服务器地址
+  casServerUrl: import.meta.env?.VITE_APP_CAS_SERVER_URL || 'https://rsso.gxsdxy.cn',
+
+  // CAS票据验证地址(CAS3默认 p3)
+  casValidateUrl: import.meta.env?.VITE_APP_CAS_VALIDATE_URL || 'https://rsso.gxsdxy.cn/p3/serviceValidate',
+  
+  // 部署路径配置 (CAS模式: /cas/, 传统模式: /srs/)
+  deployPath: function() {
+    return this.casEnable ? '/cas/' : '/srs/'
+  }
 }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d439c44..c17a55a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo, casLogin as casLoginApi } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import defAva from '@/assets/images/profile.jpg'
 
@@ -30,6 +30,18 @@ const useUserStore = defineStore(
           })
         })
       },
+      // CAS 登录
+      casLogin(userInfo) {
+        return new Promise((resolve, reject) => {
+          casLoginApi(userInfo).then(res => {
+            setToken(res.token)
+            this.token = res.token
+            resolve()
+          }).catch(error => {
+            reject(error)
+          })
+        })
+      },
       // 获取用户信息
       getInfo() {
         return new Promise((resolve, reject) => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 4cc4f6e..54f72cd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -87,7 +87,7 @@ service.interceptors.response.use(res => {
         ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           useUserStore().logOut().then(() => {
-            location.href = '/index';
+            window.location.href = (import.meta.env?.BASE_URL || '/') + 'login';
           })
       }).catch(() => {
         isRelogin.show = false;
diff --git a/src/views/cas-callback.vue b/src/views/cas-callback.vue
new file mode 100644
index 0000000..815903f
--- /dev/null
+++ b/src/views/cas-callback.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="cas-callback">
+    <div class="loading-container">
+      <el-loading v-loading="loading" text="正在验证登录信息...">
+        <div class="loading-content">
+          <el-icon class="loading-icon">
+            <Loading />
+          </el-icon>
+          <p>正在处理CAS登录...</p>
+        </div>
+      </el-loading>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElLoading } from 'element-plus'
+import { Loading } from '@element-plus/icons-vue'
+import useUserStore from '@/store/modules/user'
+import settings from '@/settings'
+
+const route = useRoute()
+const router = useRouter()
+const userStore = useUserStore()
+const loading = ref(true)
+
+onMounted(() => {
+  handleCasCallback()
+})
+
+async function handleCasCallback() {
+  try {
+    const ticket = route.query.ticket
+
+    if (!ticket) {
+      // 没有ticket参数,说明是直接访问此页面,根据设备类型进行跳转
+      const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+      if (isMobile) {
+        // 移动端跳转到移动端页面
+        window.location.href = `${window.location.origin}/app-cas/`;
+      } else {
+        // PC端跳转到PC端页面
+        router.push('/');
+      }
+      return;
+    }
+
+    // 有ticket参数,处理CAS登录回调
+    // 构建服务URL(与登录页保持一致,包含构建时的 base 前缀)
+    const base = import.meta.env?.BASE_URL || '/'
+    const serviceUrl = window.location.origin + base + 'cas-callback'
+
+    // 交由后端进行CAS票据验证与登录(更安全、与后端接口一致)
+    await userStore.casLogin({ ticket, service: serviceUrl })
+
+    // 获取用户信息
+    await userStore.getInfo()
+
+    ElMessage.success('CAS登录成功')
+
+    // 登录成功后,根据设备类型跳转到相应页面
+    const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+    if (isMobile) {
+      // 移动端跳转到移动端页面
+      window.location.href = `${window.location.origin}/app-cas/`;
+    } else {
+      // PC端跳转到PC端页面
+      const redirect = route.query.state || '/';
+      router.push(redirect);
+    }
+  } catch (error) {
+    console.error('CAS登录失败:', error)
+    ElMessage.error('CAS登录失败: ' + error.message)
+    // 跳转回登录页面
+    router.push('/login')
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.cas-callback {
+  height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+}
+
+.loading-container {
+  background: white;
+  padding: 40px;
+  border-radius: 10px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
+  text-align: center;
+  min-width: 300px;
+}
+
+.loading-content {
+  .loading-icon {
+    font-size: 40px;
+    color: #409eff;
+    margin-bottom: 20px;
+  }
+
+  p {
+    margin: 0;
+    color: #666;
+    font-size: 16px;
+  }
+}
+</style>
diff --git a/src/views/fire/report/index.vue b/src/views/fire/report/index.vue
index cb615f7..57e1244 100644
--- a/src/views/fire/report/index.vue
+++ b/src/views/fire/report/index.vue
@@ -76,7 +76,7 @@
         </el-col>
       </el-row>
 
-      <!-- 详情弹窗（所有弹窗共用，均带分页） -->
+      <!-- 详情弹窗(所有弹窗共用,均带分页) -->
       <el-dialog
         v-model="detailDialog"
         :title="dialogTitle"
@@ -124,7 +124,7 @@
           <el-table-column prop="remark" label="备注" />
         </el-table>
 
-        <!-- 分页控件（所有弹窗均显示） -->
+        <!-- 分页控件(所有弹窗均显示) -->
         <div class="pagination-wrap">
           <el-pagination
             v-model:current-page="pagination.currentPage"
@@ -166,7 +166,7 @@ const { fire_facility_type, fire_facility_status } = proxy.useDict(
 const facilityTypes = computed(() => fire_facility_type.value || []);
 const facilityStatuses = computed(() => fire_facility_status.value || []);
 const isDictLoaded = computed(() => {
-  // 不仅判断长度，还要验证是否包含有效数据（避免空数组误判）
+  // 不仅判断长度,还要验证是否包含有效数据(避免空数组误判)
   return facilityTypes.value.length > 0 && 
          facilityStatuses.value.length > 0 &&
          facilityTypes.value.some(item => item.value !== undefined) &&
@@ -183,7 +183,7 @@ const detailDialog = ref(false);
 const dialogTitle = ref("");
 
 // 弹窗类型标识
-const dialogType = ref(""); // 'total' 表示总数弹窗，'status' 表示状态弹窗
+const dialogType = ref(""); // 'total' 表示总数弹窗,'status' 表示状态弹窗
 const currentStatusValue = ref(null);
 
 // 分页配置
@@ -193,15 +193,15 @@ const pagination = reactive({
   total: 0
 });
 
-// 查询参数 - 确保初始值为null（符合后端预期）
+// 查询参数 - 确保初始值为null(符合后端预期)
 const queryParams = reactive({
   facilityType: null,
 });
 
-// 3. 核心方法：查询报表数据
+// 3. 核心方法:查询报表数据
 const handleQuery = () => {
   loading.value = true;
-  // 打印查询参数，便于调试
+  // 打印查询参数,便于调试
   console.log("查询参数:", queryParams);
   getReportData(queryParams)
     .then((res) => {
@@ -214,7 +214,7 @@ const handleQuery = () => {
     })
     .catch((err) => {
       console.error("查询报表失败:", err);
-      proxy.$message.error("获取数据失败，请稍后重试");
+      proxy.$message.error("获取数据失败,请稍后重试");
       reportData.value = [];
       totalCount.value = 0;
     })
@@ -314,7 +314,7 @@ const showTotalDetail = async () => {
 const loadTotalDetailPage = async () => {
   detailLoading.value = true;
   try {
-    // 获取所有数据（不分页）用于计算总数和分页
+    // 获取所有数据(不分页)用于计算总数和分页
     const allDataRes = await getAllData({
       facilityType: queryParams.facilityType
     });
@@ -382,7 +382,7 @@ const resetQuery = () => {
   handleQuery();
 };
 
-// 8. 辅助方法：时间格式化
+// 8. 辅助方法:时间格式化
 const parseTime = (time) => {
   if (!time) return "-";
   const date = new Date(time);
@@ -393,7 +393,7 @@ const parseTime = (time) => {
   });
 };
 
-// 9. 辅助方法：过期日期标签类型
+// 9. 辅助方法:过期日期标签类型
 const getExpiryTagType = (expiryDate) => {
   if (!expiryDate) return "default";
   const today = new Date();
@@ -411,7 +411,7 @@ onMounted(() => {
   //   proxy.$message.warning(`检测到${invalidStatus.length}个状态样式配置错误`);
   // }
 
-  // 初始化查询逻辑（确保字典加载后执行）
+  // 初始化查询逻辑(确保字典加载后执行)
   const initQuery = () => {
     if (isDictLoaded.value) {
       handleQuery();
@@ -420,7 +420,7 @@ onMounted(() => {
       const unwatch = watch(isDictLoaded, (loaded) => {
         if (loaded) {
           handleQuery();
-          unwatch(); // 执行后销毁监听，避免重复调用
+          unwatch(); // 执行后销毁监听,避免重复调用
         }
       });
     }
@@ -430,7 +430,7 @@ onMounted(() => {
   initQuery();
 });
 
-// 移除原有的watch(isDictLoaded)，改用onMounted中的逻辑
+// 移除原有的watch(isDictLoaded),改用onMounted中的逻辑
 </script>
 
 <style scoped>
diff --git a/src/views/healthcare/inventory/DrugFiling/index.vue b/src/views/healthcare/inventory/DrugFiling/index.vue
index 80a73f4..e604231 100644
--- a/src/views/healthcare/inventory/DrugFiling/index.vue
+++ b/src/views/healthcare/inventory/DrugFiling/index.vue
@@ -7,6 +7,23 @@
       <el-form-item label="条码" prop="barcode">
         <el-input v-model="queryParams.barcode" placeholder="请输入条码" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+      <el-form-item label="是否拆分" prop="isSplit">
+        <el-select v-model="queryParams.isSplit" placeholder="请选择" clearable style="width: 150px">
+          <el-option v-for="dict in sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="批次" prop="batch">
+        <el-input v-model="queryParams.batch" placeholder="请输入批次" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="有效期" prop="expiryDateRange">
+        <el-date-picker v-model="queryParams.expiryDateRange" type="daterange" range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" style="width: 260px" clearable />
+      </el-form-item>
+      <el-form-item label="库房" prop="storeroomId">
+        <el-select v-model="queryParams.storeroomId" placeholder="请选择库房" clearable style="width: 180px">
+          <el-option v-for="item in storeroomList" :key="item.id" :label="item.storeroomName" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -54,6 +71,10 @@
         <el-button type="warning" plain icon="Upload" @click="handleImport"
           v-hasPermi="['healthcare:archive:add']">批量建档</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Download" @click="handleExport"
+          v-hasPermi="['healthcare:archive:export']">导出</el-button>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -332,18 +353,28 @@
 
 <script setup name="Archive">
 
+// 价格向上取整到小数点后两位（进一法）
+function ceilPrice(value) {
+  const num = Number(value)
+  if (isNaN(num)) return '0.00'
+  const scaled = Math.round(num * 10000)
+  const cents = Math.ceil(scaled / 100)
+  return (cents / 100).toFixed(2)
+}
+
 import {
-  addArchive,
-  delArchive,
-  getArchive,
-  listArchive,
-  updateArchive,
-  updateBatch,
-  deleteBatch,
-} from "@/api/healthcare/inventory/DrugFiling/archive.js";
-import { getToken } from "@/utils/auth";
-import { getCurrentInstance, reactive, ref, toRefs } from "vue";
-import { useRoute } from 'vue-router';
+    addArchive,
+    delArchive,
+    deleteBatch,
+    getArchive,
+    listArchive,
+    updateArchive,
+    updateBatch,
+} from "@/api/healthcare/inventory/DrugFiling/archive.js"
+import { listStoreroom } from "@/api/healthcare/inventory/StoreRoom/storeroom.js"
+import { getToken } from "@/utils/auth"
+import { getCurrentInstance, reactive, ref, toRefs } from "vue"
+import { useRoute } from 'vue-router'
 
 // import { ElNotification } from 'element-plus'
 
@@ -428,7 +459,7 @@ const handleBatchSave = (row, parentRow) => {
   if (parentRow.isSplit === 'Y' && parentRow.minNumber) {
     const retailPrice = parseFloat(row.retailPrice) || 0;
     const minNumber = parseFloat(parentRow.minNumber) || 1;
-    row.minPrice = (retailPrice / minNumber).toFixed(2);
+    row.minPrice = ceilPrice(retailPrice / minNumber);
   }
 
   // 不可拆分药品，最小单位价格等于零售价      暂时不使用
@@ -497,6 +528,10 @@ const data = reactive({
     pageSize: 10,
     medicineName: null,
     barcode: null,
+    isSplit: null,
+    batch: null,
+    expiryDateRange: null,
+    storeroomId: null,
     type: null
   },
   rules: {
@@ -596,6 +631,15 @@ const childBorder = ref(false);
 const expandedRows = ref([]);
 
 const storeList = ref([]);
+// 库房列表
+const storeroomList = ref([]);
+
+// 获取库房列表
+function getStoreroomList() {
+  listStoreroom().then((response) => {
+    storeroomList.value = response.rows || [];
+  });
+}
 const route = useRoute();
 let drugType = ref(route.query.type);
 console.log('Initial received route:', drugType.value); // 添加日志以调试
@@ -603,7 +647,14 @@ console.log('Initial received route:', drugType.value); // 添加日志以调试
 function getList() {
   loading.value = true;
   queryParams.value.type = drugType.value;
-  listArchive(queryParams.value)
+  // 处理有效期日期范围参数
+  const params = { ...queryParams.value };
+  if (params.expiryDateRange && params.expiryDateRange.length === 2) {
+    params.expiryDateStart = params.expiryDateRange[0];
+    params.expiryDateEnd = params.expiryDateRange[1];
+  }
+  delete params.expiryDateRange;
+  listArchive(params)
     .then((response) => {
       const rows = response.rows || [];
       archiveList.value = formatData(rows);
@@ -831,11 +882,10 @@ function handleDelete(row) {
 
 // 导出按钮操作
 function handleExport() {
+  const { pageNum, pageSize, ...exportParams } = queryParams.value;
   proxy.download(
     "healthcare/archive/export",
-    {
-      ...queryParams.value,
-    },
+    exportParams,
     `archive_${new Date().getTime()}.xlsx`
   );
 }
@@ -856,6 +906,7 @@ function toggleExpand(row, column, event) {
 }
 
 getList();
+getStoreroomList();
 </script>
 
 <style scoped>
diff --git a/src/views/healthcare/inventory/DrugOut/index.vue b/src/views/healthcare/inventory/DrugOut/index.vue
index eb985b7..809565f 100644
--- a/src/views/healthcare/inventory/DrugOut/index.vue
+++ b/src/views/healthcare/inventory/DrugOut/index.vue
@@ -193,8 +193,8 @@
         </el-form-item>
         <el-form-item label="出库数量合计" prop="outQuantity" label-width="100">
           <el-input
-            v-model="form.outQuantity"
-            placeholder="请输入出库数量"
+            :model-value="outQuantitySummary"
+            placeholder="出库数量合计"
             style="width: 350px"
             :disabled="true"
           />
@@ -264,7 +264,7 @@
           <el-form-item label="证明材料" prop="proofMaterial">
             <file-upload v-model="form.proofMaterial" :disabled="isDisabled" />
           </el-form-item>
-          <el-form-item label="用途详情" prop="purposeDetails">
+          <el-form-item label="用途详述" prop="purposeDetails">
             <el-input
               v-model="form.purposeDetails"
               type="textarea"
@@ -296,7 +296,7 @@
               :disabled="isDisabled"
             />
           </el-form-item>
-          <el-form-item label="用途详情" prop="purposeDetails">
+          <el-form-item label="用途详述" prop="purposeDetails">
             <el-input
               v-model="form.purposeDetails"
               type="textarea"
@@ -390,7 +390,7 @@
           <el-form-item label="证明材料" prop="proofMaterial">
             <file-upload v-model="form.proofMaterial" :disabled="isDisabled" />
           </el-form-item>
-          <el-form-item label="用途详情" prop="purposeDetails">
+          <el-form-item label="用途详述" prop="purposeDetails">
             <el-input
               v-model="form.purposeDetails"
               type="textarea"
@@ -423,7 +423,7 @@
           <el-form-item label="处理方式" prop="disposalMethod">
             <el-input
               v-model="form.disposalMethod"
-              placeholder="请输入处理方式"
+              placeholder="请输入处理方法"
               style="width: 310px"
               :disabled="isDisabled"
             />
@@ -468,7 +468,7 @@
             >
           </el-col>
         </el-row>
-        <el-table
+                <el-table
           :data="healthcareInventoryDrugoutDetailsList"
           :row-class-name="rowHealthcareInventoryDrugoutDetailsIndex"
           @selection-change="
@@ -483,68 +483,76 @@
             prop="index"
             width="50"
           />
-          <el-table-column label="药品档案" prop="medicineName" width="300px">
+          <el-table-column label="药品名称" prop="medicineName" width="300px">
             <template #default="scope">
-              <el-form-item
-                :prop="`healthcareInventoryDrugoutDetailsList.${scope.$index}.medicineName`"
-                :rules="[
-                  {
-                    required: true,
-                    message: '药品名称不能为空',
-                    trigger: 'blur',
-                  },
-                ]"
-              >
-                <el-input
-                  v-model="
-                    healthcareInventoryDrugoutDetailsList[scope.$index]
-                      .medicineName
-                  "
-                  placeholder="请输入药品名称"
-                  :disabled="true"
-                  style="width: 250px"
-                  @blur="handleBlur(scope.$index)"
-                />
-              </el-form-item>
+              <el-input
+                v-model="scope.row.medicineName"
+                placeholder="请输入药品名称"
+                :disabled="true"
+                style="width: 250px"
+                @blur="syncDrugoutDetails()"
+              />
             </template>
           </el-table-column>
           <el-table-column label="条码" align="center" prop="barcode" />
-          <el-table-column label="厂商" align="center" prop="manufacturer" />
-          <el-table-column label="批次" prop="outBatch" />
-          <el-table-column label="所在库房" prop="outPointName" />
-          <el-table-column label="剩余数量" prop="remainingQuantity" />
+          <el-table-column label="生产厂家" align="center" prop="manufacturer" />
+          <el-table-column label="出库批次" prop="outBatch" />
+          <el-table-column label="出库库房" prop="outPointName" />
+          <el-table-column label="剩余库存" width="220">
+            <template #default="scope">
+              <span>{{ formatRemainingInventory(scope.row) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="是否拆分" width="120">
+            <template #default="scope">
+              <span>{{ (String(scope.row.isSplit).toUpperCase() === 'Y') ? '是' : '否' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="出库单位" width="160">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.unitType"
+                placeholder="选择单位"
+                :disabled="isDisabled || getUnitOptions(scope.row).length === 1"
+                style="width: 140px"
+                @change="handleUnitChange(scope.row)"
+              >
+                <el-option
+                  v-for="option in getUnitOptions(scope.row)"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column label="出库数量" prop="quantity" width="200px">
             <template #default="scope">
               <el-form-item
-                :prop="`healthcareInventoryDrugoutDetailsList.${scope.$index}.quantity`"
                 :rules="[
-                  { required: true, message: '数量不能为空', trigger: 'blur' },
+                  { required: true, message: '出库数量不能为空', trigger: 'change' },
                   {
-                    required: true,
-                    pattern: /^\d+$/,
-                    message: '禁止包含小数',
-                    trigger: 'blur',
+                    validator: (rule, value, callback) =>
+                      validateQuantityRule(scope.row, value, callback),
+                    trigger: ['change', 'blur'],
                   },
-                  {
-                    required: true,
-                    pattern: /^[1-9]\d*$/,
-                    message: '数量不能为0',
-                    trigger: 'blur',
-                  },
-
                 ]"
               >
-                <el-input
+                <el-input-number
                   v-model="scope.row.quantity"
-                  placeholder="请输入出库数量"
+                  :min="1"
+                  :precision="0"
                   :disabled="isDisabled"
-                  @blur="handleBlur(scope.$index)"
+                  controls-position="right"
+                  style="width: 160px"
+                  @change="handleQuantityChange(scope.row)"
+                  @blur="handleQuantityBlur(scope.row)"
                 />
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column
-            label="操作"
+            label="档案"
             align="center"
             class-name="small-padding fixed-width"
           >
@@ -563,12 +571,10 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm" :disabled="isDisabled"
-            >出 库</el-button
-          >
+            >提交</el-button>
           <el-button type="primary" @click="handleSave" :disabled="isDisabled">
-            {{ isSaving ? "保存中..." : "保存" }}</el-button
-          >
-          <el-button @click="cancel">取 消</el-button>
+            {{ isSaving ? "保存中.." : "保存" }}</el-button>
+          <el-button @click="cancel">取消</el-button>
         </div>
       </template>
       <DrugArchive
@@ -582,17 +588,16 @@
 
 <script setup name="Drugout">
 import {
-  listDrugout,
-  getDrugout,
-  delDrugout,
   addDrugout,
-  updateDrugout,
+  delDrugout,
+  getDrugout,
+  listDrugout,
   saveDrugout,
+  updateDrugout,
 } from "@/api/healthcare/inventory/DrugOut/drugout.js";
-import DrugArchive from "@/components/drugFiling/index.vue";
-import { getFiling } from "@/api/healthcare/inventory/DrugFiling/drugfiling.js";
-import { ref, computed, watchEffect } from "vue";
 import { listStoreroom } from "@/api/healthcare/inventory/StoreRoom/storeroom.js";
+import DrugArchive from "@/components/drugFiling/index.vue";
+import { ref, watchEffect, computed } from "vue";
 const archiveSelectorRef = ref(null);
 
 // 详情信息下标
@@ -624,14 +629,16 @@ const selectedRow = reactive([]);
 
 const data = reactive({
   form: {
-    variety: null,
-    outQuantity: null,
+    variety: 0,
+    outQuantity: 0,
+    outBoxQuantity: 0,
+    outPackQuantity: 0,
   },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     outStatus: null,
-    variety: null,
+    variety: 0,
     outTime: null,
   },
   rules: {
@@ -651,100 +658,79 @@ const data = reactive({
     ],
     outRemark: [
       { required: true, message: "出库备注不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
     ],
     inboundLocation: [
       { required: true, message: "入库地点不能为空", trigger: "blur" },
     ],
-    signee: [{ required: true, message: "签收人不能为空", trigger: "blur" },
-                      {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },],
-    proofMaterial: [
-      { required: true, message: "凭证材料不能为空", trigger: "blur" },
+    signee: [
+      { required: true, message: "签收人不能为空", trigger: "blur" },
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
     ],
     purposeDetails: [
       { required: true, message: "用途明细不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
-    ],
-    scrapReason: [
-      { required: true, message: "报废原因不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
-    ],
-    disposalMethod: [
-      { required: true, message: "处理方式不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
-    ],
-    damageReason: [
-      { required: true, message: "破损原因不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
     ],
     expirationDate: [
       { required: true, message: "过期时间不能为空", trigger: "blur" },
-      ,
     ],
     currentDatetime: [
       { required: true, message: "当前时间不能为空", trigger: "blur" },
     ],
-    destroyer: [{ required: true, message: "销毁人不能为空", trigger: "blur" },
-                      {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },],
+    destroyer: [
+      { required: true, message: "销毁人不能为空", trigger: "blur" },
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
+    ],
     destructionLocation: [
       { required: true, message: "销毁地点不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
     ],
     destructionProcess: [
       { required: true, message: "销毁过程不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
     ],
     scrapReason: [
       { required: true, message: "报废原因不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
     ],
     affiliation: [
       { required: true, message: "所在单位不能为空", trigger: "blur" },
-                        {
-                    pattern: /^[^\s]+$/,
-                    message: '禁止包含空格',
-                    trigger: 'blur',
-                  },,
+      {
+        pattern: /^[^\s]+$/,
+        message: '禁止包含空格',
+        trigger: 'blur',
+      },
+    ],
+    proofMaterial: [
+      // 证明材料字段为非必填
     ],
   },
 });
@@ -755,74 +741,293 @@ const { queryParams, form, rules } = toRefs(data);
 const openArchiveSelector = (index) => {
   archiveSelectorRef.value.showSelector();
   ListIndex.value = index - 1;
-  // console.log("待出库查询",archiveSelectorRef.value)
 };
 
+const UNIT_TYPES = {
+  BOX: "BOX",
+  PACK: "PACK",
+};
+
+const quantityTotals = computed(() => {
+  return healthcareInventoryDrugoutDetailsList.value.reduce(
+    (acc, cur) => {
+      if (!cur) {
+        return acc;
+      }
+      const qty = Number(cur.quantity) || 0;
+      if (!qty) {
+        return acc;
+      }
+      const unitType = cur.unitType || UNIT_TYPES.BOX;
+      const ratio = Number(cur.unitQuantity) || 1;
+      if (unitType === UNIT_TYPES.PACK) {
+        acc.pack += qty;
+        acc.total += qty;
+      } else {
+        acc.box += qty;
+        acc.total += qty * ratio;
+      }
+      return acc;
+    },
+    { box: 0, pack: 0, total: 0 }
+  );
+});
+
+const outQuantitySummary = computed(() => {
+  const totals = quantityTotals.value;
+  const parts = [];
+  if (totals.box) {
+    parts.push("箱:" + totals.box);
+  }
+  if (totals.pack) {
+    parts.push("包:" + totals.pack);
+  }
+  parts.push("最小单位:" + totals.total);
+  return parts.join(' / ');
+});
+
 // 计算药品品种合计
 const calculateVarietyTotal = () => {
-  const total = healthcareInventoryDrugoutDetailsList.value.length;
+  const total = healthcareInventoryDrugoutDetailsList.value.filter(
+    (item) => item && item.drugId
+  ).length;
   form.value.variety = total;
   return total;
 };
 
-// 计算出库数量合计
-const calculateQuantityTotal = () => {
-  const total = healthcareInventoryDrugoutDetailsList.value.reduce(
-    (acc, cur) => {
-      return acc + (parseFloat(cur.quantity) || 0);
-    },
-    0
-  );
-  form.value.outQuantity = total;
-  return total;
-};
-
-// 监听出库数量的变化
 watchEffect(() => {
+  const totals = quantityTotals.value;
+  form.value.outQuantity = totals.total;
+  form.value.outBoxQuantity = totals.box;
+  form.value.outPackQuantity = totals.pack;
   calculateVarietyTotal();
-  calculateQuantityTotal();
 });
 
 // 处理选中药品档案后的回调
-const handleArchiveSelected = (archive) => {
-  console.log("选中的档案信息", archive);
-  healthcareInventoryDrugoutDetailsList.value[ListIndex.value].drugId =
-    archive.archiveId || archive.id;
-  healthcareInventoryDrugoutDetailsList.value[ListIndex.value].medicineName =
-    archive.medicineName;
-  healthcareInventoryDrugoutDetailsList.value[ListIndex.value].barcode =
-    archive.barcode;
-  healthcareInventoryDrugoutDetailsList.value[ListIndex.value].manufacturer =
-    archive.manufacturer;
-  healthcareInventoryDrugoutDetailsList.value[ListIndex.value].outBatch =
-    archive.batch;
-  healthcareInventoryDrugoutDetailsList.value[ListIndex.value].filingId =
-    archive.filingId;
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].outPointName =
-    archive.storeroomName;
-          healthcareInventoryDrugoutDetailsList.value[ListIndex.value].expiryDate =
-    archive.expiryDate;
-          healthcareInventoryDrugoutDetailsList.value[ListIndex.value].retailPrice =
-    archive.retailPrice;
-              healthcareInventoryDrugoutDetailsList.value[ListIndex.value].outPointId =
-    archive.storeroomId;
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].remainingQuantity =
-    archive.boxCount;
-    
-
-    if(archive.storeroomId != form.value.outPoint){
-      proxy.$modal.msgError("出库库房记录与药品库存库记录不一致,请重新选择!");
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].drugId = ""
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].medicineName = ""
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].barcode = ""
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].manufacturer = ""
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].outBatch = ""
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].filingId = ""
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].outPointName = "";
-      healthcareInventoryDrugoutDetailsList.value[ListIndex.value].remainingQuantity = ""
-    }
+const syncDrugoutDetails = () => {
+  form.value.healthcareInventoryDrugoutDetailsList =
+    healthcareInventoryDrugoutDetailsList.value;
 };
 
+const ensureUnitMetadata = (row) => {
+  if (!row) {
+    return;
+  }
+  const normalizeUnit = (n, f) => {
+    const s = String(n || "").trim();
+    if (!s || /^\d+$/.test(s)) return f;
+    return s;
+  };
+  row.inventoryUnit = normalizeUnit(row.inventoryUnit || row.unit, "主单位");
+  row.splitUnit = normalizeUnit(row.splitUnit, "");
+  row.unitQuantity = Number(row.unitQuantity) || 1;
+  if (!row.unitType) {
+    row.unitType = UNIT_TYPES.BOX;
+  }
+  const isSplit = String(row.isSplit || '').toUpperCase() === 'Y';
+  if (row.unitType === UNIT_TYPES.PACK && !row.splitUnit) {
+    if (isSplit) {
+      row.splitUnit = "最小单位";
+    } else {
+      row.unitType = UNIT_TYPES.BOX;
+    }
+  }
+  row.unit = row.unitType === UNIT_TYPES.PACK
+    ? (row.splitUnit || "最小单位")
+    : row.inventoryUnit;
+};
+
+const formatRemainingInventory = (row) => {
+  if (!row) {
+    return "0";
+  }
+  const boxNum = Number(row.remainingQuantity ?? row.boxCount ?? 0);
+  const packNum = Number(row.remainingPackQuantity ?? row.packCount ?? 0);
+  const parts = [];
+  if (boxNum) {
+    parts.push(String(boxNum) + (row.inventoryUnit || ""));
+  }
+  if (packNum) {
+    parts.push(String(packNum) + (row.splitUnit || ""));
+  }
+  if (!parts.length) {
+    return "0";
+  }
+  return parts.join(" / ");
+};
+
+const getUnitOptions = (row) => {
+  const options = [];
+  const normalizeUnit = (n, f) => {
+    const s = String(n || "").trim();
+    if (!s || /^\d+$/.test(s)) return f;
+    return s;
+  };
+  const boxName = normalizeUnit(row && row.inventoryUnit, "主单位");
+  const packName = normalizeUnit(row && row.splitUnit, "最小单位");
+  options.push({ label: `主单位（${boxName}）`, value: UNIT_TYPES.BOX });
+  const isSplit = String(row?.isSplit || '').toUpperCase() === 'Y';
+  if (isSplit || (row && row.splitUnit)) {
+    options.push({ label: `最小单位（${packName}）`, value: UNIT_TYPES.PACK });
+  }
+  return options;
+};
+
+const validateQuantityRule = (row, value, callback) => {
+  if (!row) {
+    callback();
+    return;
+  }
+  if (value === null || value === undefined || value === "") {
+    callback(new Error("出库数量不能为空"));
+    return;
+  }
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed <= 0) {
+    callback(new Error("数量需为正整数"));
+    return;
+  }
+  ensureUnitMetadata(row);
+  const available =
+    row.unitType === UNIT_TYPES.PACK
+      ? Number(row.remainingPackQuantity ?? row.packCount ?? 0)
+      : Number(row.remainingQuantity ?? row.boxCount ?? 0);
+  if (available <= 0) {
+    callback(new Error("当前单位无可用库存"));
+    return;
+  }
+  if (parsed > available) {
+    callback(
+      new Error(
+        row.unitType === UNIT_TYPES.PACK ? "输入数量超过剩余库存" : "输入数量超过剩余库存"
+      )
+    );
+    return;
+  }
+  callback();
+};
+
+const enforceQuantityBounds = (row) => {
+  if (!row) {
+    return;
+  }
+  if (row.quantity === null || row.quantity === "" || row.quantity === undefined) {
+    return;
+  }
+  ensureUnitMetadata(row);
+  let parsed = Number(row.quantity);
+  if (!Number.isFinite(parsed) || !Number.isInteger(parsed) || parsed <= 0) {
+    row.quantity = null;
+    return;
+  }
+  const available =
+    row.unitType === UNIT_TYPES.PACK
+      ? Number(row.remainingPackQuantity ?? row.packCount ?? 0)
+      : Number(row.remainingQuantity ?? row.boxCount ?? 0);
+  if (available <= 0) {
+    row.quantity = null;
+    return;
+  }
+  if (parsed > available) {
+    row.quantity = available;
+  } else {
+    row.quantity = parsed;
+  }
+};
+
+const handleQuantityChange = (row) => {
+  enforceQuantityBounds(row);
+  syncDrugoutDetails();
+};
+
+const handleQuantityBlur = (row) => {
+  enforceQuantityBounds(row);
+  syncDrugoutDetails();
+};
+
+const handleUnitChange = (row) => {
+  ensureUnitMetadata(row);
+  if (row && row.quantity != null) {
+    enforceQuantityBounds(row);
+  }
+  syncDrugoutDetails();
+};
+
+const normalizeDetailRows = () => {
+  healthcareInventoryDrugoutDetailsList.value.forEach((row) => {
+    if (!row) {
+      return;
+    }
+    if (row.quantity === "") {
+      row.quantity = null;
+    }
+    row.remainingQuantity =
+      Number(row.remainingQuantity ?? row.boxCount ?? 0) || 0;
+    row.remainingPackQuantity =
+      Number(row.remainingPackQuantity ?? row.packCount ?? 0) || 0;
+    row.unitQuantity =
+      Number(row.unitQuantity ?? row.minNumber ?? 1) || 1;
+    ensureUnitMetadata(row);
+  });
+  syncDrugoutDetails();
+};
+const handleArchiveSelected = (archive) => {
+  if (archive == null || ListIndex.value == null) {
+    return;
+  }
+  const rowIndex = ListIndex.value;
+  const detail = healthcareInventoryDrugoutDetailsList.value[rowIndex];
+  if (!detail) {
+    return;
+  }
+
+  detail.drugId = archive.archiveId || archive.id || "";
+  detail.medicineName = archive.medicineName || "";
+  detail.barcode = archive.barcode || "";
+  detail.manufacturer = archive.manufacturer || "";
+  detail.outBatch = archive.batch || "";
+  detail.filingId = archive.filingId || "";
+  detail.outPointName = archive.storeroomName || "";
+  detail.outPointId = archive.storeroomId || "";
+  detail.expiryDate = archive.expiryDate || "";
+  detail.retailPrice = archive.retailPrice || "";
+  detail.remainingQuantity = Number(archive.boxCount ?? 0) || 0;
+  detail.remainingPackQuantity = Number(archive.packCount ?? 0) || 0;
+  detail.inventoryUnit = archive.inventoryUnit || detail.inventoryUnit || "";
+  detail.splitUnit = archive.splitUnit || detail.splitUnit || "";
+  detail.unitQuantity =
+    Number(archive.unitQuantity ?? archive.minNumber ?? detail.unitQuantity ?? 1) || 1;
+  detail.isSplit = (archive.isSplit ?? detail.isSplit ?? '').toString();
+
+  if (archive.storeroomId && archive.storeroomId !== form.value.outPoint) {
+    proxy.$modal.msgError("出库库房记录与药品库存库记录不一致，请重新选择!");
+    detail.drugId = "";
+    detail.medicineName = "";
+    detail.barcode = "";
+    detail.manufacturer = "";
+    detail.outBatch = "";
+    detail.filingId = "";
+    detail.outPointName = "";
+    detail.outPointId = "";
+    detail.expiryDate = "";
+    detail.retailPrice = "";
+    detail.remainingQuantity = 0;
+    detail.remainingPackQuantity = 0;
+    detail.inventoryUnit = "";
+    detail.splitUnit = "";
+    detail.unitQuantity = 1;
+    detail.quantity = null;
+    normalizeDetailRows();
+    return;
+  }
+
+  if (detail.unitType === UNIT_TYPES.PACK && !detail.splitUnit) {
+    detail.unitType = UNIT_TYPES.BOX;
+  }
+  detail.quantity = null;
+  normalizeDetailRows();
+};;;
+
 const storeroomList = ref([]);
 /** 查询药品出库记录列表 */
 function getList() {
@@ -854,8 +1059,10 @@ function reset() {
     outCode: null,
     outStatus: null,
     outType: null,
-    variety: null,
-    outQuantity: null,
+    variety: 0,
+    outQuantity: 0,
+    outBoxQuantity: 0,
+    outPackQuantity: 0,
     cffiliation: null,
     outPoint: null,
     outPerson: null,
@@ -882,6 +1089,7 @@ function reset() {
     outBatch: null,
   };
   healthcareInventoryDrugoutDetailsList.value = [];
+  syncDrugoutDetails();
   proxy.resetForm("drugoutRef");
 }
 
@@ -921,6 +1129,7 @@ function handleUpdate(row) {
     healthcareInventoryDrugoutDetailsList.value =
       response.data.healthcareInventoryDrugoutDetailsList;
     console.log(healthcareInventoryDrugoutDetailsList.value);
+    normalizeDetailRows();
     if (form.value.outStatus === 0) {
       isDisabled.value = true;
     } else if (form.value.outStatus === 1) {
@@ -931,11 +1140,7 @@ function handleUpdate(row) {
   });
 }
 
-// 在输入框失去焦点时触发
-function handleBlur() {
-  form.value.healthcareInventoryDrugoutDetailsList =
-    healthcareInventoryDrugoutDetailsList.value;
-}
+
 
 /** 提交按钮 */
 function submitForm() {
@@ -990,7 +1195,7 @@ const handleSave = () => {
 function handleDelete(row) {
   const _ids = row.id || ids.value;
   proxy.$modal
-    .confirm('是否确认删除药品出库记录编号为"' + _ids + '"的数据项?')
+    .confirm('是否确认删除药品出库记录编号 "' + _ids + '" 的数据项?')
     .then(function () {
       return delDrugout(_ids);
     })
@@ -1001,33 +1206,41 @@ function handleDelete(row) {
     .catch(() => {});
 }
 
-/** 出库详情,用于记录药品出库的详细信息序号 */
+/** 出库详情：序号处理函数 */
 function rowHealthcareInventoryDrugoutDetailsIndex({ row, rowIndex }) {
   row.index = rowIndex + 1;
 }
 
-/** 出库详情,用于记录药品出库的详细信息添加按钮操作 */
+/** 出库详情：添加按钮操作 */
 function handleAddHealthcareInventoryDrugoutDetails() {
-  let obj = {};
-  obj.drugId = "";
-  obj.quantity = "";
-  obj.medicineName = "";
-  obj.batch = "";
-  obj.manufacturer = "";
-  obj.outBatch = "";
-  obj.barcode = "";
-  obj.outPointName ="";
-  obj.filingId = "";
-  obj.outPointId = "";
-  obj.expiryDate = "";
-  obj.retailPrice = "";
-  obj.remainingQuantity = ""
-  obj.drugFilings = [];
-
+  const obj = {
+    drugId: "",
+    quantity: null,
+    medicineName: "",
+    batch: "",
+    manufacturer: "",
+    outBatch: "",
+    barcode: "",
+    outPointName: "",
+    filingId: "",
+    outPointId: "",
+    expiryDate: "",
+    retailPrice: "",
+    remainingQuantity: 0,
+    remainingPackQuantity: 0,
+    inventoryUnit: "",
+    splitUnit: "",
+    unitQuantity: 1,
+    unitType: UNIT_TYPES.BOX,
+    unit: "",
+    drugFilings: [],
+  };
   healthcareInventoryDrugoutDetailsList.value.push(obj);
+  ensureUnitMetadata(obj);
+  syncDrugoutDetails();
 }
 
-/** 出库详情,用于记录药品出库的详细信息删除按钮操作 */
+/** 出库详情：删除按钮操作 */
 function handleDeleteHealthcareInventoryDrugoutDetails() {
   if (checkedHealthcareInventoryDrugoutDetails.value.length == 0) {
     proxy.$modal.msgError(
@@ -1044,6 +1257,7 @@ function handleDeleteHealthcareInventoryDrugoutDetails() {
           checkedHealthcareInventoryDrugoutDetailss.indexOf(item.index) == -1
         );
       });
+    normalizeDetailRows();
   }
 }
 
@@ -1066,4 +1280,4 @@ function handleExport() {
 }
 
 getList();
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/healthcare/outpatientService/patientDiagnosis/index.vue b/src/views/healthcare/outpatientService/patientDiagnosis/index.vue
index 92a4d54..3c9e9c8 100644
--- a/src/views/healthcare/outpatientService/patientDiagnosis/index.vue
+++ b/src/views/healthcare/outpatientService/patientDiagnosis/index.vue
@@ -73,31 +73,35 @@
         <template #default="scope">
           <dict-tag :options="healthcare_os_insured" :value="scope.row.isInsured"/>
         </template>
-      </el-table-column>
-      <el-table-column label="病人类型" align="center" prop="patientType">
+</el-table-column>
+<el-table-column label="病人类型" align="center" prop="patientType">
         <template #default="scope">
           <dict-tag :options="healthcare_os_patient_type" :value="scope.row.patientType"/>
         </template>
       </el-table-column>
-      <el-table-column label="就诊时间" align="center" prop="outpatientTime"/>
-      <el-table-column label="就诊地址" align="center" prop="storeroomName"/>
-      <el-table-column label="临床诊断" align="center" prop="diagnosis"/>
-      <el-table-column label="医生名字" align="center" prop="doctorName"/>
-      <el-table-column label="判断类型" align="center" prop="diagnosisType">
+<el-table-column label="就诊时间" align="center" prop="outpatientTime" />
+<el-table-column label="就诊地址" align="center" prop="storeroomName" />
+<el-table-column label="临床诊断" align="center" prop="diagnosis" />
+<el-table-column label="医生名字" align="center" prop="doctorName" />
+<el-table-column label="判断类型" align="center" prop="diagnosisType">
         <template #default="scope">
           <dict-tag :options="healthcare_os_diagnosis_type" :value="scope.row.diagnosisType"/>
         </template>
       </el-table-column>
-      <el-table-column label="发药状态" align="center" prop="status">
+<el-table-column label="发药状态" align=" center" prop="status">
         <template #default="scope">
           <dict-tag :options="healthcare_os_diagnosis_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <!-- 修改 -->
+          <!-- 超级管理员修改（不限状态） -->
+          <el-button link type="primary" icon="Edit"
+                     @click="handleUpdate(scope.row)" v-hasPermi="['os:patientDiagnosis:adminEdit']">修改
+          </el-button>
+          <!-- 修改（仅已发药/已退药状态） -->
           <el-button v-if="scope.row.status == 2 || scope.row.status == 3" link type="primary" icon="Edit"
-                     @click="handleUpdate(scope.row)" v-hasPermi="['os:patientDiagnosis:update']">修改
+                     @click="handleUpdate(scope.row)" v-hasPermi="['os:patientDiagnosis:update']">修诊
           </el-button>
           <!-- check 查看  Button   -->
           <el-button link type="primary" icon="Search" @click="checkButton(scope.row)"
@@ -107,25 +111,25 @@
           <el-button v-if="scope.row.status == 3" link type="primary" icon="Delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['os:patientDiagnosis:remove']">删除
           </el-button>
-          <!-- 打印及下方调用 -> 知无涯添加 -->
+          <!-- 打印及下方调�?-> 知无涯添�?-->
           <el-button v-if="scope.row.status == 1" link type="primary" icon="Printer" @click="handlePrint(scope.row)"
                      v-hasPermi="['os:patientDiagnosis:print']">打印
           </el-button>
         </template>
       </el-table-column>
-    </el-table>
+</el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize" @pagination="getList"/>
+<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+  @pagination="getList" />
 
-    <!-- 添加或修改患者诊断信息对话框 -->
-    <!-- 控制  -->
-    <el-dialog :title="title" v-model="open" :width="`${(width = '100%')}`" append-to-body>
-      <el-form ref="patientDiagnosisRef" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="20">
+<!-- 添加或修改患者诊断信息对话框 -->
+<!-- 控制  -->
+<el-dialog :title="title" v-model="open" :width="`${(width = '100%')}`" append-to-body>
+  <el-form ref="patientDiagnosisRef" :model="form" :rules="rules" label-width="100px">
+    <el-row :gutter="20">
           <!-- 病人信息 -->
           <el-col :span="12">
-            <!-- 患者信息 change -->
+            <!-- 患者信�?change -->
             <el-col :span="24">
               <!--  -->
               <el-row>
@@ -146,8 +150,8 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <!--  -->
-              <el-row>
+    <!--  -->
+    <el-row>
                 <el-col :span="12">
                   <el-form-item label="患者姓名" prop="name">
                     <el-input v-model="form.name" placeholder="请输入患者姓名" clearable/>
@@ -162,7 +166,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+    <el-row>
                 <el-col :span="12">
                   <el-form-item label="性别" prop="gender">
                     <el-select v-model="form.gender" placeholder="请输入性别" clearable>
@@ -177,7 +181,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row v-if="form.patientType === 0">
+    <el-row v-if="form.patientType === 0">
                 <el-col :span="12">
                   <el-form-item label="专业" prop="major">
                     <el-input v-model="form.major" clearable placeholder="请输入专业"/>
@@ -189,7 +193,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+    <el-row>
                 <el-col :span="12">
                   <el-form-item label="电话" prop="phone">
                     <el-input v-model="form.phone" clearable placeholder="请输入电话"/>
@@ -206,7 +210,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+    <el-row>
                 <el-col :span="12">
                   <el-form-item label="是否医保" prop="isInsured">
                     <el-select v-model="form.isInsured"
@@ -232,28 +236,37 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item v-if="form.isInsured == 0" label="医保率"
+                  <el-form-item v-if="form.isInsured == 0" label="报销比率"
                                 prop="value">
-                    <el-input @input="calculationWholeTotal()"
-                              v-model="form.value"
-                              v-model.number="form.value"
-                              clearable
-                              placeholder="请输入医保率"/>
+                    <el-input-number
+                        v-model="form.value"
+                        :step="0.1"
+                        :precision="2"
+                        :min="0"
+                        :max="100"
+                        :formatter="insuranceFormatter"
+                        :parser="insuranceParser"
+                        @change="calculationWholeTotal()"
+                        placeholder="请输入报销比率"/>   <span>%</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="已报销总额/限额">
+                    <span>
+                      ￥{{ Number(historyReimbursement || 0).toFixed(2) }} / ￥{{ Number(reimbursementLimit).toFixed(2) }}
+                    </span>
                   </el-form-item>
                 </el-col>
               </el-row>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="主诉" prop="chiefComplaint" class="complaint-form-item">
-                <div class="complaint-input">
-                  <el-autocomplete v-model="form.chiefComplaint"
-                                   :fetch-suggestions="queryComplaintSuggestions"
-                                   placeholder="请输入主诉内容或选择常用主诉" clearable
-                                   @select="selectComplaint" @clear="clearComplaint" @focus="handleComplaintFocus"
-                                   style="width: 85%"
-                                   :loading="loadingComplaints" class="complaint-autocomplete"
-                                   popper-class="complaint-popper">
-                    <template #default="{ item }">
+    </el-col>
+    <el-col :span="24">
+      <el-form-item label="主诉" prop="chiefComplaint" class="complaint-form-item">
+        <div class="complaint-input">
+          <el-autocomplete v-model="form.chiefComplaint" :fetch-suggestions="queryComplaintSuggestions"
+            placeholder="请输入主诉内容或选择常用主诉" clearable @select="selectComplaint" @clear="clearComplaint"
+            @focus="handleComplaintFocus" style="width: 85%" :loading="loadingComplaints" class="complaint-autocomplete"
+            popper-class="complaint-popper">
+            <template #default="{ item }">
                       <div class="complaint-option">
                         <span class="complaint-label">{{ item.label }}</span>
                         <span v-if="!item.isCustom" class="complaint-hint">
@@ -261,38 +274,38 @@
                         </span>
                       </div>
                     </template>
-                    <template #prefix>
+            <template #prefix>
                     </template>
-                  </el-autocomplete>
-                </div>
+          </el-autocomplete>
+        </div>
+      </el-form-item>
+    </el-col>
+    <el-col :span="24">
+      <el-form-item label="现病史" prop=" presentIllness">
+        <el-input v-model="form.presentIllness" type="textarea" placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="现病史" prop="presentIllness">
-                <el-input v-model="form.presentIllness" type="textarea" placeholder="请输入内容"/>
+            <el-col :span=" 24">
+          <el-form-item label="既往史" prop=" pastHistory">
+            <el-input v-model="form.pastHistory" type="textarea" placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="既往史" prop="pastHistory">
-                <el-input v-model="form.pastHistory" type="textarea" placeholder="请输入内容"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
+            <el-col :span=" 24">
               <el-form-item label="临床诊断" prop="diagnosis">
                 <el-input v-model="form.diagnosis" type="textarea" placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="医嘱事项" prop="medicalAdvice">
-                <el-input v-model="form.medicalAdvice" type="textarea" placeholder="请输入内容"/>
+            <el-col :span=" 24">
+                  <el-form-item label="医嘱事项" prop="medicalAdvice">
+                    <el-input v-model="form.medicalAdvice" type="textarea" placeholder="请输入内容"/>
               </el-form-item>
             </el-col>
           </el-col>
           <!-- 病人病历 -->
-          <el-col :span="12">
-            <h3>就诊记录</h3>
-            <!-- border height="250" -->
-            <el-table :data="nameDiagnosisList" style="width: 100%" max-height="1000px">
+          <el-col :span=" 12">
+                      <h3>就诊记录</h3>
+                      <!-- border height="250" -->
+                      <el-table :data="nameDiagnosisList" style="width: 100%" max-height="1000px">
               <el-table-column prop="outpatientTime" label="就诊时间" width="180">
               </el-table-column>
               <el-table-column prop="chiefComplaint" label="主诉" width="180">
@@ -308,15 +321,15 @@
                 </template>
               </el-table-column>
             </el-table>
-          </el-col>
-        </el-row>
-        <!-- os:patientDiagnosis:conventionalPrescription -->
-        <el-divider content-position="center"> 处方详情</el-divider>
-        <el-row class="prescriptionAdd">
+    </el-col>
+    </el-row>
+    <!-- os:patientDiagnosis:conventionalPrescription -->
+    <el-divider content-position="center"> 处方详情</el-divider>
+    <el-row class="prescriptionAdd">
           <el-button type="primary" plain size="mini" @click="addPrescriptionButton()">新增处方</el-button>
         </el-row>
-        <!-- 处方 -->
-        <el-row v-for="(index, item) in form.prescriptionDetailsList" :key="item">
+    <!-- 处方 -->
+    <el-row v-for="(index, item) in form.prescriptionDetailsList" :key="item">
           <el-row :gutter="10" class="mb8">
             <el-button v-if="false" type="primary" plain size="mini"
                        @click="prescriptionAddDruyAddChoice()">扫描添加
@@ -330,8 +343,8 @@
             <!-- 6 -->
             <el-button type="primary" plain size="mini" @click="removePrescription(item)">删除处方</el-button>
           </el-row>
-          <!-- border -->
-          <el-table :data="form.prescriptionDetailsList[item]" style="width: 100%" class="prescription">
+    <!-- border -->
+    <el-table :data="form.prescriptionDetailsList[item]" style="width: 100%" class="prescription">
             <el-table-column prop="name" label="编号" width="100">
               <template #default="scope">
                 {{ scope.$index + 1 }}
@@ -348,18 +361,18 @@
                       trigger: 'blur',
                     },
                   ]">
-                  <!--  一直 隐藏 的   v-if="false"  -->
+                  <!--  一�?隐藏 �?  v-if="false"  -->
                   <el-select v-model="form.prescriptionDetailsList[item][scope.$index].medicineName
                     " filterable placeholder="请选择" v-if="false">
                     <el-option v-for="item1 in druyNameList" :key="item1" :label="item1.medicineName"
                                :value="item1.medicineName" @click="choiceDruyName(item, scope.$index, item1)">
                     </el-option>
                   </el-select>
-                  <!-- 输入框弹框  focus  -->
-                  <!--  一直 隐藏 的 v-if="false"  -->
+                  <!-- 输入框弹�? focus  -->
+                  <!--  一�?隐藏 �?v-if="false"  -->
                   <el-input v-if="false" v-model="form.prescriptionDetailsList[item][scope.$index].medicineName
                     " @focus="drugArchivesBulletFrameOperation(item, scope.$index)"></el-input>
-                  <!-- 输入框弹框 药品 的 批次 库存   focus -->
+                  <!-- 输入框弹�?药品 �?批次 库存   focus -->
                   <el-input v-model="form.prescriptionDetailsList[item][scope.$index].medicineName
                     " @click="selectDrugPriceInputButton(item, scope)"></el-input>
                 </el-form-item>
@@ -436,7 +449,7 @@
                         },
                         {
                           pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
-                          message: '请输入一个有效的数',
+                          message: '请输入一个有效的数值',
                           trigger: 'blur',
                         },
                         {
@@ -540,7 +553,7 @@
                 </el-form-item>
               </template>
             </el-table-column> -->
-            <!-- 总量 1 可以 拆  -->
+            <!-- 总量 1 可以 �? -->
             <el-table-column prop="totalQuantity" label="总量" width="150">
               <template #default="scope">
                 <!--  进行 修改 进行 隐藏 form.prescriptionDetailsList[item][scope.$index].isSplit == 'Y' -->
@@ -560,7 +573,7 @@
                         },
                         {
                           pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
-                          message: '请输入一个有效的数',
+                          message: '请输入一个有效的数值',
                           trigger: 'blur',
                         },
                         {
@@ -590,7 +603,7 @@
                   </el-col>
                 </el-row>
                 <!-- splitUnit  packageUnit-->
-                <!-- 总量 2  不 可以 拆分   -->
+                <!-- 总量 2  �?可以 拆分   -->
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label-width="0px"
@@ -607,7 +620,7 @@
                         },
                         {
                           pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
-                          message: '请输入一个有效的数',
+                          message: '请输入一个有效的数值',
                           trigger: 'blur',
                         },
                         {
@@ -680,7 +693,14 @@
                       trigger: 'blur',
                     },
                   ]">
-                  {{ form.prescriptionDetailsList[item][scope.$index].totalPrice }}
+                  {{
+                    form.isInsured === 0
+                      ? ceilPrice(
+                          Number(form.prescriptionDetailsList[item][scope.$index].totalPrice || 0) *
+                          (1 - Number(form.value || 0) / 100)
+                        )
+                      : ceilPrice(form.prescriptionDetailsList[item][scope.$index].totalPrice || 0)
+                  }}
                   元
                 </el-form-item>
               </template>
@@ -698,98 +718,145 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-row>
-        <!-- 展示总价和 -->
-        <el-row>
+    </el-row>
+    <!-- 展示结算金额与原始总额 -->
+    <el-row>
           <el-col :span="24">
             <div style="text-align: right; margin-top: 20px;color: red">
-              <span>所有药品总价和: {{ totalPriceSum }} 元</span>
+              <span>
+                应收金额:{{ form.isInsured === 0 ? patientPay : ceilPrice(totalPriceSum) }} 元
+              </span>
+              <span style="margin-left: 16px; color: #666">
+                处方总金额:{{ ceilPrice(totalPriceSum) }} 元
+              </span>
+              <span v-if="form.isInsured === 0" style="margin-left: 16px; color: #333">
+                预计报销:{{ Number(currentReimbursement).toFixed(2) }} 元
+              </span>
             </div>
           </el-col>
         </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" v-if="form.status != 2" @click="saveDiagnosisButton()">保 存</el-button>
-          <el-button type="primary" v-if="form.status == 3" @click="saveAddDiagnosisButton()">确 定</el-button>
-          <el-button type="primary" v-if="form.status != 3" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <!-- 患者档案 -->
-    <PatientDossier ref="patientDossierRef" :title="ttto" :width="'80%'" :open="patientOpen"
-                    :patientQuery="patientQuery" @select-value="select" @input-query="updatePatientType()"/>
-    <!-- 药品库存 v-model="drugOpen" -->
-    <DrugInventory ref="drugInventoryRef" :style="{ width: '100%' }" :title="druyTitle" :open="drugOpen"
-                   :medicineName="medicineName" :queryParams="queryParamsDrugInventory"
-                   @input-medicine-name="updateMedicineName()"
-                   @select-value="obtainDrugInventoryData" @input-queryParams="drugInventoryInputQueryParams()"/>
-    <!-- 常规处方 -->
-    <ConventionalPrescription v-hasPermi="['os:patientDiagnosis:conventionalPrescription']"
-                              :title="conventionalPrescriptionTitle" v-model="conventionalPrescriptionOpen"
-                              @select-value="conventionalPrescriptionSelect"/>
-    <!-- 药品档案 -->
-    <DrugArchives ref="childComponentRef" :widthBf="sdada" :title="titleDrugArchives" :openAssembly="openDrugArchives"
-                  :queryParams="queryParamsDrugArchives" :controlQuery="controlQueryDrugArchives"
-                  :controlData="controlDataDrugArchives" @input-data="paginationDataFq()"
-                  @select-value="selectDrugData"/>
-    <!-- 患者诊断信息 -->
-    <DiagnosisInformation ref="diagnosisInformationRef" :style="styleDiagnosisInformation"
-                          :controlData="controlDataDiagnosisInformation"/>
+  </el-form>
+  <template #footer>
+    <div class="dialog-footer">
+      <el-button type="primary" v-if="form.status != 2" @click="saveDiagnosisButton()">保存</el-button>
+        <el-button type="primary" v-if="form.status == 3" @click="saveAddDiagnosisButton()">保存新增</el-button>
+          <el-button type="primary" v-if="form.status != 3" @click="submitForm">提交</el-button>
+            <el-button @click="cancel">取消</el-button>
+    </div>
+  </template>
+</el-dialog>
+<!-- Worksite selection prompt -->
+<el-dialog
+  title="&#35831;&#36873;&#25321;&#19978;&#29677;&#26657;&#21306;"
+  v-model="warehousePromptOpen"
+  width="700px"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  :show-close="false"
+>
+  <div class="warehouse-current">
+    &#24403;&#21069;&#36873;&#25321;&#65306;{{ userWarehouseInfo.storeroomName || '&#26410;&#36873;&#25321;' }}
   </div>
+  <el-table v-loading="warehouseLoading" :data="warehouseList">
+    <el-table-column label="&#25805;&#20316;" align="center" prop="id" width="120" />
+    <el-table-column label="&#19978;&#29677;&#26657;&#21306;" align="center" prop="storeroomName" />
+    <el-table-column label="&#25805;&#20316;" align="center" width="120">
+      <template #default="scope">
+        <el-button type="primary" @click="selectWarehouseForPrompt(scope.row)">&#36873;&#25321;</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</el-dialog>
+<!-- 患者档�?-->
+<PatientDossier ref="patientDossierRef" :title="ttto" :width="'80%'" :open="patientOpen" :patientQuery="patientQuery"
+  @select-value="select" @input-query="updatePatientType()" />
+<!-- 药品库存 v-model="drugOpen" -->
+<DrugInventory ref="drugInventoryRef" :style="{ width: '100%' }" :title="druyTitle" :open="drugOpen"
+  :medicineName="medicineName" :queryParams="queryParamsDrugInventory" @input-medicine-name="updateMedicineName()"
+  @select-value="obtainDrugInventoryData" @input-queryParams="drugInventoryInputQueryParams()" />
+<!-- 常规处方 -->
+<ConventionalPrescription v-hasPermi="['os:patientDiagnosis:conventionalPrescription']"
+  :title="conventionalPrescriptionTitle" v-model="conventionalPrescriptionOpen"
+  @select-value="conventionalPrescriptionSelect" />
+<!-- 药品档案 -->
+<DrugArchives ref="childComponentRef" :widthBf="sdada" :title="titleDrugArchives" :openAssembly="openDrugArchives"
+  :queryParams="queryParamsDrugArchives" :controlQuery="controlQueryDrugArchives" :controlData="controlDataDrugArchives"
+  @input-data="paginationDataFq()" @select-value="selectDrugData" />
+<!-- 患者诊断信�?-->
+<DiagnosisInformation ref="diagnosisInformationRef" :style="styleDiagnosisInformation"
+  :controlData="controlDataDiagnosisInformation" />
+</div>
 </template>
 
 
 <script setup name="PatientDiagnosis">
-import {onActivated, ref} from 'vue'
+import { onActivated, ref, watch } from 'vue'
+
+// 价格向上取整到小数点后两位（进一法）
+// 例如: 8.123 → 8.13, 2.234 → 2.24, 8.02 → 8.02, 0.55 → 0.55
+// 先缩放到整数避免浮点精度问题（0.55*100=55.0000001 会导致 Math.ceil 错误进位）
+function ceilPrice(value) {
+  const num = Number(value)
+  if (isNaN(num)) return '0.00'
+  const scaled = Math.round(num * 10000)  // 缩放到4位小数的整数，消除浮点噪声
+  const cents = Math.ceil(scaled / 100)    // 向上取整到分（2位小数）
+  return (cents / 100).toFixed(2)
+}
 
 
+import { getHealthcareOsPatientInfo } from '@/api/healthcare/outpatientService/healthcareOsPatientInfo'
 import {
-  addPatientDiagnosis, delPatientDiagnosis, getPatientDiagnosis, listPatientDiagnosis,
-  saveAddDiagnosis, saveDiagnosis, saveUpdate, updatePatientDiagnosis, verifyInsuranceStatus
+    addPatientDiagnosis, delPatientDiagnosis,
+    getHistoryReimbursement,
+    getPatientDiagnosis, listPatientDiagnosis,
+    saveAddDiagnosis, saveDiagnosis, saveUpdate, updatePatientDiagnosis, verifyInsuranceStatus
 } from '@/api/healthcare/outpatientService/patientDiagnosis'
 // healthcare/outpatientService/patientDiagnosis
 // src\components\Healthcare\OutpatientService\PatientDossier\index.vue
 //  healthcareOsComplaints  DrugArchives
 import {
-  listCommonUsage,
-  listEatingTime,
-  listFrequency
+    listCommonUsage,
+    listEatingTime,
+    listFrequency
 } from '@/api/healthcare/outpatientService/healthcareOsConventionalValue'
 
-const {proxy} = getCurrentInstance()
-// 在setup脚本中添加
+const { proxy } = getCurrentInstance()
+// 在setup脚本中添�?
 onActivated(() => {
   // 当组件被激活时刷新数据
   getList()
 })
 const dsada = ref()
 
-// 患者类型
-const {healthcare_os_patient_type} = proxy.useDict('healthcare_os_patient_type')
+// 患者类�?
+const { healthcare_os_patient_type } = proxy.useDict('healthcare_os_patient_type')
 // os_patient_type
-const {healthcare_os_diagnosis_type} = proxy.useDict('healthcare_os_diagnosis_type')
+const { healthcare_os_diagnosis_type } = proxy.useDict('healthcare_os_diagnosis_type')
 // 医药包装单位
-const {healthcare_packaging_unit} = proxy.useDict('healthcare_packaging_unit')
+const { healthcare_packaging_unit } = proxy.useDict('healthcare_packaging_unit')
 //
-const {sys_user_sex} = proxy.useDict('sys_user_sex')
+const { sys_user_sex } = proxy.useDict('sys_user_sex')
 //
-const {healthcare_dose_unit} = proxy.useDict('healthcare_dose_unit')
+const { healthcare_dose_unit } = proxy.useDict('healthcare_dose_unit')
 // healthcare_os_insured  是否 医保
-const {healthcare_os_insured} = proxy.useDict('healthcare_os_insured')
-// healthcare_os_diagnosis_status    诊断状态
-const {healthcare_os_diagnosis_status} = proxy.useDict('healthcare_os_diagnosis_status')
+const { healthcare_os_insured } = proxy.useDict('healthcare_os_insured')
+// healthcare_os_diagnosis_status    诊断状�?
+const { healthcare_os_diagnosis_status } = proxy.useDict('healthcare_os_diagnosis_status')
 
-// 系统 的 是否
-const {sys_yes_no} = proxy.useDict('sys_yes_no')
+// 系统 �?是否
+const { sys_yes_no } = proxy.useDict('sys_yes_no')
 
 // 获取 常用用法
 common()
 const commonUsageList = ref([]) // 用法
 const eatingTimeList = ref([]) //  食用时间
 const frequencyList = ref([]) //   次数
-const totalPriceSum = ref(0) //所有药品总价和
+const totalPriceSum = ref(0) //所有药品总价�?
+// 历史累计医保报销金额与限额、当前报销估算
+const historyReimbursement = ref(0)
+const reimbursementLimit = ref(300)
+const currentReimbursement = ref(0)
+const patientPay = ref(0)
 function common() {
   listCommonUsage().then(res => {
     commonUsageList.value = res.rows
@@ -813,6 +880,13 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
 
+const HEALTH_CLINIC_DEPT_ID = 101
+const WAREHOUSE_PROMPT_KEY = 'healthcare_warehouse_prompted'
+const warehousePromptOpen = ref(false)
+const warehouseList = ref([])
+const warehouseLoading = ref(false)
+const userWarehouseInfo = ref({})
+
 //
 const data = reactive({
   form: {},
@@ -836,7 +910,7 @@ const data = reactive({
     startTime: null,
     endTime: null
   },
-  // vue3 的 封装 的好 的 检验 写法   pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+  // vue3 �?封装 的好 �?检�?写法   pattern: /^1(3|4|5|7|8|9)\d{9}$/,
   rules: {
     patientType: [
       {
@@ -853,16 +927,16 @@ const data = reactive({
       }
     ],
     studentId: [
-      {required: true, message: '学号/工号不能为空', trigger: 'blur'},
-      {pattern: /^\d+(\.\d+)?$/, message: '请输入一个有效的正数', trigger: 'blur'},
-      {pattern: /^\S+.*$/, message: '开头有空格', trigger: 'blur'}
+      { required: true, message: '学号/工号不能为空', trigger: 'blur' },
+      { pattern: /^\d+(\.\d+)?$/, message: '请输入一个有效的正数', trigger: 'blur' },
+      { pattern: /^\S+.*$/, message: '开头有空格', trigger: 'blur' }
     ],
-    name: [{required: true, message: '姓名不能为空', trigger: 'blur'}],
-    phone: [{required: false, message: '手机不能为空', trigger: 'blur'}],
-    isInsured: [{required: true, message: '是否医保不能为空', trigger: 'blur'}],
+    name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+    phone: [{ required: false, message: '手机不能为空', trigger: 'blur' }],
+    isInsured: [{ required: true, message: '是否医保不能为空', trigger: 'blur' }],
     value: [
-      {required: true, message: '医保率不能为空', trigger: 'blur'},
-      {pattern: /^\d+(\.\d+)?$/, message: '请输入一个有效的小数', trigger: 'blur'},
+      { required: true, message: '报销比率不能为空', trigger: 'blur' },
+      { pattern: /^\d+(\.\d+)?$/, message: '请输入一个有效的小数', trigger: 'blur' },
       {
         pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
         message: '请输入一个有效的小数',
@@ -884,8 +958,8 @@ const data = reactive({
   }
 })
 
-// 方法 没有 被 调用
-// 计算所有药品总价和
+// 方法 没有 �?调用
+// 计算所有药品总价�?
 function calculationTotalSum(index, index2) {
   const totalPrice = ref(0)
   if (form.value.isInsured == healthcare_os_insured.value[0].value) {
@@ -895,25 +969,24 @@ function calculationTotalSum(index, index2) {
   }
 
   if (!Number.isNaN(totalPrice.value)) {
-    totalPrice.value = totalPrice.value.toFixed(2)
+    totalPrice.value = ceilPrice(totalPrice.value)
     form.value.prescriptionDetailsList[index][index2].totalPrice = totalPrice.value
   } else {
     form.value.prescriptionDetailsList[index][index2].totalPrice = 0
   }
 
-  // 更新总价和  进行 再次 计算 
+  // 更新总价�? 进行 再次 计算 
   totalPriceSumF()
 }
 
 
-// 转接 使用 诊断 的 使用 数据 的    显示 变量 进行 计算 
+// 转接 使用 诊断 �?使用 数据 �?   显示 变量 进行 计算 
 function totalPriceSumF() {
-  // 更新总价和
-  totalPriceSum.value = form.value.prescriptionDetailsList
+  // 更新总价�?
+  totalPriceSum.value = ceilPrice(form.value.prescriptionDetailsList
       .reduce((sum, prescription) => {
         return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
-      }, 0)
-      .toFixed(2)
+      }, 0))
 }
 
 // 校验 方法
@@ -930,9 +1003,31 @@ function checkValueRules(rule, value, callback) {
 
 const {queryParams, form, rules} = toRefs(data)
 
+// 实时联动预计报销与自付金�?放在 form 初始化之�?
+watch([
+  () => form.value?.value,
+  () => form.value?.isInsured,
+  () => totalPriceSum.value
+], () => {
+  const insured = form.value?.isInsured
+  const sum = Number(totalPriceSum.value || 0)
+  if (insured === 0) {
+    const rate = Number(form.value?.value || 0) / 100
+    const r = isNaN(rate) ? 0 : rate
+    // 先计算个人应付（向上取整）
+    const pay = ceilPrice(sum * (1 - r))
+    patientPay.value = pay
+    // 预计报销 = 总价 - 个人应付
+    currentReimbursement.value = (sum - Number(pay)).toFixed(2)
+  } else {
+    currentReimbursement.value = '0.00'
+    patientPay.value = ceilPrice(sum)
+  }
+})
+
 const nameDiagnosisList = ref([])
 
-// 患者 的 诊断 的 列表
+// 患�?�?诊断 �?列表
 watch(
     () => form.value.studentId,
     (newValue, odlValue) => {
@@ -948,68 +1043,130 @@ watch(
 )
 const insuranceDisabled = ref(false)
 
+// 输入百分比的展示与解�?用于 el-input-number)
+const insuranceFormatter = (value) => {
+  if (value === undefined || value === null || value === '') return ''
+  return `${value}%`
+}
+const insuranceParser = (value) => {
+  if (value === undefined || value === null) return 0
+  const v = String(value).replace(/%/g, '')
+  const num = parseFloat(v)
+  return isNaN(num) ? 0 : num
+}
+
+const currentYearDate = () => {
+  const now = new Date()
+  return new Date(now.getFullYear(), 0, 1)
+}
+
 const handleInsuranceClear = () => {
   insuranceDisabled.value = false;
   form.value.isInsured = null;
   form.value.value = null;
+  currentReimbursement.value = 0;
+  // 清空为总价作为自付金额
+  patientPay.value = ceilPrice(totalPriceSum.value || 0);
 };
-// 判断患者是否可用医保方法
+// 判断患者是否可用医保方�?
 const handleInsuranceChange = async (value) => {
   if (value === null || value === undefined) return;
   try {
 
     // 获取身份证信息和姓名
-    const name = form.value.name;
-    const idCard = form.value.idCard;
+    let name = form.value.name;
+    let idCard = form.value.idCard;
 
     if (value === 1) {
-      insuranceDisabled.value = false; // 保持可编辑状态
+      insuranceDisabled.value = false; // 保持可编辑状�?
       return;
     }
-    // 如果没有身份证信息
+    // 如果没有身份证信�?尝试通过 patientId 自动补全
     if (!idCard) {
-      form.value.isInsured = 1; // 假设字典中1表示否
-      insuranceDisabled.value = true; // 锁定选择
-      proxy.$modal.msgWarning('请先选择患者并获取身份证信息');
-      return;
+      if (form.value.patientId) {
+        try {
+          const p = await getHealthcareOsPatientInfo(form.value.patientId)
+          if (p && p.code === 200 && p.data) {
+            idCard = p.data.idCard
+            name = p.data.name || name
+            form.value.idCard = idCard
+            form.value.name = name
+          }
+        } catch (e) {
+          // 忽略补全失败
+        }
+      }
+      if (!idCard) {
+        form.value.isInsured = 1; // 假设字典�?表示�?
+        insuranceDisabled.value = true; // 锁定选择
+        historyReimbursement.value = 0;
+        proxy.$modal.msgWarning('请先选择患者并获取身份证信息');
+        return;
+      }
     }
 
-    // 调用后端接口验证医保状态
+    // 调用后端接口验证医保状�?
     const res = await verifyInsuranceStatus(idCard, name);
-    // 无论是否通过都先重置状态
+    // 无论是否通过都先重置状�?
     insuranceDisabled.value = false;
 
     if (res.code === 200) {
       if (res.data === 0) {
         proxy.$modal.msgSuccess('医保可用');
-
+        // 获取历史累计医保报销金额
+        if (form.value.patientId) {
+          try {
+            const his = await getHistoryReimbursement(form.value.patientId, currentYearDate())
+            if (his && his.code === 200) {
+              historyReimbursement.value = Number(his.data || 0)
+            }
+          } catch (e) {
+            historyReimbursement.value = 0
+          }
+        }
+        // 初步校验当前处方是否可能超限
+        if (Array.isArray(form.value.prescriptionDetailsList) && form.value.isInsured === 0 && form.value.value) {
+          // 以当前总价和乘报销比率作为本次报销估算
+          const rate = Number(form.value.value || 0) / 100
+          const calcR = Number(totalPriceSum.value || 0) * (isNaN(rate) ? 0 : rate)
+          patientPay.value = ceilPrice(Number(totalPriceSum.value || 0) - calcR)
+          currentReimbursement.value = Number(totalPriceSum.value || 0) - Number(patientPay.value)
+          if (historyReimbursement.value + currentReimbursement.value > reimbursementLimit.value) {
+            proxy.$modal.msgWarning('累计医保报销超出300元限额已切换为自费');
+            form.value.isInsured = 1;
+            insuranceDisabled.value = true;
+          }
+        }
       } else {
-        form.value.isInsured = 1; // 假设字典中1表示否
+        form.value.isInsured = 1; // 假设字典�?表示�?
         insuranceDisabled.value = true; // 锁定选择
-        proxy.$modal.msgWarning('该患者医保未缴费，不可使用医保！');
+        historyReimbursement.value = 0;
+        proxy.$modal.msgWarning('该患者医保未缴费,不可使用医保!');
       }
     }
   } catch (error) {
     form.value.isInsured = 1;
     insuranceDisabled.value = true;
+    historyReimbursement.value = 0;
     proxy.$modal.msgError('医保验证失败');
 
   }
 };
 // 选择 医生 对应 库房 对应 诊断信息列表
-import {getWarehouse} from '@/api/healthcare/warehouse'
-import {getUserProfile} from '@/api/system/user.js'
+import { getWarehouse, listWarehouse, updateWarehouse } from '@/api/healthcare/warehouse'
+import { getUserProfile } from '@/api/system/user.js'
 
-/** 查询患者诊断信息列表 */
+/** 查询患者诊断信息列�?*/
 function getList() {
   loading.value = true
   //  获取 医生(用户) 信息
   getUserProfile().then(userInfoRow => {
     // 获取 库房 信息
     getWarehouse(userInfoRow.data.userId).then(res => {
-      // 赋值 库房id
+      // 赋�?库房id
       queryParams.value.storeroomId = res.data.storeroomId
-      // 获取 患者诊断信息列表
+      queryParams.value.storeroomName = res.data.storeroomName
+      // 获取 患者诊断信息列�?
       listPatientDiagnosis(queryParams.value).then(response => {
         patientDiagnosisList.value = response.rows
         total.value = response.total
@@ -1022,7 +1179,7 @@ function getList() {
 // 获取 库房 信息 存储
 const userInfoWarehouse = ref({})
 
-// 获取 库房 信息 的 方法
+// 获取 库房 信息 �?方法
 function getWarehouseInfo() {
   //
   getUserProfile().then(res => {
@@ -1032,10 +1189,61 @@ function getWarehouseInfo() {
   })
 }
 
+// Health clinic users must choose worksite on first entry
+function loadWarehouseList() {
+  warehouseLoading.value = true
+  listWarehouse().then(response => {
+    warehouseList.value = response.rows || []
+  }).finally(() => {
+    warehouseLoading.value = false
+  })
+}
+
+function openWarehousePromptIfNeeded() {
+  getUserProfile().then(res => {
+    const userId = res?.data?.userId
+    const promptKey = `${WAREHOUSE_PROMPT_KEY}_${userId}`
+    if (sessionStorage.getItem(promptKey)) {
+      return
+    }
+    const deptId = res?.data?.deptId ?? res?.data?.dept?.deptId
+    if (deptId !== HEALTH_CLINIC_DEPT_ID) {
+      return
+    }
+    getWarehouse(res.data.userId).then(response => {
+      userWarehouseInfo.value = response.data || {}
+      warehousePromptOpen.value = true
+      loadWarehouseList()
+    })
+  })
+}
+
+function selectWarehouseForPrompt(row) {
+  if (!row) {
+    return
+  }
+  userWarehouseInfo.value = userWarehouseInfo.value || {}
+  userWarehouseInfo.value.storeroomId = row.id
+  userWarehouseInfo.value.storeroomName = row.storeroomName
+  updateWarehouse(userWarehouseInfo.value).then(() => {
+    const userId = userWarehouseInfo.value?.userId
+    const promptKey = `${WAREHOUSE_PROMPT_KEY}_${userId}`
+    sessionStorage.setItem(promptKey, '1')
+    warehousePromptOpen.value = false
+    queryParams.value.storeroomId = row.id
+    queryParams.value.storeroomName = row.storeroomName
+    form.value.storeroomId = row.id
+    form.value.storeroomName = row.storeroomName
+  })
+}
+
 // 取消按钮
 function cancel() {
   open.value = false
   reset()
+  totalPriceSum.value = 0
+  currentReimbursement.value = 0
+  patientPay.value = 0
 }
 
 // 表单重置
@@ -1068,9 +1276,14 @@ function reset() {
     storeroomName: null,
     idCard: null,
     prescriptionDetailsList: []
-    // 新增医保状态重置
+    // 新增医保状态重�?
   }
   insuranceDisabled.value = false
+  // 清空报销相关显示数据,避免出现上一次的�?
+  historyReimbursement.value = 0
+  currentReimbursement.value = 0
+  totalPriceSum.value = 0
+  patientPay.value = 0
   proxy.resetForm('patientDiagnosisRef')
 }
 
@@ -1115,15 +1328,43 @@ function handleUpdate(row) {
     form.value = response.data
     open.value = true
     title.value = '修改患者诊断信息'
-    // 进行 价格 计算 显示 对话框 
+    // 进行 价格 计算 显示 对话�?
     totalPriceSumF()
     // 重新刷新数据
     getList()
+    // 编辑场景下自动补齐身份证和历史累计医保金�?
+    if (form.value.patientId && !form.value.idCard) {
+      getHealthcareOsPatientInfo(form.value.patientId).then(p => {
+        if (p && p.code === 200 && p.data) {
+          form.value.idCard = p.data.idCard
+          if (!form.value.name) form.value.name = p.data.name
+        }
+      }).catch(() => {})
+    }
+    if (form.value.patientId) {
+      getHistoryReimbursement(form.value.patientId, currentYearDate()).then(his => {
+        if (his && his.code === 200) {
+          historyReimbursement.value = Number(his.data || 0)
+        }
+      }).catch(() => {
+        historyReimbursement.value = 0
+      })
+    }
   })
 }
 
 /** 提交按钮 */
 function submitForm() {
+  // 提交前进行医保报销额度最终校�?
+  // 先重新计算当前处方可报销金额
+  calculationWholeTotal()
+  if (form.value.isInsured === 0) {
+    const sum = Number(historyReimbursement.value || 0) + Number(currentReimbursement.value || 0)
+    if (sum > Number(reimbursementLimit.value || 300)) {
+      proxy.$modal.msgWarning('累计医保报销超出300元限额,请调整处方或切换为自费');
+      return
+    }
+  }
   // console.log('提交按钮', form, form.value)
   //  获取 库房 信息
   getUserProfile().then(res => {
@@ -1139,12 +1380,18 @@ function submitForm() {
               proxy.$modal.msgSuccess('修改成功')
               open.value = false
               getList()
+              totalPriceSum.value = 0
+              currentReimbursement.value = 0
+              patientPay.value = 0
             })
           } else {
             addPatientDiagnosis(form.value).then(response => {
               proxy.$modal.msgSuccess('新增成功')
               open.value = false
               getList()
+              totalPriceSum.value = 0
+              currentReimbursement.value = 0
+              patientPay.value = 0
             })
           }
         }
@@ -1159,7 +1406,7 @@ function saveDiagnosisButton() {
   //  获取 库房 信息
   getUserProfile().then(res => {
     getWarehouse(res.data.userId).then(response => {
-      // 赋值
+      // 赋�?
       form.value.storeroomId = response.data.storeroomId
       form.value.storeroomName = response.data.storeroomName
       // 请求 修改 保存
@@ -1185,12 +1432,18 @@ function saveDiagnosisButton() {
           proxy.$modal.msgSuccess('修改保存成功')
           open.value = false
           getList()
+          totalPriceSum.value = 0
+          currentReimbursement.value = 0
+          patientPay.value = 0
         })
       } else {
         saveDiagnosis(form.value).then(response => {
           proxy.$modal.msgSuccess('保存成功')
           open.value = false
           getList()
+          totalPriceSum.value = 0
+          currentReimbursement.value = 0
+          patientPay.value = 0
         })
       }
       // if(form.value.chiefComplaint != '' || form.value.presentIllness != '' || form.value.diagnosis != '' || form.value.medicalAdvice != '') {
@@ -1232,14 +1485,14 @@ function saveDiagnosisButton() {
   })
 }
 
-// 修改 保存 库存 操作 的 方法
+// 修改 保存 库存 操作 �?方法
 function saveAddDiagnosisButton() {
   // console.log('保存成功', form, form.value)
-  // 获取 选择 的 库房
+  // 获取 选择 �?库房
   //  获取 库房 信息
   getUserProfile().then(res => {
     getWarehouse(res.data.userId).then(response => {
-      // 赋值
+      // 赋�?
       form.value.storeroomId = response.data.storeroomId
       form.value.storeroomName = response.data.storeroomName
       // 请求
@@ -1249,6 +1502,9 @@ function saveAddDiagnosisButton() {
             proxy.$modal.msgSuccess('添加成功')
             open.value = false
             getList()
+            totalPriceSum.value = 0
+            currentReimbursement.value = 0
+            patientPay.value = 0
           })
         }
       })
@@ -1289,8 +1545,9 @@ function handleExport() {
 }
 
 //
+import { listHealthcareOsComplaints } from '@/api/healthcare/outpatientService/healthcareOsComplaints'
 import PatientDossier from '@/components/Healthcare/OutpatientService/PatientDossier/index.vue'
-// 患者 档案  组件
+// 患�?档案  组件
 // 请求 参数
 const patientOpen = ref(false)
 const ttto = ref('患者档案')
@@ -1305,13 +1562,13 @@ const patientQuery = ref({
   name: null
 })
 
-// 更新 患者  事件 处理 方法 input-patient-type
+// 更新 患�? 事件 处理 方法 input-patient-type
 const updatePatientType = value => {
   // console.log('药品名称', value)
   patientQuery.value = value
 }
 
-// 获取 患者 信息 的 方法
+// 获取 患�?信息 �?方法
 function selectPatient() {
   //
   patientDossierRef.value.openDialog()
@@ -1324,10 +1581,10 @@ function selectPatient() {
   })
 }
 
-// 接收 子 数据  患者基本
+// 接收 �?数据  患者基�?
 const select = value => {
-  // console.log('接收子数据', value)
-  // console.log('接收子数据12:', value.patientType)
+  // console.log('接收子数�?, value)
+  // console.log('接收子数�?2:', value.patientType)
   form.value.patientId = value.id
   form.value.patientType = Number(value.patientType)
   form.value.studentId = value.studentId
@@ -1340,19 +1597,28 @@ const select = value => {
   form.value.counselor = value.counselor
   form.value.department = value.department
   form.value.idCard = value.idCard
-  // console.log('接收子数据', form.value)
+  // console.log('接收子数�?, form.value)
   //
   studentIdRef.value.blur()
-  // console.log('hdsahjk觉得撒打赏', studentIdRef.value.blur())
+  // console.log('hdsahjk觉得撒打�?, studentIdRef.value.blur())
   //
   patientDossierRef.value.closeDialog()
-  // 新增医保状态重置
+  // 新增医保状态重�?
   insuranceDisabled.value = false;
   form.value.isInsured = null // 重置医保选择
-  form.value.value = null     // 重置医保率
+  form.value.value = null     // 重置报销比率
+  // 获取历史医保累计金额
+  if (form.value.patientId) {
+    getHistoryReimbursement(form.value.patientId, currentYearDate()).then(his => {
+      if (his && his.code === 200) {
+        historyReimbursement.value = Number(his.data || 0)
+      }
+    }).catch(() => {
+      historyReimbursement.value = 0
+    })
+  }
 }
 reset()
-import {listHealthcareOsComplaints} from '@/api/healthcare/outpatientService/healthcareOsComplaints'
 // selectComplaints
 const queryComplaints = ref({
   complaintName: null
@@ -1369,7 +1635,7 @@ function getListComplaints() {
 
 // getListComplaints();
 
-/*  选择 主诉 内容 进行 赋值 的 方法  */
+/*  选择 主诉 内容 进行 赋�?�?方法  */
 
 function selectComplaints(value) {
   // console.log('选择主诉', value.currentHistory)
@@ -1382,17 +1648,17 @@ function selectComplaints(value) {
 
 import DrugInventory from '@/components/Healthcare/OutpatientService/DrugInventory/index.vue'
 
-/* 处理 处方 药品 信息 价格 子组件 使用  */
+/* 处理 处方 药品 信息 价格 子组�?使用  */
 
 //  药品 批次 列表  弹框 显示 变量
 const drugOpen = ref(false)
 // 药品 批次 列表  弹框 标题
 const druyTitle = ref('药品价格')
-// 处方 序号  用 确定 哪一个 处方
+// 处方 序号  �?确定 哪一�?处方
 const prescriptionItem = ref(0)
-// 药品 序号 用 确定 哪一个 药品
+// 药品 序号 �?确定 哪一�?药品
 const drugItem = ref(0)
-// 数据  传送 的  参数
+// 数据  传�?�? 参数
 const medicineName = ref('')
 //
 const drugInventoryRef = ref(null)
@@ -1418,57 +1684,57 @@ const updateMedicineName = value => {
   medicineName.value = value
 }
 
-// 处方 列表 里面 输入框  点击 事件 处理 方法
+// 处方 列表 里面 输入�? 点击 事件 处理 方法
 function selectDrugPriceInput(item, row) {
   // 药品 批次 列表  弹框 显示 变量
-  // 进行 判断 是否 有 药品 名字
+  // 进行 判断 是否 �?药品 名字
   if (form.value.prescriptionDetailsList[item][row.$index].medicineName != null) {
     drugOpen.value = true
   } else {
     proxy.$modal.msgWarning('请先输入药品名称')
     retrun
   }
-  // 药品 批次 弹框 组件 里面 的 方法
+  // 药品 批次 弹框 组件 里面 �?方法
   drugInventoryRef.value.openDialog()
-  // 处方 的 序号
+  // 处方 �?序号
   prescriptionItem.value = item
-  // 药品 的 序号
+  // 药品 �?序号
   drugItem.value = row.$index
-  // 药品 的 名字
+  // 药品 �?名字
   updateMedicineName(form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName)
 }
 
-// 处理 药品 批次 库存 的 按钮
+// 处理 药品 批次 库存 �?按钮
 function selectDrugPriceInputButton(item, row) {
   // console.log('row', drugInventoryRef.value.updateQueryParams(queryParamsDrugInventory.value), queryParamsDrugInventory.value.medicineName, row.row.medicineName, item, row.$index)
-  // 重置请求 参数 的 方法
+  // 重置请求 参数 �?方法
   resetQueryParamsDrugInventory()
-  // 判断 row 里面 有 没有 medicineName 属性
+  // 判断 row 里面 �?没有 medicineName 属�?
   if (row.row.hasOwnProperty('medicineName')) {
     queryParamsDrugInventory.value.medicineName = row.row.medicineName
     // drugInventoryRef.value.updateQueryParams(queryParamsDrugInventory.value);
   }
-  // 药品 批次 弹框 组件 里面 的 方法
+  // 药品 批次 弹框 组件 里面 �?方法
   drugInventoryRef.value.openDialog(queryParamsDrugInventory.value)
   prescriptionItem.value = item
   drugItem.value = row.$index
 }
 
-// 事件 修改 子 组件 的 请求 参数
+// 事件 修改 �?组件 �?请求 参数
 const drugInventoryInputQueryParams = value => {
   queryParamsDrugInventory.value.medicineName = value
 }
 
 const inputPrice = ref(null)
 
-// 药品 批次 列表 库存  返回  事件 处理 接收 子组件 传输 过来的数据
+// 药品 批次 列表 库存  返回  事件 处理 接收 子组�?传输 过来的数�?
 const drugPriceSelect = value => {
   // console.log('接收药品档案数据', prescriptionItem.value, drugItem.value, form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName, value.medicineName, value, form, sys_yes_no, sys_yes_no.value[0].value, sys_yes_no.value[1].value, value.minNumber)
   drugOpen.value = false
   // 比配 名字 是否 相同
   if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName == value.medicineName) {
     form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineId = value.filingId
-    // 药品 名称 赋值
+    // 药品 名称 赋�?
     if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit != null) {
       // 判断 是否 可以  拆分
       if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit == 'Y') {
@@ -1480,9 +1746,9 @@ const drugPriceSelect = value => {
         //
         form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitPrice = value.filingRetailPrice
       }
-      // 进行 计算  对 单 个 药品 进行 计算 价格
+      // 进行 计算  �?�?�?药品 进行 计算 价格
       calculationTotal(prescriptionItem.value, drugItem.value)
-      // 库存进行 计算 想要 的 数据 的 赋值
+      // 库存进行 计算 想要 �?数据 �?赋�?
       const boxCount = value.boxCount
       const packCount = value.packCount
       // 库存 处理 方法
@@ -1493,14 +1759,14 @@ const drugPriceSelect = value => {
   } else {
     proxy.$modal.msgSuccess('错误提示 药品名称错误')
   }
-  // console.log('赋值', form)
+  // console.log('赋�?, form)
 }
 
-// 选择 药品 和 批次 的 库存 的 操作
+// 选择 药品 �?批次 �?库存 �?操作
 // obtain  drug   inventory   data
 const obtainDrugInventoryData = value => {
-  // console.log('选择 药品 和 批次 的 库存 的 操作', value)
-  // 药品 id 赋值
+  // console.log('选择 药品 �?批次 �?库存 �?操作', value)
+  // 药品 id 赋�?
   form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineId = value.filingId
   //  药品 名称
   form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName = value.medicineName
@@ -1511,7 +1777,7 @@ const obtainDrugInventoryData = value => {
 
   // 规格
   form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].specification = value.specification
-  // 药品 使用 单位  最小包装单位
+  // 药品 使用 单位  最小包装单�?
   if (!form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].hasOwnProperty('splitUnit')) {
     form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].splitUnit = value.splitUnit
   }
@@ -1526,12 +1792,12 @@ const obtainDrugInventoryData = value => {
     // 药品 单价
     form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitPrice = value.minNumberRetailPrice
     if (value.state == 0) {
-      // 最小单位数量
+      // 最小单位数�?
       form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.minNumber
     }
     //
     if (value.state == 1) {
-      // 最小包装数量
+      // 最小包装数�?
       form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.unitQuantity
     }
   }
@@ -1542,15 +1808,15 @@ const obtainDrugInventoryData = value => {
   }
   // 进行 计算 
   calculationTotal(prescriptionItem.value, drugItem.value)
-  // 库存进行 计算 想要 的 数据 的 赋值
+  // 库存进行 计算 想要 �?数据 �?赋�?
   const boxCount = value.boxCount
   const packCount = value.packCount
   // 库存 处理 方法
   drugInventoryHandleInsufficient(prescriptionItem.value, drugItem.value, boxCount, packCount)
 }
 
-/* 获取 药品 名称 列表 药品 基本 档案 药品 名称 是 唯一的  */
-import {gainMedicineArchiveList} from '@/api/healthcare/outpatientService/patientDiagnosis'
+/* 获取 药品 名称 列表 药品 基本 档案 药品 名称 �?唯一�? */
+import { gainMedicineArchiveList } from '@/api/healthcare/outpatientService/patientDiagnosis'
 // reactive
 const druyNameList = ref([])
 const druyName = ref([])
@@ -1561,10 +1827,10 @@ function getDruyNameListQuer() {
     druyNameList.value = response.rows
     // console.log('药品名称:', response.rows)
   })
-  // console.log('获取 药品 信息 列表 药品 基本 档案 药品 名称 是 唯一的 ', druyName.value, druyNameList.value)
+  // console.log('获取 药品 信息 列表 药品 基本 档案 药品 名称 �?唯一�?', druyName.value, druyNameList.value)
 }
 
-// 控制 是否 显示 可以 拆分 总量  总量  可以 拆分  总量  不 可以 拆分
+// 控制 是否 显示 可以 拆分 总量  总量  可以 拆分  总量  �?可以 拆分
 const isDisplayTotalQuantity = ref(0)
 
 // 点击 事件 choiceDruyName
@@ -1573,13 +1839,13 @@ function choiceDruyName(index, index2, value) {
   form.value.prescriptionDetailsList[index][index2].splitUnit = value.splitUnit
   form.value.prescriptionDetailsList[index][index2].packageUnit = value.packageUnit
   form.value.prescriptionDetailsList[index][index2].isSplit = value.isSplit
-  // 控制 药品 输入 框 的 控制
+  // 控制 药品 输入 �?�?控制
   // form.value.prescriptionDetailsList[index][index2].isSplit == 'Y'
-  // 1 => 可以 拆分 ; 0 => 不 可以 拆分、
+  // 1 => 可以 拆分 ; 0 => �?可以 拆分�?
   isDisplayTotalQuantity.value = 0
 }
 
-// 点击 输入 框  触发 事件 处理 药品 名称 列表 显示
+// 点击 输入 �? 触发 事件 处理 药品 名称 列表 显示
 const queryDrugName = async (queryString, cb) => {
   druyName.value = queryString
   getDruyNameListQuer()
@@ -1616,7 +1882,7 @@ function addDrugButton(index) {
   //   eatingTime: eatingTimeList.value[0].value, // 食用时间
   //   packageUnit: '1' // 单位1
   // })
-  // 确保 eatingTimeList 中包含“饭后”选项
+  // 确保 eatingTimeList 中包�?饭后"选项
   if (!eatingTimeList.value.some(option => option.value === '饭后')) {
     eatingTimeList.value.push({value: '饭后', name: '饭后'});
   }
@@ -1625,7 +1891,7 @@ function addDrugButton(index) {
     usageValue: commonUsageList.value[0].value, //
     splitUnit: '1', // 单位
     frequency: Number(frequencyList.value[0].value), // 次数
-    eatingTime: '饭后', // 默认值设置为“饭后”
+    eatingTime: '饭后', // 默认值设置为"饭后"
     packageUnit: '1' // 单位1
   });
 
@@ -1643,14 +1909,14 @@ function removePrescription(index) {
   totalPriceSum.value = 0;
 }
 
-// 组件 常规处方 的 弹框
+// 组件 常规处方 �?弹框
 import ConventionalPrescription from '@/components/Healthcare/OutpatientService/ConventionalPrescription'
-// 弹框 的 显示
+// 弹框 �?显示
 const conventionalPrescriptionOpen = ref(false)
 //
 const conventionalPrescriptionTitle = ref('常规处方')
 
-// 处方 的 位置
+// 处方 �?位置
 const conventionalPrescriptionIndex = ref(null)
 
 // 常规 处方
@@ -1660,13 +1926,13 @@ function conventionalPrescriptionButton(index) {
   conventionalPrescriptionOpen.value = true
 }
 
-// 接收 子组件 传送 的 数据
+// 接收 子组�?传�?�?数据
 const conventionalPrescriptionSelect = value => {
   form.value.prescriptionDetailsList[conventionalPrescriptionIndex.value] = value
   conventionalPrescriptionOpen.value = false
 }
 
-// 医保 计算 总 价
+// 医保 计算 �?�?
 function calculationWholeTotal() {
   //
   if (form.value.prescriptionDetailsList != null) {
@@ -1676,20 +1942,39 @@ function calculationWholeTotal() {
         calculationTotal(i, j)
       }
     }
+    // 更新当前报销估算并校验限�?总价不按比率,报销金额按比�?
+    if (form.value.isInsured === 0) {
+      const rate = Number(form.value.value || 0) / 100
+      const sum = Number(totalPriceSum.value || 0)
+      const r = isNaN(rate) ? 0 : rate
+      // 先计算个人应付（向上取整）
+      const pay = ceilPrice(sum * (1 - r))
+      patientPay.value = pay
+      // 预计报销 = 总价 - 个人应付
+      currentReimbursement.value = (sum - Number(pay)).toFixed(2)
+      if (Number(historyReimbursement.value) + Number(currentReimbursement.value) > Number(reimbursementLimit.value)) {
+        proxy.$modal.msgWarning('累计医保报销超出300元限额已切换为自费');
+        form.value.isInsured = 1;
+        insuranceDisabled.value = true;
+      }
+    } else {
+      currentReimbursement.value = '0.00'
+      patientPay.value = ceilPrice(totalPriceSum.value || 0)
+    }
   }
 }
 
 // 修改 药品 价格 计算
-// 计算 总量  总价  是 一个 药品 的 价格 总价
+// 计算 总量  总价  �?一�?药品 �?价格 总价
 function calculationTotal(index, index2) {
   //
   const totalAmount = ref(0)
-  //  进行  是否 拆分 的   数据 处理 计算 拆分 总量 计算 的 方法 ,
+  //  进行  是否 拆分 �?  数据 处理 计算 拆分 总量 计算 �?方法 ,
   // if (form.value.prescriptionDetailsList[index][index2].isSplit == 'Y') {
-  //   // 是 拆分 的 总量 的 计算 拆分 的 总量 = 用量 * 频次 * 天数
+  //   // �?拆分 �?总量 �?计算 拆分 �?总量 = 用量 * 频次 * 天数
   //   totalAmount.value = form.value.prescriptionDetailsList[index][index2].dosageValue * form.value.prescriptionDetailsList[index][index2].frequency * form.value.prescriptionDetailsList[index][index2].eatingDays
   //   if (!Number.isNaN(totalAmount.value)) {
-  //     // 进行赋值
+  //     // 进行赋�?
   //     form.value.prescriptionDetailsList[index][index2].totalQuantity = totalAmount.value
   //   } else {
   //     //
@@ -1700,33 +1985,29 @@ function calculationTotal(index, index2) {
   // console.log('totalAmount:', totalAmount, healthcare_os_insured.value[0].value)
   // 总量
 
-  // 在不 修改 由有 的代码 进行 修改 进行 一直 不可 拆分
+  // 在不 修改 由有 的代�?进行 修改 进行 一�?不可 拆分
 
   const totalPrice = ref(0)
   // 总价
-  if (form.value.isInsured == healthcare_os_insured.value[0].value) {
-    totalPrice.value = form.value.prescriptionDetailsList[index][index2].totalQuantity * form.value.prescriptionDetailsList[index][index2].unitPrice * form.value.value
-  } else {
-    totalPrice.value = form.value.prescriptionDetailsList[index][index2].totalQuantity * form.value.prescriptionDetailsList[index][index2].unitPrice
-  }
+  // 总价始终为数�?单价,不直接乘报销比率
+  totalPrice.value = form.value.prescriptionDetailsList[index][index2].totalQuantity * form.value.prescriptionDetailsList[index][index2].unitPrice
 
-  // console.log('totalPrice值:', totalPrice.value)
+  // console.log('totalPrice�?', totalPrice.value)
   if (!Number.isNaN(totalPrice.value)) {
     // 进行 四舍五入 0.00
-    totalPrice.value = totalPrice.value.toFixed(2)
-    form.value.prescriptionDetailsList[index][index2].totalPrice = totalPrice
+    const tp = ceilPrice(totalPrice.value)
+    form.value.prescriptionDetailsList[index][index2].totalPrice = tp
   } else {
     form.value.prescriptionDetailsList[index][index2].totalPrice = 0
   }
 
-  // 更新总价和
-  totalPriceSum.value = form.value.prescriptionDetailsList
+  // 更新总价�?
+  totalPriceSum.value = ceilPrice(form.value.prescriptionDetailsList
       .reduce((sum, prescription) => {
         return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
-      }, 0)
-      .toFixed(2)
+      }, 0))
 
-  // console.log('prescriptionDetailsList值:', form.value.prescriptionDetailsList)
+  // console.log('prescriptionDetailsList�?', form.value.prescriptionDetailsList)
 }
 
 // 药品 档案 弹框
@@ -1744,12 +2025,12 @@ let {
 // 显示 数据 控制
 controlDataDrugArchives.value[6].display = false
 
-// 控制 弹框 的 宽
+// 控制 弹框 �?�?
 const sdada = ref('1600px')
 
-// 药品 的 位置 处方
+// 药品 �?位置 处方
 const drugFanIndex = ref(null)
-// 药品 的 位置 处方
+// 药品 �?位置 处方
 const drugFanDrugIndex = ref(null)
 //
 const childComponentRef = ref(null)
@@ -1764,24 +2045,24 @@ function drugArchivesBulletFrameOperation(index, index2) {
   // console.log('药品档案', index, index2)
 }
 
-// 获取 药品 档案 里面 的 数据
+// 获取 药品 档案 里面 �?数据
 const selectDrugData = value => {
-  // console.log('获取 药品 档案 里面 的 数据', drugFanIndex.value, drugFanDrugIndex.value, value, value.minNumber)
+  // console.log('获取 药品 档案 里面 �?数据', drugFanIndex.value, drugFanDrugIndex.value, value, value.minNumber)
   //
   childComponentRef.value.closeDialog()
   // 药品 名称
   form.value.prescriptionDetailsList[drugFanIndex.value][drugFanDrugIndex.value].medicineName = value.medicineName
-  // 药品 的 转化率 固态 液态 的 转化率 不一样 0 固态 1 液态
+  // 药品 �?转化�?固�?液�?�?转化�?不一�?0 固�?1 液�?
   if (value.state == '0') {
-    // 药品 的 最小单位数量
+    // 药品 �?最小单位数�?
     form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.minNumber
   }
   if (value.state == '1') {
-    // 药品 的 最小包装数量
+    // 药品 �?最小包装数�?
     form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.unitQuantity
   }
 
-  // 药品 使用 单位  最小包装单位
+  // 药品 使用 单位  最小包装单�?
   // form.value.prescriptionDetailsList[drugFanIndex.value][
   //   drugFanDrugIndex.value
   // ].splitUnit = value.splitUnit;
@@ -1791,13 +2072,13 @@ const selectDrugData = value => {
   // ].packageUnit = value.packageUnit;
   // 是否 可以 拆分
   form.value.prescriptionDetailsList[drugFanIndex.value][drugFanDrugIndex.value].isSplit = value.isSplit
-  // 控制 可以 拆分 总量  总价  显示 隐藏  0 => 可以 拆分 1 => 不可以 拆分
+  // 控制 可以 拆分 总量  总价  显示 隐藏  0 => 可以 拆分 1 => 不可�?拆分
   // form.value.prescriptionDetailsList[index][index2].isSplit == 'Y'
   // 修改 进行 不可 拆分 显示
   isDisplayTotalQuantity.value = 0
 }
 
-// 药品 的 库存 处理 逻辑  库存 不足  stock  inventory handle Insufficient
+// 药品 �?库存 处理 逻辑  库存 不足  stock  inventory handle Insufficient
 function drugInventoryHandleInsufficient(index, index2, boxCount, packCount) {
   if (form.value.prescriptionDetailsList[index][index2].isSplit == 'Y') {
     // 处理
@@ -1823,12 +2104,12 @@ function judgeInventoryIsInsufficient(index, index2) {
   }
 }
 
-// 患者 诊断 信息 弹框
+// 患�?诊断 信息 弹框
 import DiagnosisInformation from '@/components/Healthcare/OutpatientService/DiagnosisInformation'
 import DiagnosisInformationUse from '@/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts'
-import {Check} from "@element-plus/icons-vue";
+import { Check } from "@element-plus/icons-vue"
 
-const diagnosisInformationRef = ref(null) // 引用子组件
+const diagnosisInformationRef = ref(null) // 引用子组�?
 
 
 let {controlDataDiagnosisInformation, styleDiagnosisInformation} = DiagnosisInformationUse()
@@ -1846,7 +2127,7 @@ function checkButton(row) {
 }
 
 //就诊时间选择
-// 格式化 Date 为 YYYY-MM-DD
+// 格式�?Date �?YYYY-MM-DD
 const outpatientTime = ref([])
 function formatDate(date) {
   if (!date) return ''
@@ -1880,128 +2161,50 @@ function handlePrint(row) {
 
 /** 打印方法 */
 function printPrescription(data) {
-  // 处理性别显示 (0=男,1=女)
+  // 处理性别显示 (0=男 1=女)
   const genderDisplay = data.gender == 0 ? '男' : (data.gender == 1 ? '女' : '');
-  // 单位映射字典(键值对反转后的版本,便于查找)
-  const unitMap = {
-    '1': '片',
-    '2': '支',
-    '3': '张',
-    '4': '板',
-    '5': '盒',
-    '6': '包',
-    '7': '箱',
-    '8': '吸',
-    '9': '份',
-    '10': 'g',
-    '11': '颗',
-    '12': '只',
-    '13': '贴',
-    '14': '块',
-    '15': '瓶',
-    '16': '桶',
-    '17': '件',
-    '18': '付',
-    '19': '锭',
-    '20': 'mg',
-    '21': '粒',
-    '22': '丸',
-    '23': '条',
-    '24': '滴',
-    '25': '杯',
-    '26': '罐',
-    '27': '泡',
-    '28': '副',
-    '29': '膜',
-    '30': 'ml',
-    '31': '个',
-    '32': '枚',
-    '33': '根',
-    '34': '揿',
-    '35': '袋',
-    '36': '盆',
-    '37': '对',
-    '38': '喷',
-    '39': '管',
-    '40': 'IU'
+
+  const lookupLabel = (list, value) => {
+    if (value == null || value === '') return '';
+    const v = String(value);
+    const items = Array.isArray(list) ? list : (list?.value || []);
+    const hit = items.find((item) => String(item.value) === v);
+    if (!hit) return '';
+    return hit.label ?? hit.name ?? '';
   };
 
   // 增强版单位转换函数
   function formatUnit(value) {
     if (value == null || value === '') return '';
 
-    // 如果已经是中文单位,直接返回
-    if (Object.values(unitMap).includes(value.toString())) {
-      return value;
-    }
-
-    // 处理可能带数字后缀的情况(如 "1" 或 1)
     const strValue = value.toString().trim();
+    const direct = lookupLabel(healthcare_dose_unit, strValue);
+    if (direct) return direct;
 
-    // 检查是否是纯数字
-    if (/^\d+$/.test(strValue)) {
-      return unitMap[strValue] || strValue;
-    }
-
-    // 检查是否是数字+单位格式(如 "1片")
     const match = strValue.match(/^(\d+)([^\d]*)$/);
     if (match) {
-      const num = match[1];
-      const unit = match[2];
-      return (unitMap[num] || num) + unit;
+      const unitLabel = lookupLabel(healthcare_dose_unit, match[1]);
+      if (unitLabel) return unitLabel + match[2];
     }
 
-    // 其他情况返回原值
     return strValue;
   }
 
-  // 频次映射字典(键值对)
-  const frequencyMap = {
-    '1': '每天1次',
-    '2': '每天2次',
-    '3': '每天3次',
-    '4': '每天4次',
-    '5': '隔日1次',
-    '6': '每周1次',
-    '7': '每周2次',
-    '8': '临睡前',
-    '9': '每晚1次',
-    '10': '每2小时1次',
-    '11': '每4小时1次',
-    '12': '每6小时1次',
-    '13': '每8小时1次',
-    '14': '每12小时1次',
-    '15': '立即',
-    '16': '需要时',
-    '17': '需要时(长期)',
-    '18': 'N天1次',
-    '19': 'N周1次',
-    '20': 'N小时1次',
-    '21': '每周N次'
-  };
-
-  // 频次格式化函数(只保留中文)
+  // 频次格式化函数
   function formatFrequency(value) {
     if (value == null || value === '') return '';
 
-    // 如果已经是中文频次,直接返回
-    if (Object.values(frequencyMap).includes(value.toString())) {
-      return value;
-    }
-
-    // 如果是数字键值,转换为中文频次
     const strValue = value.toString().trim();
-    if (frequencyMap[strValue]) {
-      return frequencyMap[strValue];
-    }
+    const list = frequencyList.value || [];
+    const hit = list.find((item) => String(item.value) === strValue);
+    if (hit) return hit.name ?? hit.label ?? strValue;
 
-    // 如果是英文缩写+中文格式(如"qd 每天1次"),提取中文部分
-    const chineseMatch = value.match(/[\u4e00-\u9fa5]+/g);
+    // 如果是英文缩写/混合字符串,提取中文部分
+    const chineseMatch = strValue.match(/[一-龥]+/g);
     if (chineseMatch && chineseMatch.length > 0) {
       return chineseMatch.join('');
     }
 
-    // 其他情况返回原值
     return strValue;
   }
 
@@ -2013,7 +2216,7 @@ function printPrescription(data) {
     day: data.day || currentDate.getDate()
   };
 
-  // 如果传入的是完整日期时间字符串,自动拆分
+  // 如果传入的是完整日期时间字符�?自动拆分
   if (data.outpatientTime && !data.year) {
     const [datePart] = data.outpatientTime.split(' ');
     const dateParts = datePart.split(/[-/]/);
@@ -2027,7 +2230,7 @@ function printPrescription(data) {
   // 从表单数据结构中获取医保信息
   const insuranceInfo = data.isInsured == 0 ? '□自费 离休 二乙 ☑医保(自治区、市、县)' : '☑自费 □医保(自治区、市、县)';
 
-  // 新窗口
+  // 新窗�?
   const printWindow = window.open('', '_blank');
 
 
@@ -2178,7 +2381,7 @@ function printPrescription(data) {
         <h2>南宁市社会医疗机构专用处方笺</h2>
       </div>
 
-      <!-- 患者基本信息 -->
+      <!-- 患者基本信息-->
       <div class="patient-info-container">
         <div class="patient-info-row">
           <div class="patient-info-label">费别:</div>
@@ -2199,7 +2402,7 @@ function printPrescription(data) {
         </div>
         
         <div class="patient-info-row">
-          <div class="patient-info-label">门诊病历号:</div>
+          <div class="patient-info-label">门诊病历号</div>
           <div class="patient-info-value">${data.medicalRecordNo || ''}&nbsp</div>
           
           <div class="patient-info-label">科别:</div>
@@ -2212,7 +2415,7 @@ function printPrescription(data) {
         </div>
         
         <div class="patient-info-row">
-          <div class="patient-info-label">开具日期:</div>
+          <div class="patient-info-label">开具日期</div>
           <div class="date-container">
             <span class="date-part">${dateObj.year}</span>年
             <span class="date-part">${dateObj.month}</span>月
@@ -2221,11 +2424,11 @@ function printPrescription(data) {
         </div>
 
 
-      <!-- 患者信息 -->
+      <!-- 患者信息-->
       </div>
       <div><strong>主诉:</strong> ${data.chiefComplaint || '无'}</div>
-      <div><strong>现病史:</strong> ${data.presentIllness || '无'}</div>
-      <div><strong>既往史:</strong> ${data.pastHistory || '无'}</div>
+      <div><strong>现病史</strong> ${data.presentIllness || '无'}</div>
+      <div><strong>既往史</strong> ${data.pastHistory || '无'}</div>
       <!-- 医嘱信息 -->
       <div style="margin: 10px 0;">
         <div><strong>Rp:</strong>${data.medicalAdvice || ''}</div>
@@ -2263,52 +2466,52 @@ function printPrescription(data) {
   </table>
 </div>
       
-      <!-- 底部签名区 -->
+      <!-- 底部签名 -->
       <div class="footer">
         <!-- 医师签名 -->
         <div class="signature-row doctor-signature">
           <div class="doctor">医师签名:${data.doctorName || ''}</div>
         </div>
         
-        <!-- 分隔线 -->
+        <!-- 分隔 -->
         <div class="divider"></div>
         
         <!-- 药品金额和收费员 -->
         <div class="signature-row">
           <p>药品金额:${data.prescriptionDetailsList?.flat().reduce((sum, item) => sum + (parseFloat(item.totalPrice) || 0), 0).toFixed(2) || '0.00'}元</p>
           <div class="patient-info-row">
-          <div class="patient-info-label">收费员:&nbsp&nbsp</div>
+          <div class="patient-info-label">收费员&nbsp&nbsp</div>
           <div class="patient-info-value">${data.doctorName || ''}&nbsp</div>
           </div>
         </div>
         
         <!-- 注射费和审核调配 -->
         <div class="signature-row">
-          <p>注射费:________元</p>
+          <p>注射者__________</p>
           <div class="patient-info-row">
-          <div class="patient-info-label">审核、调配:</div>
+          <div class="patient-info-label">审核、调配</div>
           <div class="patient-info-value">&nbsp</div>
           </div>
         </div>
         
         <!-- 收款票据和核对发药 -->
         <div class="signature-row">
-        <p>(收款票据请贴附处方背面) </p>
+        <p>(收款票据请贴附处方背面 </p>
           <div class="patient-info-row">
-          <div class="patient-info-label">核对、发药:</div>
+          <div class="patient-info-label">核对、发药</div>
           <div class="patient-info-value">${data.doctorName || ''}&nbsp</div>
           </div>
         </div>
         
         <!-- 大额处方患者意见和签名 -->
         <div class="patient-opinion">
-          <div style="margin-right: 20px;">大额处方患者意见:</div>
-          <div class="opinion-option">□ 同意</div>
-          <div class="opinion-option">□ 不同意</div>
-          <div class="patient">患者签名:______________</div>
+          <div style="margin-right: 20px;">大额处方患者意见</div>
+          <div class="opinion-option">□同意</div>
+          <div class="opinion-option">□不同意</div>
+          <div class="patient">患者签名______________</div>
         </div>
         <!-- 联系地址或电话 -->
-        <div class="contact-info">联系地址或电话(患者志愿填写):________________________</div>
+        <div class="contact-info">联系地址或电话患者志愿填写:________________________</div>
       </div>
       
       <!-- 打印控制按钮 -->
@@ -2325,7 +2528,7 @@ function printPrescription(data) {
   printWindow.document.write(printContent);
   printWindow.document.close();
 
-  // 等待内容加载完成后自动打印
+  // 等待内容加载完成后自动打�?
   printWindow.onload = function () {
     setTimeout(() => {
       printWindow.print();
@@ -2359,7 +2562,7 @@ const loadComplaintsOptions = async () => {
   }
 }
 
-// 处理输入框获取焦点事件
+// 处理输入框获取焦点事�?
 const handleComplaintFocus = () => {
   if (!loadingComplaints.value && complaintsOptions.value.length === 0) {
     loadComplaintsOptions()
@@ -2380,7 +2583,7 @@ const queryComplaintSuggestions = async (queryString, cb) => {
 
     // 过滤匹配的选项
     const filteredOptions = complaintsOptions.value.filter(option => {
-      // 检查选项的label或value是否包含搜索词
+      // 检查选项的label或value是否包含搜索�?
       return (
           (option.label && option.label.toLowerCase().includes(searchTerm)) ||
           (option.value && option.value.toLowerCase().includes(searchTerm))
@@ -2408,7 +2611,7 @@ const selectComplaint = (item) => {
     form.value.medicalAdvice = item.medicalAdvice || ''
   }
 }
-// 清空主诉及相关字段
+// 清空主诉及相关字�?
 const clearComplaint = () => {
   form.value.chiefComplaint = ''
   form.value.presentIllness = ''
@@ -2425,6 +2628,7 @@ const xuanZheData = (val, index) => {
 }
 
 
+openWarehousePromptIfNeeded()
 getList()
 </script>
 
diff --git a/src/views/healthcare/outpatientService/patientDiagnosis/index.vue.backup b/src/views/healthcare/outpatientService/patientDiagnosis/index.vue.backup
new file mode 100644
index 0000000..8efad8e
--- /dev/null
+++ b/src/views/healthcare/outpatientService/patientDiagnosis/index.vue.backup
@@ -0,0 +1,2627 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="75px">
+      <el-form-item label="是否医保" prop="isInsured">
+        <el-select style="width: 100px" v-model="queryParams.isInsured" placeholder="是否医保" clearable>
+          <el-option v-for="dict in healthcare_os_insured" :key="dict.value" :label="dict.label"
+                     :value="parseInt(dict.value)"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="false" label="数值""�? prop="value">
+        <el-input v-model="queryParams.value" placeholder="请输入数值"�? clearable @keyup.enter="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="学号/工号" prop="studentId">
+        <el-input v-model="queryParams.studentId" placeholder="请输入学�?工号" clearable @keyup.enter="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入患者姓�? clearable @keyup.enter="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="医生名字" prop="doctorName">
+        <el-input v-model="queryParams.doctorName" placeholder="请输入医生名�? clearable @keyup.enter="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="临床诊断" prop="diagnosis">
+        <el-input v-model="queryParams.diagnosis" placeholder="请输入临床诊�? clearable @keyup.enter="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="就诊时间">
+      <el-date-picker
+      v-model="outpatientTime"
+      type="daterange"
+      range-separator="�?
+      start-placeholder="开始日�?
+      end-placeholder="结束日期"
+      clearable
+      @change="changeTime"
+      />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                   v-hasPermi="['os:patientDiagnosis:add']">接诊
+        </el-button>
+      </el-col>
+      <el-col v-if="false" :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                   v-hasPermi="['os:patientDiagnosis:edit']">修改
+        </el-button>
+      </el-col>
+      <el-col v-if="false" :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                   v-hasPermi="['os:patientDiagnosis:remove']">删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+                   v-hasPermi="['os:patientDiagnosis:export']">导出
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="patientDiagnosisList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!-- <el-table-column label="编号" align="center" prop="id"/> -->
+      <el-table-column label="学号/工号" align="center" prop="studentId"/>
+      <el-table-column label="患者姓�? align="center" prop="name"/>
+      <el-table-column label="是否医保" align="center" prop="isInsured">
+        <template #default="scope">
+          <dict-tag :options="healthcare_os_insured" :value="scope.row.isInsured"/>
+        </template>
+</el-table-column>
+<el-table-column label="病人类型" align="center" prop="patientType">
+        <template #default="scope">
+          <dict-tag :options="healthcare_os_patient_type" :value="scope.row.patientType"/>
+        </template>
+      </el-table-column>
+<el-table-column label="就诊时间" align="center" prop="outpatientTime" />
+<el-table-column label="就诊地址" align="center" prop="storeroomName" />
+<el-table-column label="临床诊断" align="center" prop="diagnosis" />
+<el-table-column label="医生名字" align="center" prop="doctorName" />
+<el-table-column label="判断类型" align="center" prop="diagnosisType">
+        <template #default="scope">
+          <dict-tag :options="healthcare_os_diagnosis_type" :value="scope.row.diagnosisType"/>
+        </template>
+      </el-table-column>
+<el-table-column label="发药状�? align=" center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="healthcare_os_diagnosis_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <!-- 修改 -->
+          <el-button v-if="scope.row.status == 2 || scope.row.status == 3" link type="primary" icon="Edit"
+                     @click="handleUpdate(scope.row)" v-hasPermi="['os:patientDiagnosis:update']">修改
+          </el-button>
+          <!-- check 查看  Button   -->
+          <el-button link type="primary" icon="Search" @click="checkButton(scope.row)"
+                     v-hasPermi="['os:patientDiagnosis:getInfo']">查看
+          </el-button>
+          <!-- 删除  commonDictionary -->
+          <el-button v-if="scope.row.status == 3" link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['os:patientDiagnosis:remove']">删除
+          </el-button>
+          <!-- 打印及下方调�?-> 知无涯添�?-->
+          <el-button v-if="scope.row.status == 1" link type="primary" icon="Printer" @click="handlePrint(scope.row)"
+                     v-hasPermi="['os:patientDiagnosis:print']">打印
+          </el-button>
+        </template>
+      </el-table-column>
+</el-table>
+
+<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+  @pagination="getList" />
+
+<!-- 添加或修改患者诊断信息对话框 -->
+<!-- 控制  -->
+<el-dialog :title="title" v-model="open" :width="`${(width = '100%')}`" append-to-body>
+  <el-form ref="patientDiagnosisRef" :model="form" :rules="rules" label-width="100px">
+    <el-row :gutter="20">
+          <!-- 病人信息 -->
+          <el-col :span="12">
+            <!-- 患者信�?change -->
+            <el-col :span="24">
+              <!--  -->
+              <el-row>
+                <el-col :span="12">
+                  <!-- :disabled="true" -->
+                  <el-form-item label="就诊人类�? prop="patientType">
+                    <el-select v-model="form.patientType" placeholder="请选择就诊人类�?>
+                      <el-option v-for="dict in healthcare_os_patient_type" :key="dict.value" :label="dict.label"
+                                 :value="parseInt(dict.value)"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="学号/工号" prop="studentId">
+                    <!-- change   -->
+                    <el-input ref="studentIdRef" v-model="form.studentId" placeholder="请输入学�?工号"
+                              @click="selectPatient()"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+    <!--  -->
+    <el-row>
+                <el-col :span="12">
+                  <el-form-item label="患者姓�? prop="name">
+                    <el-input v-model="form.name" placeholder="请输入患者姓�? clearable/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="诊断类型" prop="diagnosisType">
+                    <el-select v-model="form.diagnosisType" placeholder="请选择诊断类型类型">
+                      <el-option v-for="dict in healthcare_os_diagnosis_type" :key="dict.value" :label="dict.label"
+                                 :value="parseInt(dict.value)"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+    <el-row>
+                <el-col :span="12">
+                  <el-form-item label="性别" prop="gender">
+                    <el-select v-model="form.gender" placeholder="请输入性别" clearable>
+                      <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
+                                 :value="dict.value"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="年龄" prop="age">
+                    <el-input v-model="form.age" clearable placeholder="请输入年�?/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+    <el-row v-if="form.patientType === 0">
+                <el-col :span="12">
+                  <el-form-item label="专业" prop="major">
+                    <el-input v-model="form.major" clearable placeholder="请输入专�?/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="班级" prop="classInfo">
+                    <el-input v-model="form.classInfo" clearable placeholder="请输入班�?/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+    <el-row>
+                <el-col :span="12">
+                  <el-form-item label="电话" prop="phone">
+                    <el-input v-model="form.phone" clearable placeholder="请输入电�?/>
+                  </el-form-item>
+                </el-col>
+                <el-col v-if="form.patientType === 0" :span="12">
+                  <el-form-item label="辅导�? prop="counselor">
+                    <el-input v-model="form.counselor" clearable placeholder="请输入辅导员"/>
+                  </el-form-item>
+                </el-col>
+                <el-col v-if="form.patientType === 1 || form.patientType === 2" :span="12">
+                  <el-form-item label="部门" prop="department">
+                    <el-input v-model="form.department" clearable placeholder="请输入部�?/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+    <el-row>
+                <el-col :span="12">
+                  <el-form-item label="是否医保" prop="isInsured">
+                    <el-select v-model="form.isInsured"
+                               placeholder="是否医保"
+                               clearable
+                               @change="handleInsuranceChange"
+                               @clear="handleInsuranceClear"
+                               :disabled="insuranceDisabled">
+                      <el-option
+                          v-for="dict in healthcare_os_insured"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="parseInt(dict.value)"
+                          @click="calculationWholeTotal()">
+                      </el-option>
+                    </el-select>
+                    <el-icon
+                        v-if="form.isInsured === 0"
+                        style="color: #67C23A; margin-left: 8px; position: absolute; right: 30px;"
+                        :size="20">
+                      <Check/>
+                    </el-icon>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item v-if="form.isInsured == 0" label="报销比率"
+                                prop="value">
+                    <el-input-number
+                        v-model="form.value"
+                        :step="0.1"
+                        :precision="2"
+                        :min="0"
+                        :max="100"
+                        :formatter="insuranceFormatter"
+                        :parser="insuranceParser"
+                        @change="calculationWholeTotal()"
+                        placeholder="请输入报销比率"/>   <span>%</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="已报销总额/限额">
+                    <span>
+                      ￥{{ Number(historyReimbursement || 0).toFixed(2) }} / ￥{{ Number(reimbursementLimit).toFixed(2) }}
+                    </span>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+    </el-col>
+    <el-col :span="24">
+      <el-form-item label="主诉" prop="chiefComplaint" class="complaint-form-item">
+        <div class="complaint-input">
+          <el-autocomplete v-model="form.chiefComplaint" :fetch-suggestions="queryComplaintSuggestions"
+            placeholder="请输入主诉内容或选择常用主诉" clearable @select="selectComplaint" @clear="clearComplaint"
+            @focus="handleComplaintFocus" style="width: 85%" :loading="loadingComplaints" class="complaint-autocomplete"
+            popper-class="complaint-popper">
+            <template #default="{ item }">
+                      <div class="complaint-option">
+                        <span class="complaint-label">{{ item.label }}</span>
+                        <span v-if="!item.isCustom" class="complaint-hint">
+                          ({{ item.currentHistory ? item.currentHistory.substring(0, 20) + '...' : '无现病史' }})
+                        </span>
+                      </div>
+                    </template>
+            <template #prefix>
+                    </template>
+          </el-autocomplete>
+        </div>
+      </el-form-item>
+    </el-col>
+    <el-col :span="24">
+      <el-form-item label="现病�? prop=" presentIllness">
+        <el-input v-model="form.presentIllness" type="textarea" placeholder="请输入内�?/>
+              </el-form-item>
+            </el-col>
+            <el-col :span=" 24">
+          <el-form-item label="既往�? prop=" pastHistory">
+            <el-input v-model="form.pastHistory" type="textarea" placeholder="请输入内�?/>
+              </el-form-item>
+            </el-col>
+            <el-col :span=" 24">
+              <el-form-item label="临床诊断" prop="diagnosis">
+                <el-input v-model="form.diagnosis" type="textarea" placeholder="请输入内�?/>
+              </el-form-item>
+            </el-col>
+            <el-col :span=" 24">
+                  <el-form-item label="医嘱事项" prop="medicalAdvice">
+                    <el-input v-model="form.medicalAdvice" type="textarea" placeholder="请输入内�?/>
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <!-- 病人病历 -->
+          <el-col :span=" 12">
+                      <h3>就诊记录</h3>
+                      <!-- border height="250" -->
+                      <el-table :data="nameDiagnosisList" style="width: 100%" max-height="1000px">
+              <el-table-column prop="outpatientTime" label="就诊时间" width="180">
+              </el-table-column>
+              <el-table-column prop="chiefComplaint" label="主诉" width="180">
+              </el-table-column>
+              <el-table-column prop="status" label="状�?>
+                <template #default="scope">
+                  <dict-tag :options="healthcare_os_diagnosis_status" :value="scope.row.status"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作">
+                <template #default="scope">
+                  <el-button @click="checkInformation(scope.row.id)" link type="primary" icon="Edit">查看</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+    </el-col>
+    </el-row>
+    <!-- os:patientDiagnosis:conventionalPrescription -->
+    <el-divider content-position="center"> 处方详情</el-divider>
+    <el-row class="prescriptionAdd">
+          <el-button type="primary" plain size="mini" @click="addPrescriptionButton()">新增处方</el-button>
+        </el-row>
+    <!-- 处方 -->
+    <el-row v-for="(index, item) in form.prescriptionDetailsList" :key="item">
+          <el-row :gutter="10" class="mb8">
+            <el-button v-if="false" type="primary" plain size="mini"
+                       @click="prescriptionAddDruyAddChoice()">扫描添加
+            </el-button>
+            <!-- 6 -->
+            <el-button type="primary" plain size="mini" @click="conventionalPrescriptionButton(item)"
+                       v-hasPermi="['os:patientDiagnosis:conventionalPrescription']">常规处方
+            </el-button>
+            <!-- 6 -->
+            <el-button type="primary" plain size="mini" @click="addDrugButton(item)">添加药品</el-button>
+            <!-- 6 -->
+            <el-button type="primary" plain size="mini" @click="removePrescription(item)">删除处方</el-button>
+          </el-row>
+    <!-- border -->
+    <el-table :data="form.prescriptionDetailsList[item]" style="width: 100%" class="prescription">
+            <el-table-column prop="name" label="编号" width="100">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <!-- 药品名称 -->
+            <el-table-column prop="medicineName" label="药名" min-width="260">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.medicineName`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '药名不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <!--  一�?隐藏 �?  v-if="false"  -->
+                  <el-select v-model="form.prescriptionDetailsList[item][scope.$index].medicineName
+                    " filterable placeholder="请选择" v-if="false">
+                    <el-option v-for="item1 in druyNameList" :key="item1" :label="item1.medicineName"
+                               :value="item1.medicineName" @click="choiceDruyName(item, scope.$index, item1)">
+                    </el-option>
+                  </el-select>
+                  <!-- 输入框弹�? focus  -->
+                  <!--  一�?隐藏 �?v-if="false"  -->
+                  <el-input v-if="false" v-model="form.prescriptionDetailsList[item][scope.$index].medicineName
+                    " @focus="drugArchivesBulletFrameOperation(item, scope.$index)"></el-input>
+                  <!-- 输入框弹�?药品 �?批次 库存   focus -->
+                  <el-input v-model="form.prescriptionDetailsList[item][scope.$index].medicineName
+                    " @click="selectDrugPriceInputButton(item, scope)"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column prop="batch" label="批次" min-width="170">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.batch`">
+                  <el-input :disabled="true" v-model="form.prescriptionDetailsList[item][scope.$index].batch
+                    "></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column prop="expiryDate" label="有效�? min-width="150">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.expiryDate`">
+                  <el-input :disabled="true" v-model="form.prescriptionDetailsList[item][scope.$index].expiryDate
+                    "></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <!-- 规格  -->
+            <el-table-column prop="specification" label="规格" min-width="220">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.specification`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '规格不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-input v-model="form.prescriptionDetailsList[item][scope.$index].specification
+                    "></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <!-- 用法 -->
+            <el-table-column prop="usageValue" label="用法" width="120">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.usageValue`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '用法不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-select v-model="form.prescriptionDetailsList[item][scope.$index].usageValue" filterable
+                             placeholder="请选择">
+                    <el-option v-for="item in commonUsageList" :key="item.value" :label="item.value"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <!-- 用量 -->
+            <el-table-column prop="dosageValue" label="一次使用的�? width="200">
+              <template #default="scope">
+                <el-row>
+                  <el-col :span="12">
+                    <el-form-item label-width="0px"
+                                  :prop="`prescriptionDetailsList.${item}.${scope.$index}.dosageValue`" :rules="[
+                        {
+                          required: true,
+                          message: '用量不能为空',
+                          trigger: 'blur',
+                        },
+                        {
+                          pattern: /^\S+.*$/,
+                          message: '开头有空格',
+                          trigger: 'blur',
+                        },
+                        {
+                          pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
+                          message: '请输入一个有效的�?,
+                          trigger: 'blur',
+                        },
+                        {
+                          validator: checkValueRules,
+                          trigger: 'blur',
+                        },
+                      ]">
+                      <el-input v-model="form.prescriptionDetailsList[item][scope.$index].dosageValue
+                        " @input="calculationTotal(item, scope.$index)"/>
+                    </el-form-item>
+                  </el-col>
+                  <!-- 单位 -->
+                  <el-col :span="12">
+                    <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.splitUnit`"
+                                  :rules="[
+                        {
+                          required: true,
+                          message: '单位不能为空',
+                          trigger: 'blur',
+                        },
+                      ]">
+                      <el-select v-model="form.prescriptionDetailsList[item][scope.$index].splitUnit
+                        " filterable placeholder="请选择">
+                        <el-option v-for="dict in healthcare_packaging_unit" :key="dict.value" :label="dict.label"
+                                   :value="dict.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </template>
+            </el-table-column>
+            <el-table-column prop="frequency" label="一天使用的次数" width="140">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.frequency`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '次数不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-select v-model="form.prescriptionDetailsList[item][scope.$index].frequency" filterable
+                             placeholder="请选择">
+                    <el-option v-for="item1 in frequencyList" :key="item1.value" :label="item1.name"
+                               :value="parseInt(item1.value)" @click="calculationTotal(item, scope.$index)">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column prop="eatingTime" label="使用时间" width="120">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.eatingTime`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '使用时间不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-select v-model="form.prescriptionDetailsList[item][scope.$index].eatingTime" filterable
+                             placeholder="请选择">
+                    <el-option v-for="item in eatingTimeList" :key="item.value" :label="item.value" :value="item.value">
+                    </el-option>
+                  </el-select>
+
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <!-- 使用 -->
+            <!-- <el-table-column prop="eatingDays" label="使用天数" width="120">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.eatingDays`" :rules="[
+                    {
+                      required: true,
+                      message: '使用天数不能为空',
+                      trigger: 'blur',
+                    },
+                    {
+                      pattern: /^\S+.*$/,
+                      message: '开头有空格',
+                      trigger: 'blur',
+                    },
+                    {
+                      pattern: /^-?\d+$/,
+                      message: '请输入一个有效的整数',
+                      trigger: 'blur',
+                    },
+                    {
+                      pattern: /^(?!0\d)\d+$/,
+                      message: '请输入一个有效的整数',
+                      trigger: 'blur',
+                    },
+                    {
+                      validator: checkValueRules,
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-input @input="calculationTotal(item, scope.$index)" v-model="form.prescriptionDetailsList[item][scope.$index].eatingDays" />
+                </el-form-item>
+              </template>
+            </el-table-column> -->
+            <!-- 总量 1 可以 �? -->
+            <el-table-column prop="totalQuantity" label="总量" width="150">
+              <template #default="scope">
+                <!--  进行 修改 进行 隐藏 form.prescriptionDetailsList[item][scope.$index].isSplit == 'Y' -->
+                <el-row v-if="false">
+                  <el-col :span="8">
+                    <el-form-item label-width="0px"
+                                  :prop="`prescriptionDetailsList.${item}.${scope.$index}.totalQuantity`" :rules="[
+                        {
+                          required: true,
+                          message: '总量不能为空',
+                          trigger: 'blur',
+                        },
+                        {
+                          pattern: /^\S+.*$/,
+                          message: '开头有空格',
+                          trigger: 'blur',
+                        },
+                        {
+                          pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
+                          message: '请输入一个有效的�?,
+                          trigger: 'blur',
+                        },
+                        {
+                          validator: checkValueRules,
+                          trigger: 'blur',
+                        },
+                      ]">
+                      {{ form.prescriptionDetailsList[item][scope.$index].totalQuantity }}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="14">
+                    <el-form-item label-width="0px"
+                                  :prop="`prescriptionDetailsList.${item}.${scope.$index}.packageUnit`" :rules="[
+                        {
+                          required: true,
+                          message: '单位不能为空',
+                          trigger: 'blur',
+                        },
+                      ]">
+                      <el-select v-model="form.prescriptionDetailsList[item][scope.$index].packageUnit
+                        " filterable placeholder="请选择">
+                        <el-option v-for="dict in healthcare_packaging_unit" :key="dict.value" :label="dict.label"
+                                   :value="dict.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <!-- splitUnit  packageUnit-->
+                <!-- 总量 2  �?可以 拆分   -->
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label-width="0px"
+                                  :prop="`prescriptionDetailsList.${item}.${scope.$index}.totalQuantity`" :rules="[
+                        {
+                          required: true,
+                          message: '总量不能为空',
+                          trigger: 'blur',
+                        },
+                        {
+                          pattern: /^\S+.*$/,
+                          message: '开头有空格',
+                          trigger: 'blur',
+                        },
+                        {
+                          pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
+                          message: '请输入一个有效的�?,
+                          trigger: 'blur',
+                        },
+                        {
+                          validator: checkValueRules,
+                          trigger: 'blur',
+                        },
+                      ]">
+                      <el-input v-model="form.prescriptionDetailsList[item][scope.$index].totalQuantity
+                        " prescription="请输入总量" @input="calculationTotal(item, scope.$index)"/>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="14">
+                    <el-form-item label-width="0px"
+                                  :prop="`prescriptionDetailsList.${item}.${scope.$index}.packageUnit`" :rules="[
+                        {
+                          required: true,
+                          message: '单位不能为空',
+                          trigger: 'blur',
+                        },
+                      ]">
+                      <el-select v-model="form.prescriptionDetailsList[item][scope.$index].packageUnit
+                        " filterable placeholder="请选择">
+                        <el-option v-for="dict in healthcare_packaging_unit" :key="dict.value" :label="dict.label"
+                                   :value="dict.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </template>
+            </el-table-column>
+            <!--  -->
+            <el-table-column prop="unitPrice" label="单价/�?可�?" width="120">
+              <template #default="scope">
+                <!--  selectDrugPriceInputButton  selectDrugPriceInput -->
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.unitPrice`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '单价不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-button width="100%" @click="selectDrugPriceInputButton(item, scope)">
+                    {{ form.prescriptionDetailsList[item][scope.$index].unitPrice }}
+                  </el-button>
+                </el-form-item>
+                <!--  -->
+                <el-form-item v-if="false" label-width="0px"
+                              :prop="`prescriptionDetailsList.${item}.${scope.$index}.unitPrice`" :rules="[
+                    {
+                      required: true,
+                      message: '单价不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  <el-button width="100%">
+                    {{ form.prescriptionDetailsList[item][scope.$index].unitPrice }}
+                  </el-button>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column prop="totalPrice" label="总价" width="120">
+              <template #default="scope">
+                <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.totalPrice`"
+                              :rules="[
+                    {
+                      required: true,
+                      message: '总价不能为空',
+                      trigger: 'blur',
+                    },
+                  ]">
+                  {{
+                    form.isInsured === 0
+                      ? (
+                          Number(form.prescriptionDetailsList[item][scope.$index].totalPrice || 0) *
+                          (1 - Number(form.value || 0) / 100)
+                        ).toFixed(2)
+                      : form.prescriptionDetailsList[item][scope.$index].totalPrice
+                  }}
+                  �?
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remarks" label="备注" min-width="120">
+              <template #default="scope">
+                <el-form-item label-width="0px">
+                  <el-input v-model="form.prescriptionDetailsList[item][scope.$index].remarks"/>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-button link type="primary" icon="Edit" @click="removeDrug(item, scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+    </el-row>
+    <!-- 展示结算金额与原始总额 -->
+    <el-row>
+          <el-col :span="24">
+            <div style="text-align: right; margin-top: 20px;color: red">
+              <span>
+                应收金额:{{ form.isInsured === 0 ? Number(patientPay).toFixed(2) : Number(totalPriceSum).toFixed(2) }} �?
+              </span>
+              <span style="margin-left: 16px; color: #666">
+                处方总金�?{{ Number(totalPriceSum).toFixed(2) }} �?
+              </span>
+              <span v-if="form.isInsured === 0" style="margin-left: 16px; color: #333">
+                预计报销:{{ Number(currentReimbursement).toFixed(2) }} �?
+              </span>
+            </div>
+          </el-col>
+        </el-row>
+  </el-form>
+  <template #footer>
+    <div class="dialog-footer">
+      <el-button type="primary" v-if="form.status != 2" @click="saveDiagnosisButton()">�?�?/el-button>
+        <el-button type="primary" v-if="form.status == 3" @click="saveAddDiagnosisButton()">�?�?/el-button>
+          <el-button type="primary" v-if="form.status != 3" @click="submitForm">�?�?/el-button>
+            <el-button @click="cancel">�?�?/el-button>
+    </div>
+  </template>
+</el-dialog>
+<!-- 患者档�?-->
+<PatientDossier ref="patientDossierRef" :title="ttto" :width="'80%'" :open="patientOpen" :patientQuery="patientQuery"
+  @select-value="select" @input-query="updatePatientType()" />
+<!-- 药品库存 v-model="drugOpen" -->
+<DrugInventory ref="drugInventoryRef" :style="{ width: '100%' }" :title="druyTitle" :open="drugOpen"
+  :medicineName="medicineName" :queryParams="queryParamsDrugInventory" @input-medicine-name="updateMedicineName()"
+  @select-value="obtainDrugInventoryData" @input-queryParams="drugInventoryInputQueryParams()" />
+<!-- 常规处方 -->
+<ConventionalPrescription v-hasPermi="['os:patientDiagnosis:conventionalPrescription']"
+  :title="conventionalPrescriptionTitle" v-model="conventionalPrescriptionOpen"
+  @select-value="conventionalPrescriptionSelect" />
+<!-- 药品档案 -->
+<DrugArchives ref="childComponentRef" :widthBf="sdada" :title="titleDrugArchives" :openAssembly="openDrugArchives"
+  :queryParams="queryParamsDrugArchives" :controlQuery="controlQueryDrugArchives" :controlData="controlDataDrugArchives"
+  @input-data="paginationDataFq()" @select-value="selectDrugData" />
+<!-- 患者诊断信�?-->
+<DiagnosisInformation ref="diagnosisInformationRef" :style="styleDiagnosisInformation"
+  :controlData="controlDataDiagnosisInformation" />
+</div>
+</template>
+
+
+<script setup name="PatientDiagnosis">
+import { onActivated, ref, watch } from 'vue'
+
+
+import { getHealthcareOsPatientInfo } from '@/api/healthcare/outpatientService/healthcareOsPatientInfo'
+import {
+  addPatientDiagnosis, delPatientDiagnosis,
+  getHistoryReimbursement,
+  getPatientDiagnosis, listPatientDiagnosis,
+  saveAddDiagnosis, saveDiagnosis, saveUpdate, updatePatientDiagnosis, verifyInsuranceStatus
+} from '@/api/healthcare/outpatientService/patientDiagnosis'
+// healthcare/outpatientService/patientDiagnosis
+// src\components\Healthcare\OutpatientService\PatientDossier\index.vue
+//  healthcareOsComplaints  DrugArchives
+import {
+  listCommonUsage,
+  listEatingTime,
+  listFrequency
+} from '@/api/healthcare/outpatientService/healthcareOsConventionalValue'
+
+const { proxy } = getCurrentInstance()
+// 在setup脚本中添�?
+onActivated(() => {
+  // 当组件被激活时刷新数据
+  getList()
+})
+const dsada = ref()
+
+// 患者类�?
+const { healthcare_os_patient_type } = proxy.useDict('healthcare_os_patient_type')
+// os_patient_type
+const { healthcare_os_diagnosis_type } = proxy.useDict('healthcare_os_diagnosis_type')
+// 医药包装单位
+const { healthcare_packaging_unit } = proxy.useDict('healthcare_packaging_unit')
+//
+const { sys_user_sex } = proxy.useDict('sys_user_sex')
+//
+const { healthcare_dose_unit } = proxy.useDict('healthcare_dose_unit')
+// healthcare_os_insured  是否 医保
+const { healthcare_os_insured } = proxy.useDict('healthcare_os_insured')
+// healthcare_os_diagnosis_status    诊断状�?
+const { healthcare_os_diagnosis_status } = proxy.useDict('healthcare_os_diagnosis_status')
+
+// 系统 �?是否
+const { sys_yes_no } = proxy.useDict('sys_yes_no')
+
+// 获取 常用用法
+common()
+const commonUsageList = ref([]) // 用法
+const eatingTimeList = ref([]) //  食用时间
+const frequencyList = ref([]) //   次数
+const totalPriceSum = ref(0) //所有药品总价�?
+// 历史累计医保报销金额与限额、当前报销估算
+const historyReimbursement = ref(0)
+const reimbursementLimit = ref(300)
+const currentReimbursement = ref(0)
+const patientPay = ref(0)
+function common() {
+  listCommonUsage().then(res => {
+    commonUsageList.value = res.rows
+  })
+  listEatingTime().then(res => {
+    eatingTimeList.value = res.rows
+  })
+  listFrequency().then(res => {
+    frequencyList.value = res.rows
+  })
+}
+
+//
+const patientDiagnosisList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+
+//
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    patientId: null,
+    diagnosisType: null,
+    isInsured: null,
+    value: null,
+    studentId: null,
+    name: null,
+    patientType: null,
+    chiefComplaint: null,
+    presentIllness: null,
+    pastHistory: null,
+    diagnosis: null,
+    medicalAdvice: null,
+    doctorName: null,
+    status: null,
+    startTime: null,
+    endTime: null
+  },
+  // vue3 �?封装 的好 �?检�?写法   pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+  rules: {
+    patientType: [
+      {
+        required: true,
+        message: '就诊类型不能为空',
+        trigger: 'change'
+      }
+    ],
+    diagnosisType: [
+      {
+        required: true,
+        message: '判断类型不能为空',
+        trigger: 'change'
+      }
+    ],
+    studentId: [
+      { required: true, message: '学号/工号不能为空', trigger: 'blur' },
+      { pattern: /^\d+(\.\d+)?$/, message: '请输入一个有效的正数', trigger: 'blur' },
+      { pattern: /^\S+.*$/, message: '开头有空格', trigger: 'blur' }
+    ],
+    name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+    phone: [{ required: false, message: '手机不能为空', trigger: 'blur' }],
+    isInsured: [{ required: true, message: '是否医保不能为空', trigger: 'blur' }],
+    value: [
+      { required: true, message: '报销比率不能为空', trigger: 'blur' },
+      { pattern: /^\d+(\.\d+)?$/, message: '请输入一个有效的小数', trigger: 'blur' },
+      {
+        pattern: /^(?:\d+(?:\.\d+)?|\.\d+)$/,
+        message: '请输入一个有效的小数',
+        trigger: 'blur'
+      },
+      {
+        pattern: /^\d+(\.\d{0,2})?$/,
+        message: '最多两位小数',�?,
+        trigger: 'blur'
+      },
+      {
+        pattern: /^\S+.*$/,
+        message: '开头有空格',
+        trigger: 'blur'
+      },
+      {pattern: /^\S+.*$/, message: '开头有空格', trigger: 'blur'}
+    ],
+    prescriptionDetailsList: [{required: true, message: '处方不能为空', trigger: 'blur'}]
+  }
+})
+
+// 方法 没有 �?调用
+// 计算所有药品总价�?
+function calculationTotalSum(index, index2) {
+  const totalPrice = ref(0)
+  if (form.value.isInsured == healthcare_os_insured.value[0].value) {
+    totalPrice.value = form.value.prescriptionDetailsList[index][index2].totalQuantity * form.value.prescriptionDetailsList[index][index2].unitPrice * form.value.value
+  } else {
+    totalPrice.value = form.value.prescriptionDetailsList[index][index2].totalQuantity * form.value.prescriptionDetailsList[index][index2].unitPrice
+  }
+
+  if (!Number.isNaN(totalPrice.value)) {
+    totalPrice.value = totalPrice.value.toFixed(2)
+    form.value.prescriptionDetailsList[index][index2].totalPrice = totalPrice.value
+  } else {
+    form.value.prescriptionDetailsList[index][index2].totalPrice = 0
+  }
+
+  // 更新总价�? 进行 再次 计算 
+  totalPriceSumF()
+}
+
+
+// 转接 使用 诊断 �?使用 数据 �?   显示 变量 进行 计算 
+function totalPriceSumF() {
+  // 更新总价�?
+  totalPriceSum.value = form.value.prescriptionDetailsList
+      .reduce((sum, prescription) => {
+        return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
+      }, 0)
+      .toFixed(2)
+}
+
+// 校验 方法
+function checkValueRules(rule, value, callback) {
+  const num = Number(value)
+  const minValue = 0
+  const maxValue = 1000
+  if (isNaN(num)) {
+    callback(new Error('请输入一个数字'))�?))
+  } else {
+    callback()
+  }
+}
+
+const {queryParams, form, rules} = toRefs(data)
+
+// 实时联动预计报销与自付金�?放在 form 初始化之�?
+watch([
+  () => form.value?.value,
+  () => form.value?.isInsured,
+  () => totalPriceSum.value
+], () => {
+  const insured = form.value?.isInsured
+  const sum = Number(totalPriceSum.value || 0)
+  if (insured === 0) {
+    const rate = Number(form.value?.value || 0) / 100
+    const r = isNaN(rate) ? 0 : rate
+    currentReimbursement.value = sum * r
+    patientPay.value = (sum - Number(currentReimbursement.value || 0)).toFixed(2)
+  } else {
+    currentReimbursement.value = 0
+    patientPay.value = sum.toFixed(2)
+  }
+})
+
+const nameDiagnosisList = ref([])
+
+// 患�?�?诊断 �?列表
+watch(
+    () => form.value.studentId,
+    (newValue, odlValue) => {
+      if (form.value.studentId != null) {
+        listPatientDiagnosis({studentId: newValue}).then(res => {
+          nameDiagnosisList.value = res.rows
+          console.log('就诊记录', nameDiagnosisList)
+        })
+      } else {
+        nameDiagnosisList.value = []
+      }
+    }
+)
+const insuranceDisabled = ref(false)
+
+// 输入百分比的展示与解�?用于 el-input-number)
+const insuranceFormatter = (value) => {
+  if (value === undefined || value === null || value === '') return ''
+  return `${value}%`
+}
+const insuranceParser = (value) => {
+  if (value === undefined || value === null) return 0
+  const v = String(value).replace(/%/g, '')
+  const num = parseFloat(v)
+  return isNaN(num) ? 0 : num
+}
+
+const handleInsuranceClear = () => {
+  insuranceDisabled.value = false;
+  form.value.isInsured = null;
+  form.value.value = null;
+  currentReimbursement.value = 0;
+  // 清空为总价作为自付金额
+  patientPay.value = Number(totalPriceSum.value || 0).toFixed(2);
+};
+// 判断患者是否可用医保方�?
+const handleInsuranceChange = async (value) => {
+  if (value === null || value === undefined) return;
+  try {
+
+    // 获取身份证信息和姓名
+    let name = form.value.name;
+    let idCard = form.value.idCard;
+
+    if (value === 1) {
+      insuranceDisabled.value = false; // 保持可编辑状�?
+      return;
+    }
+    // 如果没有身份证信�?尝试通过 patientId 自动补全
+    if (!idCard) {
+      if (form.value.patientId) {
+        try {
+          const p = await getHealthcareOsPatientInfo(form.value.patientId)
+          if (p && p.code === 200 && p.data) {
+            idCard = p.data.idCard
+            name = p.data.name || name
+            form.value.idCard = idCard
+            form.value.name = name
+          }
+        } catch (e) {
+          // 忽略补全失败
+        }
+      }
+      if (!idCard) {
+        form.value.isInsured = 1; // 假设字典�?表示�?
+        insuranceDisabled.value = true; // 锁定选择
+        proxy.$modal.msgWarning('请先选择患者并获取身份证信�?);
+        return;
+      }
+    }
+
+    // 调用后端接口验证医保状�?
+    const res = await verifyInsuranceStatus(idCard, name);
+    // 无论是否通过都先重置状�?
+    insuranceDisabled.value = false;
+
+    if (res.code === 200) {
+      if (res.data === 0) {
+        proxy.$modal.msgSuccess('医保可用');
+        // 获取历史累计医保报销金额
+        if (form.value.patientId) {
+          try {
+            const his = await getHistoryReimbursement(form.value.patientId, new Date())
+            if (his && his.code === 200) {
+              historyReimbursement.value = Number(his.data || 0)
+            }
+          } catch (e) {
+            historyReimbursement.value = 0
+          }
+        }
+        // 初步校验当前处方是否可能超限
+        if (Array.isArray(form.value.prescriptionDetailsList) && form.value.isInsured === 0 && form.value.value) {
+          // 以当前总价和乘报销比率作为本次报销估算
+          const rate = Number(form.value.value || 0) / 100
+          currentReimbursement.value = Number(totalPriceSum.value || 0) * (isNaN(rate) ? 0 : rate)
+          patientPay.value = (Number(totalPriceSum.value || 0) - Number(currentReimbursement.value || 0)).toFixed(2)
+          if (historyReimbursement.value + currentReimbursement.value > reimbursementLimit.value) {
+            proxy.$modal.msgWarning('累计医保报销超出300元限�?已切换为自费');
+            form.value.isInsured = 1;
+            insuranceDisabled.value = true;
+          }
+        }
+      } else {
+        form.value.isInsured = 1; // 假设字典�?表示�?
+        insuranceDisabled.value = true; // 锁定选择
+        proxy.$modal.msgWarning('该患者医保未缴费,不可使用医保!');
+      }
+    }
+  } catch (error) {
+    form.value.isInsured = 1;
+    insuranceDisabled.value = true;
+    proxy.$modal.msgError('医保验证失败');
+
+  }
+};
+// 选择 医生 对应 库房 对应 诊断信息列表
+import { getWarehouse } from '@/api/healthcare/warehouse'
+import { getUserProfile } from '@/api/system/user.js'
+
+/** 查询患者诊断信息列�?*/
+function getList() {
+  loading.value = true
+  //  获取 医生(用户) 信息
+  getUserProfile().then(userInfoRow => {
+    // 获取 库房 信息
+    getWarehouse(userInfoRow.data.userId).then(res => {
+      // 赋�?库房id
+      queryParams.value.storeroomId = res.data.storeroomId
+      queryParams.value.storeroomName = res.data.storeroomName
+      // 获取 患者诊断信息列�?
+      listPatientDiagnosis(queryParams.value).then(response => {
+        patientDiagnosisList.value = response.rows
+        total.value = response.total
+        loading.value = false
+      })
+    })
+  })
+}
+
+// 获取 库房 信息 存储
+const userInfoWarehouse = ref({})
+
+// 获取 库房 信息 �?方法
+function getWarehouseInfo() {
+  //
+  getUserProfile().then(res => {
+    getWarehouse(res.data.userId).then(response => {
+      userInfoWarehouse.value = response.data
+    })
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+  totalPriceSum.value = 0
+  currentReimbursement.value = 0
+  patientPay.value = 0
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    patientDiagnosisId: null, //  患者诊断信息ID
+    patientType: null,
+    studentId: null,
+    name: null,
+    gender: null,
+    age: null,
+    major: null,
+    classInfo: null,
+    phone: null,
+    counselor: null,
+    department: null,
+    patientId: null,
+    diagnosisType: null,
+    isInsured: null,
+    value: 0,
+    chiefComplaint: null,
+    presentIllness: null,
+    pastHistory: null,
+    diagnosis: null,
+    medicalAdvice: null,
+    doctorName: null,
+    status: null,
+    outpatientTime: null,
+    storeroomId: null,
+    storeroomName: null,
+    idCard: null,
+    prescriptionDetailsList: []
+    // 新增医保状态重�?
+  }
+  insuranceDisabled.value = false
+  // 清空报销相关显示数据,避免出现上一次的�?
+  historyReimbursement.value = 0
+  currentReimbursement.value = 0
+  totalPriceSum.value = 0
+  patientPay.value = 0
+  proxy.resetForm('patientDiagnosisRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  outpatientTime.value = []
+  queryParams.value.startTime = null
+  queryParams.value.endTime = null
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加患者诊断信�?
+  // 自动触发医保验证
+  if (form.value.idCard) {
+    handleInsuranceChange()
+  }
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getPatientDiagnosis(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改患者诊断信�?
+    // 进行 价格 计算 显示 对话�?
+    totalPriceSumF()
+    // 重新刷新数据
+    getList()
+    // 编辑场景下自动补齐身份证和历史累计医保金�?
+    if (form.value.patientId && !form.value.idCard) {
+      getHealthcareOsPatientInfo(form.value.patientId).then(p => {
+        if (p && p.code === 200 && p.data) {
+          form.value.idCard = p.data.idCard
+          if (!form.value.name) form.value.name = p.data.name
+        }
+      }).catch(() => {})
+    }
+    if (form.value.patientId) {
+      getHistoryReimbursement(form.value.patientId, new Date()).then(his => {
+        if (his && his.code === 200) {
+          historyReimbursement.value = Number(his.data || 0)
+        }
+      }).catch(() => {
+        historyReimbursement.value = 0
+      })
+    }
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  // 提交前进行医保报销额度最终校�?
+  // 先重新计算当前处方可报销金额
+  calculationWholeTotal()
+  if (form.value.isInsured === 0) {
+    const sum = Number(historyReimbursement.value || 0) + Number(currentReimbursement.value || 0)
+    if (sum > Number(reimbursementLimit.value || 300)) {
+      proxy.$modal.msgWarning('累计医保报销超出300元限�?请调整处方或切换为自�?)
+      return
+    }
+  }
+  // console.log('提交按钮', form, form.value)
+  //  获取 库房 信息
+  getUserProfile().then(res => {
+    getWarehouse(res.data.userId).then(response => {
+      //
+      form.value.storeroomId = response.data.storeroomId
+      form.value.storeroomName = response.data.storeroomName
+      //
+      proxy.$refs['patientDiagnosisRef'].validate(valid => {
+        if (valid) {
+          if (form.value.patientDiagnosisId != null && form.value.status == 2) {
+            updatePatientDiagnosis(form.value).then(response => {
+              proxy.$modal.msgSuccess('修改成功')
+              open.value = false
+              getList()
+              totalPriceSum.value = 0
+              currentReimbursement.value = 0
+              patientPay.value = 0
+            })
+          } else {
+            addPatientDiagnosis(form.value).then(response => {
+              proxy.$modal.msgSuccess('新增成功')
+              open.value = false
+              getList()
+              totalPriceSum.value = 0
+              currentReimbursement.value = 0
+              patientPay.value = 0
+            })
+          }
+        }
+      })
+    })
+  })
+}
+
+// saveDiagnosis保存接诊信息
+function saveDiagnosisButton() {
+  // console.log('保存成功', form, form.value)
+  //  获取 库房 信息
+  getUserProfile().then(res => {
+    getWarehouse(res.data.userId).then(response => {
+      // 赋�?
+      form.value.storeroomId = response.data.storeroomId
+      form.value.storeroomName = response.data.storeroomName
+      // 请求 修改 保存
+      // proxy.$refs['patientDiagnosisRef'].validate(valid => {
+      //   if (valid) {
+      //     if (form.value.patientDiagnosisId != null && form.value.status == 3) {
+      //       saveUpdate(form.value).then(response => {
+      //         proxy.$modal.msgSuccess('修改保存成功')
+      //         open.value = false
+      //         getList()
+      //       })
+      //     } else {
+      //       saveDiagnosis(form.value).then(response => {
+      //         proxy.$modal.msgSuccess('保存成功')
+      //         open.value = false
+      //         getList()
+      //       })
+      //     }
+      //   }
+      // })
+      if (form.value.patientDiagnosisId != null && form.value.status == 3) {
+        saveUpdate(form.value).then(response => {
+          proxy.$modal.msgSuccess('修改保存成功')
+          open.value = false
+          getList()
+          totalPriceSum.value = 0
+          currentReimbursement.value = 0
+          patientPay.value = 0
+        })
+      } else {
+        saveDiagnosis(form.value).then(response => {
+          proxy.$modal.msgSuccess('保存成功')
+          open.value = false
+          getList()
+          totalPriceSum.value = 0
+          currentReimbursement.value = 0
+          patientPay.value = 0
+        })
+      }
+      // if(form.value.chiefComplaint != '' || form.value.presentIllness != '' || form.value.diagnosis != '' || form.value.medicalAdvice != '') {
+      //   proxy.$refs['patientDiagnosisRef'].validate(valid => {
+      //   if (valid) {
+      //     if (form.value.patientDiagnosisId != null && form.value.status == 3) {
+      //       saveUpdate(form.value).then(response => {
+      //         proxy.$modal.msgSuccess('修改保存成功')
+      //         open.value = false
+      //         getList()
+      //       })
+      //     } else {
+      //       saveDiagnosis(form.value).then(response => {
+      //         proxy.$modal.msgSuccess('保存成功')
+      //         open.value = false
+      //         getList()
+      //       })
+      //     }
+      //   }
+      // })
+      // }
+      // else {
+      //   if (form.value.patientDiagnosisId != null && form.value.status == 3) {
+      //       saveUpdate(form.value).then(response => {
+      //         proxy.$modal.msgSuccess('修改保存成功')
+      //         open.value = false
+      //         getList()
+      //       })
+      //     } else {
+      //       saveDiagnosis(form.value).then(response => {
+      //         proxy.$modal.msgSuccess('保存成功')
+      //         open.value = false
+      //         getList()
+      //       })
+      //     }
+      // }
+
+    })
+  })
+}
+
+// 修改 保存 库存 操作 �?方法
+function saveAddDiagnosisButton() {
+  // console.log('保存成功', form, form.value)
+  // 获取 选择 �?库房
+  //  获取 库房 信息
+  getUserProfile().then(res => {
+    getWarehouse(res.data.userId).then(response => {
+      // 赋�?
+      form.value.storeroomId = response.data.storeroomId
+      form.value.storeroomName = response.data.storeroomName
+      // 请求
+      proxy.$refs['patientDiagnosisRef'].validate(valid => {
+        if (valid) {
+          saveAddDiagnosis(form.value).then(response => {
+            proxy.$modal.msgSuccess('添加成功')
+            open.value = false
+            getList()
+            totalPriceSum.value = 0
+            currentReimbursement.value = 0
+            patientPay.value = 0
+          })
+        }
+      })
+
+    })
+  })
+}
+
+// 取消 处方  cancel  prescription
+function cancelPrescription() {
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+      .confirm('是否确认删除患者诊断信息编号为"' + _ids + '"的数据项?')
+      .then(function () {
+        return delPatientDiagnosis(_ids)
+      })
+      .then(() => {
+        getList()
+        proxy.$modal.msgSuccess('删除成功')
+      })
+      .catch(() => {
+      })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+      'outpatientService/patientDiagnosis/export',
+      {
+        ...queryParams.value
+      },
+      `patientDiagnosis_${new Date().getTime()}.xlsx`
+  )
+}
+
+//
+import { listHealthcareOsComplaints } from '@/api/healthcare/outpatientService/healthcareOsComplaints'
+import PatientDossier from '@/components/Healthcare/OutpatientService/PatientDossier/index.vue'
+// 患�?档案  组件
+// 请求 参数
+const patientOpen = ref(false)
+const ttto = ref('患者档�?)
+const patientDossierRef = ref(null)
+//
+const studentIdRef = ref(null)
+const patientQuery = ref({
+  pageNum: 1,
+  pageSize: 10,
+  patientType: null,
+  patientId: null,
+  name: null
+})
+
+// 更新 患�? 事件 处理 方法 input-patient-type
+const updatePatientType = value => {
+  // console.log('药品名称', value)
+  patientQuery.value = value
+}
+
+// 获取 患�?信息 �?方法
+function selectPatient() {
+  //
+  patientDossierRef.value.openDialog()
+  ttto.value = '患者档�?
+  updatePatientType({
+    pageNum: 1,
+    pageSize: 10,
+    patientType: form.value.patientType,
+    studentId: form.value.studentId
+  })
+}
+
+// 接收 �?数据  患者基�?
+const select = value => {
+  // console.log('接收子数�?, value)
+  // console.log('接收子数�?2:', value.patientType)
+  form.value.patientId = value.id
+  form.value.patientType = Number(value.patientType)
+  form.value.studentId = value.studentId
+  form.value.name = value.name
+  form.value.gender = value.gender
+  form.value.age = value.age
+  form.value.major = value.major
+  form.value.classInfo = value.classInfo
+  form.value.phone = value.phone
+  form.value.counselor = value.counselor
+  form.value.department = value.department
+  form.value.idCard = value.idCard
+  // console.log('接收子数�?, form.value)
+  //
+  studentIdRef.value.blur()
+  // console.log('hdsahjk觉得撒打�?, studentIdRef.value.blur())
+  //
+  patientDossierRef.value.closeDialog()
+  // 新增医保状态重�?
+  insuranceDisabled.value = false;
+  form.value.isInsured = null // 重置医保选择
+  form.value.value = null     // 重置报销比率
+  // 获取历史医保累计金额
+  if (form.value.patientId) {
+    getHistoryReimbursement(form.value.patientId, new Date()).then(his => {
+      if (his && his.code === 200) {
+        historyReimbursement.value = Number(his.data || 0)
+      }
+    }).catch(() => {
+      historyReimbursement.value = 0
+    })
+  }
+}
+reset()
+// selectComplaints
+const queryComplaints = ref({
+  complaintName: null
+})
+const complaintsValue = ref([])
+const options = ref([])
+
+/** 查询主诉列表 */
+function getListComplaints() {
+  listHealthcareOsComplaints(queryComplaints).then(response => {
+    options.value = response.rows
+  })
+}
+
+// getListComplaints();
+
+/*  选择 主诉 内容 进行 赋�?�?方法  */
+
+function selectComplaints(value) {
+  // console.log('选择主诉', value.currentHistory)
+  form.value.chiefComplaint = value.complaintName
+  form.value.presentIllness = value.currentHistory
+  form.value.pastHistory = value.pastHistory
+  form.value.diagnosis = value.diagnosis
+  form.value.medicalAdvice = value.medicalAdvice
+}
+
+import DrugInventory from '@/components/Healthcare/OutpatientService/DrugInventory/index.vue'
+
+/* 处理 处方 药品 信息 价格 子组�?使用  */
+
+//  药品 批次 列表  弹框 显示 变量
+const drugOpen = ref(false)
+// 药品 批次 列表  弹框 标题
+const druyTitle = ref('药品价格')
+// 处方 序号  �?确定 哪一�?处方
+const prescriptionItem = ref(0)
+// 药品 序号 �?确定 哪一�?药品
+const drugItem = ref(0)
+// 数据  传�?�? 参数
+const medicineName = ref('')
+//
+const drugInventoryRef = ref(null)
+// 请求 参数
+const queryParamsDrugInventory = ref({
+  pageNum: 1,
+  pageSize: 10,
+  medicineName: null
+})
+
+// 重置请求 参数
+function resetQueryParamsDrugInventory() {
+  queryParamsDrugInventory.value = {
+    pageNum: 1,
+    pageSize: 10,
+    medicineName: null
+  }
+}
+
+// 更新 药品 名称 事件 处理 方法
+const updateMedicineName = value => {
+  // console.log('药品名称', medicineName.value)
+  medicineName.value = value
+}
+
+// 处方 列表 里面 输入�? 点击 事件 处理 方法
+function selectDrugPriceInput(item, row) {
+  // 药品 批次 列表  弹框 显示 变量
+  // 进行 判断 是否 �?药品 名字
+  if (form.value.prescriptionDetailsList[item][row.$index].medicineName != null) {
+    drugOpen.value = true
+  } else {
+    proxy.$modal.msgWarning('请先输入药品名称')
+    retrun
+  }
+  // 药品 批次 弹框 组件 里面 �?方法
+  drugInventoryRef.value.openDialog()
+  // 处方 �?序号
+  prescriptionItem.value = item
+  // 药品 �?序号
+  drugItem.value = row.$index
+  // 药品 �?名字
+  updateMedicineName(form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName)
+}
+
+// 处理 药品 批次 库存 �?按钮
+function selectDrugPriceInputButton(item, row) {
+  // console.log('row', drugInventoryRef.value.updateQueryParams(queryParamsDrugInventory.value), queryParamsDrugInventory.value.medicineName, row.row.medicineName, item, row.$index)
+  // 重置请求 参数 �?方法
+  resetQueryParamsDrugInventory()
+  // 判断 row 里面 �?没有 medicineName 属�?
+  if (row.row.hasOwnProperty('medicineName')) {
+    queryParamsDrugInventory.value.medicineName = row.row.medicineName
+    // drugInventoryRef.value.updateQueryParams(queryParamsDrugInventory.value);
+  }
+  // 药品 批次 弹框 组件 里面 �?方法
+  drugInventoryRef.value.openDialog(queryParamsDrugInventory.value)
+  prescriptionItem.value = item
+  drugItem.value = row.$index
+}
+
+// 事件 修改 �?组件 �?请求 参数
+const drugInventoryInputQueryParams = value => {
+  queryParamsDrugInventory.value.medicineName = value
+}
+
+const inputPrice = ref(null)
+
+// 药品 批次 列表 库存  返回  事件 处理 接收 子组�?传输 过来的数�?
+const drugPriceSelect = value => {
+  // console.log('接收药品档案数据', prescriptionItem.value, drugItem.value, form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName, value.medicineName, value, form, sys_yes_no, sys_yes_no.value[0].value, sys_yes_no.value[1].value, value.minNumber)
+  drugOpen.value = false
+  // 比配 名字 是否 相同
+  if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName == value.medicineName) {
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineId = value.filingId
+    // 药品 名称 赋�?
+    if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit != null) {
+      // 判断 是否 可以  拆分
+      if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit == 'Y') {
+        //
+        form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitPrice = value.minNumberRetailPrice
+      }
+      // 判断 是否 可以  拆分
+      else if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit == 'N') {
+        //
+        form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitPrice = value.filingRetailPrice
+      }
+      // 进行 计算  �?�?�?药品 进行 计算 价格
+      calculationTotal(prescriptionItem.value, drugItem.value)
+      // 库存进行 计算 想要 �?数据 �?赋�?
+      const boxCount = value.boxCount
+      const packCount = value.packCount
+      // 库存 处理 方法
+      drugInventoryHandleInsufficient(prescriptionItem.value, drugItem.value, boxCount, packCount)
+    } else {
+      proxy.$modal.msgSuccess('错误提示 isSplit = null ')
+    }
+  } else {
+    proxy.$modal.msgSuccess('错误提示 药品名称错误')
+  }
+  // console.log('赋�?, form)
+}
+
+// 选择 药品 �?批次 �?库存 �?操作
+// obtain  drug   inventory   data
+const obtainDrugInventoryData = value => {
+  // console.log('选择 药品 �?批次 �?库存 �?操作', value)
+  // 药品 id 赋�?
+  form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineId = value.filingId
+  //  药品 名称
+  form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].medicineName = value.medicineName
+  // 批次
+  form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].batch = value.batch
+  // 有效期至
+  form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].expiryDate = value.expiryDate
+
+  // 规格
+  form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].specification = value.specification
+  // 药品 使用 单位  最小包装单�?
+  if (!form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].hasOwnProperty('splitUnit')) {
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].splitUnit = value.splitUnit
+  }
+  // 包装单位
+  if (!form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].hasOwnProperty('packageUnit')) {
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].packageUnit = value.packageUnit
+  }
+  // 是否允许拆分
+  form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit = value.isSplit
+  // 判断 是否 可以  拆分
+  if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit == 'Y') {
+    // 药品 单价
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitPrice = value.minNumberRetailPrice
+    if (value.state == 0) {
+      // 最小单位数�?
+      form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.minNumber
+    }
+    //
+    if (value.state == 1) {
+      // 最小包装数�?
+      form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.unitQuantity
+    }
+  }
+  // 判断 是否 可以  拆分
+  else if (form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].isSplit == 'N') {
+    // 药品 单价
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitPrice = value.filingRetailPrice
+  }
+  // 进行 计算 
+  calculationTotal(prescriptionItem.value, drugItem.value)
+  // 库存进行 计算 想要 �?数据 �?赋�?
+  const boxCount = value.boxCount
+  const packCount = value.packCount
+  // 库存 处理 方法
+  drugInventoryHandleInsufficient(prescriptionItem.value, drugItem.value, boxCount, packCount)
+}
+
+/* 获取 药品 名称 列表 药品 基本 档案 药品 名称 �?唯一�? */
+import { gainMedicineArchiveList } from '@/api/healthcare/outpatientService/patientDiagnosis'
+// reactive
+const druyNameList = ref([])
+const druyName = ref([])
+
+//
+function getDruyNameListQuer() {
+  gainMedicineArchiveList({medicineName: druyName.value}).then(response => {
+    druyNameList.value = response.rows
+    // console.log('药品名称:', response.rows)
+  })
+  // console.log('获取 药品 信息 列表 药品 基本 档案 药品 名称 �?唯一�?', druyName.value, druyNameList.value)
+}
+
+// 控制 是否 显示 可以 拆分 总量  总量  可以 拆分  总量  �?可以 拆分
+const isDisplayTotalQuantity = ref(0)
+
+// 点击 事件 choiceDruyName
+function choiceDruyName(index, index2, value) {
+  // console.log('点击 事件 choiceDruyName', form.value.prescriptionDetailsList[0], index, index2, value.packageUnit)
+  form.value.prescriptionDetailsList[index][index2].splitUnit = value.splitUnit
+  form.value.prescriptionDetailsList[index][index2].packageUnit = value.packageUnit
+  form.value.prescriptionDetailsList[index][index2].isSplit = value.isSplit
+  // 控制 药品 输入 �?�?控制
+  // form.value.prescriptionDetailsList[index][index2].isSplit == 'Y'
+  // 1 => 可以 拆分 ; 0 => �?可以 拆分�?
+  isDisplayTotalQuantity.value = 0
+}
+
+// 点击 输入 �? 触发 事件 处理 药品 名称 列表 显示
+const queryDrugName = async (queryString, cb) => {
+  druyName.value = queryString
+  getDruyNameListQuer()
+  cb(druyNameList)
+}
+
+// getDruyNameListQuer();
+
+/* 处方 添加 drug 按钮 点击 事件 处理  */
+function addPrescriptionButton() {
+  // console.log('处方 添加 drug 按钮 点击 事件 处理 ', form)
+  const listCf = []
+  form.value.prescriptionDetailsList.push(listCf)
+  // console.log('处方 添加 drug 按钮 点击 事件 处理 ', form)
+}
+
+/*  添加 药品  按钮 点击 事件 处理  */
+function addDrugButton(index) {
+  // console.log('添加 药品  按钮 点击 事件 处理 ', eatingTimeList.value)
+  // if (commonUsageList.value.length == 0 || commonUsageList.value == null) {
+  //   proxy.$modal.msgError('没有用法数据')
+  //   return
+  // } else if (frequencyList.value.length == 0 || frequencyList.value == null) {
+  //   proxy.$modal.msgError('没有次数数据')
+  //   return
+  // } else if (eatingTimeList.value.length == 0 || eatingTimeList.value == null) {
+  //   proxy.$modal.msgError('没有食用时间数据')
+  //   return
+  // }
+  // form.value.prescriptionDetailsList[index].push({
+  //   usageValue: commonUsageList.value[0].value, //
+  //   splitUnit: '1', // 单位
+  //   frequency: Number(frequencyList.value[0].value), // 次数
+  //   eatingTime: eatingTimeList.value[0].value, // 食用时间
+  //   packageUnit: '1' // 单位1
+  // })
+  // 确保 eatingTimeList 中包�?饭后"选项
+  if (!eatingTimeList.value.some(option => option.value === '饭后')) {
+    eatingTimeList.value.push({value: '饭后', name: '饭后'});
+  }
+
+  form.value.prescriptionDetailsList[index].push({
+    usageValue: commonUsageList.value[0].value, //
+    splitUnit: '1', // 单位
+    frequency: Number(frequencyList.value[0].value), // 次数
+    eatingTime: '饭后', // 默认值设置为"饭后"
+    packageUnit: '1' // 单位1
+  });
+
+  // console.log('添加 药品  按钮 点击 事件 处理 ', form)
+}
+
+/*  删除药品  */
+function removeDrug(index, index2) {
+  form.value.prescriptionDetailsList[index].splice(index2, 1)
+}
+
+/*  删除处方  */
+function removePrescription(index) {
+  form.value.prescriptionDetailsList.splice(index, 1)
+  totalPriceSum.value = 0;
+}
+
+// 组件 常规处方 �?弹框
+import ConventionalPrescription from '@/components/Healthcare/OutpatientService/ConventionalPrescription'
+// 弹框 �?显示
+const conventionalPrescriptionOpen = ref(false)
+//
+const conventionalPrescriptionTitle = ref('常规处方')
+
+// 处方 �?位置
+const conventionalPrescriptionIndex = ref(null)
+
+// 常规 处方
+function conventionalPrescriptionButton(index) {
+  // console.log('常规 处方 ', index)
+  conventionalPrescriptionIndex.value = index
+  conventionalPrescriptionOpen.value = true
+}
+
+// 接收 子组�?传�?�?数据
+const conventionalPrescriptionSelect = value => {
+  form.value.prescriptionDetailsList[conventionalPrescriptionIndex.value] = value
+  conventionalPrescriptionOpen.value = false
+}
+
+// 医保 计算 �?�?
+function calculationWholeTotal() {
+  //
+  if (form.value.prescriptionDetailsList != null) {
+    const totalPrescriptionDetailsList = form.value.prescriptionDetailsList
+    for (let i = 0; i < totalPrescriptionDetailsList.length; i++) {
+      for (let j = 0; j < totalPrescriptionDetailsList[i].length; j++) {
+        calculationTotal(i, j)
+      }
+    }
+    // 更新当前报销估算并校验限�?总价不按比率,报销金额按比�?
+    if (form.value.isInsured === 0) {
+      const rate = Number(form.value.value || 0) / 100
+      currentReimbursement.value = Number(totalPriceSum.value || 0) * (isNaN(rate) ? 0 : rate)
+      // 计算患者需自付金额
+      patientPay.value = (Number(totalPriceSum.value || 0) - Number(currentReimbursement.value || 0)).toFixed(2)
+      if (historyReimbursement.value + currentReimbursement.value > reimbursementLimit.value) {
+        proxy.$modal.msgWarning('累计医保报销超出300元限�?已切换为自费');
+        form.value.isInsured = 1;
+        insuranceDisabled.value = true;
+      }
+    } else {
+      currentReimbursement.value = 0
+      patientPay.value = Number(totalPriceSum.value || 0).toFixed(2)
+    }
+  }
+}
+
+// 修改 药品 价格 计算
+// 计算 总量  总价  �?一�?药品 �?价格 总价
+function calculationTotal(index, index2) {
+  //
+  const totalAmount = ref(0)
+  //  进行  是否 拆分 �?  数据 处理 计算 拆分 总量 计算 �?方法 ,
+  // if (form.value.prescriptionDetailsList[index][index2].isSplit == 'Y') {
+  //   // �?拆分 �?总量 �?计算 拆分 �?总量 = 用量 * 频次 * 天数
+  //   totalAmount.value = form.value.prescriptionDetailsList[index][index2].dosageValue * form.value.prescriptionDetailsList[index][index2].frequency * form.value.prescriptionDetailsList[index][index2].eatingDays
+  //   if (!Number.isNaN(totalAmount.value)) {
+  //     // 进行赋�?
+  //     form.value.prescriptionDetailsList[index][index2].totalQuantity = totalAmount.value
+  //   } else {
+  //     //
+  //     form.value.prescriptionDetailsList[index][index2].totalQuantity = 0
+  //   }
+  // }
+  //
+  // console.log('totalAmount:', totalAmount, healthcare_os_insured.value[0].value)
+  // 总量
+
+  // 在不 修改 由有 的代�?进行 修改 进行 一�?不可 拆分
+
+  const totalPrice = ref(0)
+  // 总价
+  // 总价始终为数�?单价,不直接乘报销比率
+  totalPrice.value = form.value.prescriptionDetailsList[index][index2].totalQuantity * form.value.prescriptionDetailsList[index][index2].unitPrice
+
+  // console.log('totalPrice�?', totalPrice.value)
+  if (!Number.isNaN(totalPrice.value)) {
+    // 进行 四舍五入 0.00
+    const tp = Number(totalPrice.value).toFixed(2)
+    form.value.prescriptionDetailsList[index][index2].totalPrice = tp
+  } else {
+    form.value.prescriptionDetailsList[index][index2].totalPrice = 0
+  }
+
+  // 更新总价�?
+  totalPriceSum.value = form.value.prescriptionDetailsList
+      .reduce((sum, prescription) => {
+        return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
+      }, 0)
+      .toFixed(2)
+
+  // console.log('prescriptionDetailsList�?', form.value.prescriptionDetailsList)
+}
+
+// 药品 档案 弹框
+import DrugArchives from '@/components/Healthcare/OutpatientService/DrugArchives'
+import drugArchivesUse from '@/components/Healthcare/OutpatientService/DrugArchives/use.ts'
+
+let {
+  controlQueryDrugArchives,
+  queryParamsDrugArchives,
+  controlDataDrugArchives,
+  openDrugArchives,
+  titleDrugArchives
+} = drugArchivesUse()
+
+// 显示 数据 控制
+controlDataDrugArchives.value[6].display = false
+
+// 控制 弹框 �?�?
+const sdada = ref('1600px')
+
+// 药品 �?位置 处方
+const drugFanIndex = ref(null)
+// 药品 �?位置 处方
+const drugFanDrugIndex = ref(null)
+//
+const childComponentRef = ref(null)
+
+// 点击 事件 处理 药品 档案 弹框
+function drugArchivesBulletFrameOperation(index, index2) {
+  drugFanIndex.value = index
+  drugFanDrugIndex.value = index2
+  openDrugArchives.value = true
+  titleDrugArchives.value = '药品档案'
+  childComponentRef.value.openDialog()
+  // console.log('药品档案', index, index2)
+}
+
+// 获取 药品 档案 里面 �?数据
+const selectDrugData = value => {
+  // console.log('获取 药品 档案 里面 �?数据', drugFanIndex.value, drugFanDrugIndex.value, value, value.minNumber)
+  //
+  childComponentRef.value.closeDialog()
+  // 药品 名称
+  form.value.prescriptionDetailsList[drugFanIndex.value][drugFanDrugIndex.value].medicineName = value.medicineName
+  // 药品 �?转化�?固�?液�?�?转化�?不一�?0 固�?1 液�?
+  if (value.state == '0') {
+    // 药品 �?最小单位数�?
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.minNumber
+  }
+  if (value.state == '1') {
+    // 药品 �?最小包装数�?
+    form.value.prescriptionDetailsList[prescriptionItem.value][drugItem.value].unitQuantity = value.unitQuantity
+  }
+
+  // 药品 使用 单位  最小包装单�?
+  // form.value.prescriptionDetailsList[drugFanIndex.value][
+  //   drugFanDrugIndex.value
+  // ].splitUnit = value.splitUnit;
+  // 包装单位
+  // form.value.prescriptionDetailsList[drugFanIndex.value][
+  //   drugFanDrugIndex.value
+  // ].packageUnit = value.packageUnit;
+  // 是否 可以 拆分
+  form.value.prescriptionDetailsList[drugFanIndex.value][drugFanDrugIndex.value].isSplit = value.isSplit
+  // 控制 可以 拆分 总量  总价  显示 隐藏  0 => 可以 拆分 1 => 不可�?拆分
+  // form.value.prescriptionDetailsList[index][index2].isSplit == 'Y'
+  // 修改 进行 不可 拆分 显示
+  isDisplayTotalQuantity.value = 0
+}
+
+// 药品 �?库存 处理 逻辑  库存 不足  stock  inventory handle Insufficient
+function drugInventoryHandleInsufficient(index, index2, boxCount, packCount) {
+  if (form.value.prescriptionDetailsList[index][index2].isSplit == 'Y') {
+    // 处理
+    const unitQuantity = form.value.prescriptionDetailsList[index][index2].unitQuantity
+    if (unitQuantity != null) {
+      // 库存 不足 处理 逻辑
+      form.value.prescriptionDetailsList[index][index2].inventoryCount = boxCount * unitQuantity + packCount
+      // console.log(' 库存 处理 逻辑 ', form.value.prescriptionDetailsList[index][index2])
+    }
+  } else {
+    form.value.prescriptionDetailsList[index][index2].inventoryCount = boxCount
+  }
+}
+
+// 判断 库存 是否 不足  Insufficient
+function judgeInventoryIsInsufficient(index, index2) {
+  const total = form.value.prescriptionDetailsList[index][index2].totalQuantity
+  const inventoryCount = form.value.prescriptionDetailsList[index][index2].inventoryCount
+  if (total != null && inventoryCount != null) {
+    if (total > inventoryCount) {
+      // proxy.$modal.error("库存不足");
+    }
+  }
+}
+
+// 患�?诊断 信息 弹框
+import DiagnosisInformation from '@/components/Healthcare/OutpatientService/DiagnosisInformation'
+import DiagnosisInformationUse from '@/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts'
+import { Check } from "@element-plus/icons-vue"
+
+const diagnosisInformationRef = ref(null) // 引用子组�?
+
+
+let {controlDataDiagnosisInformation, styleDiagnosisInformation} = DiagnosisInformationUse()
+
+// check
+function checkInformation(id) {
+  console.log(id);
+  diagnosisInformationRef.value.openDialog(id)
+}
+
+//  按钮
+function checkButton(row) {
+  // console.log('row:', row)
+  diagnosisInformationRef.value.openDialog(row.id)
+}
+
+//就诊时间选择
+// 格式�?Date �?YYYY-MM-DD
+const outpatientTime = ref([])
+function formatDate(date) {
+  if (!date) return ''
+  const y = date.getFullYear()
+  const m = String(date.getMonth() + 1).padStart(2, '0')
+  const d = String(date.getDate()).padStart(2, '0')
+  return `${y}-${m}-${d}`
+}
+function changeTime() {
+  if (outpatientTime.value && Array.isArray(outpatientTime.value)) {
+    queryParams.value.startTime = formatDate(outpatientTime.value[0])
+    queryParams.value.endTime = formatDate(outpatientTime.value[1])
+    //console.log('startTime:', queryParams.value.startTime)
+    //console.log('endTime:', queryParams.value.endTime)
+  } else {
+    startTime.value = ''
+    endTime.value = ''
+  }
+}
+
+/** 打印按钮操作 */
+function handlePrint(row) {
+  // 获取打印数据
+  getPatientDiagnosis(row.id).then(response => {
+    const printData = response.data;
+
+    // 调用打印方法
+    printPrescription(printData);
+  });
+}
+
+/** 打印方法 */
+function printPrescription(data) {
+  // 处理性别显示 (0=�?1=�?
+  const genderDisplay = data.gender == 0 ? '�? : (data.gender == 1 ? '�? : '');
+  // 单位映射字典(键值对反转后的版本,便于查找)
+  const unitMap = {
+    '1': '�?,
+    '2': '�?,
+    '3': '�?,
+    '4': '�?,
+    '5': '�?,
+    '6': '�?,
+    '7': '�?,
+    '8': '�?,
+    '9': '�?,
+    '10': 'g',
+    '11': '�?,
+    '12': '�?,
+    '13': '�?,
+    '14': '�?,
+    '15': '�?,
+    '16': '�?,
+    '17': '�?,
+    '18': '�?,
+    '19': '�?,
+    '20': 'mg',
+    '21': '�?,
+    '22': '�?,
+    '23': '�?,
+    '24': '�?,
+    '25': '�?,
+    '26': '�?,
+    '27': '�?,
+    '28': '�?,
+    '29': '�?,
+    '30': 'ml',
+    '31': '�?,
+    '32': '�?,
+    '33': '�?,
+    '34': '�?,
+    '35': '�?,
+    '36': '�?,
+    '37': '�?,
+    '38': '�?,
+    '39': '�?,
+    '40': 'IU'
+  };
+
+  // 增强版单位转换函�?
+  function formatUnit(value) {
+    if (value == null || value === '') return '';
+
+    // 如果已经是中文单�?直接返回
+    if (Object.values(unitMap).includes(value.toString())) {
+      return value;
+    }
+
+    // 处理可能带数字后缀的情�?�?"1" �?1)
+    const strValue = value.toString().trim();
+
+    // 检查是否是纯数�?
+    if (/^\d+$/.test(strValue)) {
+      return unitMap[strValue] || strValue;
+    }
+
+    // 检查是否是数字+单位格式(�?"1�?)
+    const match = strValue.match(/^(\d+)([^\d]*)$/);
+    if (match) {
+      const num = match[1];
+      const unit = match[2];
+      return (unitMap[num] || num) + unit;
+    }
+
+    // 其他情况返回原�?
+    return strValue;
+  }
+
+  // 频次映射字典(键值对)
+  const frequencyMap = {
+    '1': '每天1�?,
+    '2': '每天2�?,
+    '3': '每天3�?,
+    '4': '每天4�?,
+    '5': '隔日1�?,
+    '6': '每周1�?,
+    '7': '每周2�?,
+    '8': '临睡�?,
+    '9': '每晚1�?,
+    '10': '�?小时1�?,
+    '11': '�?小时1�?,
+    '12': '�?小时1�?,
+    '13': '�?小时1�?,
+    '14': '�?2小时1�?,
+    '15': '立即',
+    '16': '需要时',
+    '17': '需要时(长期)',
+    '18': 'N�?�?,
+    '19': 'N�?�?,
+    '20': 'N小时1�?,
+    '21': '每周N�?
+  };
+
+  // 频次格式化函�?只保留中�?
+  function formatFrequency(value) {
+    if (value == null || value === '') return '';
+
+    // 如果已经是中文频�?直接返回
+    if (Object.values(frequencyMap).includes(value.toString())) {
+      return value;
+    }
+
+    // 如果是数字键�?转换为中文频�?
+    const strValue = value.toString().trim();
+    if (frequencyMap[strValue]) {
+      return frequencyMap[strValue];
+    }
+
+    // 如果是英文缩�?中文格式(�?qd 每天1�?),提取中文部分
+    const chineseMatch = value.match(/[\u4e00-\u9fa5]+/g);
+    if (chineseMatch && chineseMatch.length > 0) {
+      return chineseMatch.join('');
+    }
+
+    // 其他情况返回原�?
+    return strValue;
+  }
+
+  // 处理日期数据 - 只保留年月日部分
+  const currentDate = new Date();
+  const dateObj = {
+    year: data.year || currentDate.getFullYear(),
+    month: data.month || currentDate.getMonth() + 1,
+    day: data.day || currentDate.getDate()
+  };
+
+  // 如果传入的是完整日期时间字符�?自动拆分
+  if (data.outpatientTime && !data.year) {
+    const [datePart] = data.outpatientTime.split(' ');
+    const dateParts = datePart.split(/[-/]/);
+    if (dateParts.length >= 3) {
+      dateObj.year = dateParts[0];
+      dateObj.month = dateParts[1];
+      dateObj.day = dateParts[2];
+    }
+  }
+
+  // 从表单数据结构中获取医保信息
+  const insuranceInfo = data.isInsured == 0 ? '□自�?离休 二乙 ☑医�?自治区、市、县)' : '☑自�?□医�?自治区、市、县)';
+
+  // 新窗�?
+  const printWindow = window.open('', '_blank');
+
+
+  // 打印内容HTML
+  const printContent = `
+   <html>
+  <head>
+    <title>处方打印</title>
+    <style>
+      body {
+        font-family: "SimSun", serif;
+        margin: 0;
+        padding: 10px;
+      }
+      .prescription-container {
+        width: 210mm;
+        margin: 0 auto;
+        padding: 10mm;
+      }
+      .header {
+        text-align: center;
+        margin-bottom: 10px;
+      }
+      .header h2 {
+        font-size: 35px;
+        font-weight: bold;
+        margin: 5px 0;
+      }
+      .patient-info-container {
+        display: flex;
+        flex-direction: column;
+        margin-bottom: 10px;
+      }
+      .patient-info-row {
+        display: flex;
+        align-items: center;
+        padding: 5px 0;
+        min-height: 30px;
+      }
+      .patient-info-label {
+        margin-left: 6px;
+        font-weight: bold;
+        min-width: 50px;
+      }
+      .patient-info-value {
+        flex: 1;
+        border-bottom: 1px solid #000;
+        margin-right: 20px;
+        min-width: 100px;
+      }
+      .date-container {
+        display: flex;
+        align-items: center;
+      }
+      .date-part {
+        display: inline-block;
+        min-width: 30px;
+        border-bottom: 1px solid #000;
+        margin-right: 5px;
+        text-align: center;
+      }
+      .footer {
+        margin-top: 20px;
+      }
+      .signature-row {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: -10px;
+      }
+      .divider {
+        border-top: 1px solid #000;
+        margin: 20px 20px 10px 2px;
+      }
+      .patient-opinion {
+        display: flex;
+        align-items: center;
+        margin-top: 15px;
+      }
+      .opinion-option {
+        margin-right: 20px;
+      }
+      .contact-info {
+        margin-top: 10px;
+        font-size: 16px;
+      }
+      .doctor-signature {
+        margin-left: 400px;
+      }
+      .no-print {
+        display: none;
+      }
+      .doctor{
+        margin-left: 185px;
+      }
+      .collector {
+        margin-right: 19px;
+      }
+      .examine {
+        margin-right: 20px;
+      }
+      .check {
+        margin-right: 20px;
+      }
+      .patient {
+        margin-left: 250px;
+      }
+      .section {
+        margin-bottom: 15px;
+        margin-right: 20px;
+      }
+      .section-title {
+        font-weight: bold; margin-bottom: 5px;
+      }
+      table {
+        width: 100%; 
+        border-collapse: collapse;
+        margin-bottom: 15px;
+      }
+      th, td {
+        border: 1px solid #ddd;
+        padding: 8px;
+        text-align: left;
+
+      }
+      @media print {
+        body {
+          margin: 0;
+          padding: 10px;
+        }
+        .no-print {
+          display: none;
+        }
+        .prescription-container {
+          padding: 0;
+        }
+        
+      }
+      @page {
+        size: A4;
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="prescription-container">
+      <!-- 头部信息 -->
+      <div class="header">
+        <h2>南宁市社会医疗机构专用处方笺</h2>
+      </div>
+
+      <!-- 患者基本信�?-->
+      <div class="patient-info-container">
+        <div class="patient-info-row">
+          <div class="patient-info-label">费别:</div>
+          <div class="patient-info-value">
+            ${insuranceInfo} 对号划✓
+          </div>
+        </div>
+        
+        <div class="patient-info-row">
+          <div class="patient-info-label">姓名:</div>
+          <div class="patient-info-value">${data.name || ''}&nbsp</div>
+          
+          <div class="patient-info-label">性别:</div>
+          <div class="patient-info-value">${genderDisplay}&nbsp</div>
+          
+          <div class="patient-info-label">年龄:</div>
+          <div class="patient-info-value">${data.age || ''}&nbsp</div>
+        </div>
+        
+        <div class="patient-info-row">
+          <div class="patient-info-label">门诊病历�?</div>
+          <div class="patient-info-value">${data.medicalRecordNo || ''}&nbsp</div>
+          
+          <div class="patient-info-label">科别:</div>
+          <div class="patient-info-value">${data.classInfo || ''}</div>
+        </div>
+        
+        <div class="patient-info-row">
+          <div class="patient-info-label">临床诊断:</div>
+          <div class="patient-info-value">${data.diagnosis || ''}&nbsp</div>
+        </div>
+        
+        <div class="patient-info-row">
+          <div class="patient-info-label">开具日�?</div>
+          <div class="date-container">
+            <span class="date-part">${dateObj.year}</span>�?
+            <span class="date-part">${dateObj.month}</span>�?
+            <span class="date-part">${dateObj.day}</span>�?
+          </div>
+        </div>
+
+
+      <!-- 患者信�?-->
+      </div>
+      <div><strong>主诉:</strong> ${data.chiefComplaint || '�?}</div>
+      <div><strong>现病�?</strong> ${data.presentIllness || '�?}</div>
+      <div><strong>既往�?</strong> ${data.pastHistory || '�?}</div>
+      <!-- 医嘱信息 -->
+      <div style="margin: 10px 0;">
+        <div><strong>Rp:</strong>${data.medicalAdvice || ''}</div>
+      </div>
+      
+
+
+<div class="section">
+  <div class="section-title">处方详情</div>
+  <table>
+    <thead>
+      <tr>
+        <th>序号</th>
+        <th>药品名称</th>
+        <th>规格</th>
+        <th>用法</th>
+        <th>用量</th>
+        <th>频次</th>
+        <th>总量</th>
+      </tr>
+    </thead>
+    <tbody>
+      ${data.prescriptionDetailsList?.flat().map((item, index) => `
+        <tr>
+          <td>${index + 1}</td>
+          <td>${item.medicineName || ''}</td>
+          <td>${item.specification || ''}</td>
+          <td>${item.usageValue || ''}</td>
+          <td>${item.dosageValue || ''} ${formatUnit(item.splitUnit) || ''}</td>
+          <td>${formatFrequency(item.frequency) || ''}</td>
+          <td>${item.totalQuantity || ''} ${formatUnit(item.packageUnit) || ''}</td>
+        </tr>
+      `).join('') || '<tr><td colspan="7">无处�?/td></tr>'}
+    </tbody>
+  </table>
+</div>
+      
+      <!-- 底部签名�?-->
+      <div class="footer">
+        <!-- 医师签名 -->
+        <div class="signature-row doctor-signature">
+          <div class="doctor">医师签名:${data.doctorName || ''}</div>
+        </div>
+        
+        <!-- 分隔�?-->
+        <div class="divider"></div>
+        
+        <!-- 药品金额和收费员 -->
+        <div class="signature-row">
+          <p>药品金额:${data.prescriptionDetailsList?.flat().reduce((sum, item) => sum + (parseFloat(item.totalPrice) || 0), 0).toFixed(2) || '0.00'}�?/p>
+          <div class="patient-info-row">
+          <div class="patient-info-label">收费�?&nbsp&nbsp</div>
+          <div class="patient-info-value">${data.doctorName || ''}&nbsp</div>
+          </div>
+        </div>
+        
+        <!-- 注射费和审核调配 -->
+        <div class="signature-row">
+          <p>注射�?________�?/p>
+          <div class="patient-info-row">
+          <div class="patient-info-label">审核、调�?</div>
+          <div class="patient-info-value">&nbsp</div>
+          </div>
+        </div>
+        
+        <!-- 收款票据和核对发�?-->
+        <div class="signature-row">
+        <p>(收款票据请贴附处方背�? </p>
+          <div class="patient-info-row">
+          <div class="patient-info-label">核对、发�?</div>
+          <div class="patient-info-value">${data.doctorName || ''}&nbsp</div>
+          </div>
+        </div>
+        
+        <!-- 大额处方患者意见和签名 -->
+        <div class="patient-opinion">
+          <div style="margin-right: 20px;">大额处方患者意�?</div>
+          <div class="opinion-option">�?同意</div>
+          <div class="opinion-option">�?不同�?/div>
+          <div class="patient">患者签�?______________</div>
+        </div>
+        <!-- 联系地址或电�?-->
+        <div class="contact-info">联系地址或电�?患者志愿填�?:________________________</div>
+      </div>
+      
+      <!-- 打印控制按钮 -->
+      <div class="no-print" style="margin-top: 20px; text-align: center;">
+        <button onclick="window.print()" style="padding: 5px 15px; background: #409EFF; color: white; border: none; border-radius: 4px; cursor: pointer;">打印</button>
+        <button onclick="window.close()" style="padding: 5px 15px; background: #F56C6C; color: white; border: none; border-radius: 4px; cursor: pointer; margin-left: 10px;">关闭</button>
+      </div>
+    </div>
+  </body>
+</html>
+  `;
+
+  // 写入打印内容
+  printWindow.document.write(printContent);
+  printWindow.document.close();
+
+  // 等待内容加载完成后自动打�?
+  printWindow.onload = function () {
+    setTimeout(() => {
+      printWindow.print();
+    }, 500);
+  };
+}
+
+// 主诉相关数据
+const complaintsOptions = ref([])
+const loadingComplaints = ref(false)
+
+// 初始化时加载主诉模板
+onMounted(() => {
+  loadComplaintsOptions()
+})
+
+// 加载主诉模板
+const loadComplaintsOptions = async () => {
+  try {
+    loadingComplaints.value = true
+    const response = await listHealthcareOsComplaints({status: 0})
+    complaintsOptions.value = response.rows.map(item => ({
+      value: item.complaintName,
+      label: item.complaintName,
+      ...item
+    }))
+  } catch (error) {
+    console.error('加载主诉模板失败:', error)
+  } finally {
+    loadingComplaints.value = false
+  }
+}
+
+// 处理输入框获取焦点事�?
+const handleComplaintFocus = () => {
+  if (!loadingComplaints.value && complaintsOptions.value.length === 0) {
+    loadComplaintsOptions()
+  }
+}
+
+// 查询主诉建议
+const queryComplaintSuggestions = async (queryString, cb) => {
+  try {
+    // 如果没有查询字符串或为空,返回所有选项
+    if (!queryString || queryString.trim() === '') {
+      cb(complaintsOptions.value);
+      return;
+    }
+
+    // 将查询字符串转为小写以便不区分大小写
+    const searchTerm = queryString.toLowerCase();
+
+    // 过滤匹配的选项
+    const filteredOptions = complaintsOptions.value.filter(option => {
+      // 检查选项的label或value是否包含搜索�?
+      return (
+          (option.label && option.label.toLowerCase().includes(searchTerm)) ||
+          (option.value && option.value.toLowerCase().includes(searchTerm))
+      );
+    });
+
+    cb(filteredOptions);
+  } catch (error) {
+    console.error('查询主诉失败:', error);
+    cb([]);
+  }
+};
+
+// 选择主诉
+const selectComplaint = (item) => {
+  if (item.isCustom) {
+    // 自由输入
+    form.value.chiefComplaint = item.value
+  } else {
+    // 选择模板
+    form.value.chiefComplaint = item.label
+    form.value.presentIllness = item.currentHistory || ''
+    form.value.pastHistory = item.pastHistory || ''
+    form.value.diagnosis = item.diagnosis || ''
+    form.value.medicalAdvice = item.medicalAdvice || ''
+  }
+}
+// 清空主诉及相关字�?
+const clearComplaint = () => {
+  form.value.chiefComplaint = ''
+  form.value.presentIllness = ''
+  form.value.pastHistory = ''
+  form.value.diagnosis = ''
+  form.value.medicalAdvice = ''
+}
+
+//
+const timesData = ref('饭后')
+const xuanZheData = (val, index) => {
+  console.log('选中12345');
+  console.log(val, index);
+}
+
+
+getList()
+</script>
+
+<style>
+.el-input__wrapper {
+  width: 702px;
+}
+
+.el-input__inner {
+  font-size: 14px;
+}
+
+.prescriptionAdd {
+  margin-bottom: 20px;
+}
+
+.prescription {
+  margin-bottom: 20px;
+}
+
+/*  */
+.buttonPrescription {
+  float: right;
+}
+</style>
diff --git a/src/views/healthcare/pharmacy/dispensing/index.vue b/src/views/healthcare/pharmacy/dispensing/index.vue
index 78110a0..5f3d9c7 100644
--- a/src/views/healthcare/pharmacy/dispensing/index.vue
+++ b/src/views/healthcare/pharmacy/dispensing/index.vue
@@ -161,16 +161,16 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="是否医保" prop="isInsured">
-                    <el-select v-model="form.isInsured" placeholder="是否医保" clearable :disabled="true">
+                    <el-select v-model="form.isInsured" placeholder="是否医保" clearable :disabled="!editMode">
                       <el-option v-for="dict in healthcare_os_insured" :key="dict.value" :label="dict.label"
                         :value="parseInt(dict.value)"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item v-if="form.isInsured == 0" label="医保率" prop="value">
-                    <el-input @input="calculationWholeTotal()" v-model="form.value" clearable placeholder="请输入医保率"
-                      :disabled="true" />
+                  <el-form-item v-if="form.isInsured == 0" label="报销比率" prop="value">
+                    <el-input @input="calculationWholeTotal()" v-model="form.value" clearable placeholder="请输入报销比率"
+                      :disabled="!editMode" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -439,7 +439,7 @@
                     },
                   ]">
                   <el-button width="100%" @click="selectDrugPriceInputButton(item, scope)">
-                    {{ form.prescriptionDetailsList[item][scope.$index].unitPrice.toFixed(2) }}
+                    {{ Number(form.prescriptionDetailsList[item][scope.$index].unitPrice || 0).toFixed(2) }}
                   </el-button>
                 </el-form-item>
                 <!--  -->
@@ -452,7 +452,7 @@
                     },
                   ]">
                   <el-button width="100%">
-                    {{ form.prescriptionDetailsList[item][scope.$index].unitPrice.toFixed(2) }}
+                    {{ Number(form.prescriptionDetailsList[item][scope.$index].unitPrice || 0).toFixed(2) }}
                   </el-button>
                 </el-form-item>
               </template>
@@ -461,7 +461,14 @@
               <template #default="scope">
                 <el-form-item label-width="0px" :prop="`prescriptionDetailsList.${item}.${scope.$index}.totalPrice`"
                   :rules="[{ required: true, message: '总价不能为空', trigger: 'blur' }]">
-                  {{ form.prescriptionDetailsList[item][scope.$index].totalPrice.toFixed(2) }}
+                  {{
+                    form.isInsured === 0
+                      ? ceilPrice(
+                          Number(form.prescriptionDetailsList[item][scope.$index].totalPrice || 0) *
+                          (1 - Number(form.value || 0) / 100)
+                        )
+                      : ceilPrice(form.prescriptionDetailsList[item][scope.$index].totalPrice || 0)
+                  }}
                   元
                 </el-form-item>
               </template>
@@ -481,12 +488,21 @@
           </el-table>
 
         </el-row>
-        <!-- 展示总价和 -->
+        <!-- 查看详情汇总展示 -->
         <el-row>
           <el-col :span="24">
             <div style="text-align: right; margin-top: 20px;color: red">
-              <span>所有药品总价和: {{ totalPriceSum }} 元</span>
+              <span>
+                应收金额：{{ form.isInsured === 0 ? patientPay : ceilPrice(totalPriceSum) }} 元
+              </span>
+              <span style="margin-left: 16px; color: #666">
+                处方总金额：{{ ceilPrice(totalPriceSum) }} 元
+              </span>
+              <span v-if="form.isInsured === 0" style="margin-left: 16px; color: #333">
+                预计报销：{{ Number(currentReimbursement).toFixed(2) }} 元
+              </span>
             </div>
+            
           </el-col>
         </el-row>
       </el-form>
@@ -498,6 +514,11 @@
           <el-button type="danger" @click="withdrawal" v-if="form.status == 0 || form.status == 1"
             v-hasPermi="['os:patientDiagnosis:returnedMedication']">
             驳回</el-button>
+          <el-button type="warning" @click="startAdjust" v-if="form.status == 1 && !editMode"
+            v-hasPermi="['os:patientDiagnosis:adjustBasic']">更正</el-button>
+          <el-button type="primary" @click="saveAdjust" v-if="form.status == 1 && editMode"
+            v-hasPermi="['os:patientDiagnosis:adjustBasic']">保存更正</el-button>
+          <el-button @click="cancelAdjust" v-if="form.status == 1 && editMode">取消</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
@@ -516,7 +537,18 @@
 <script setup name="PatientDiagnosis">
 const dsada = ref()
 
-import { deliverMedicine, delPatientDiagnosis, getPatientDiagnosis, listPatientDiagnosis, returnedMedication } from '@/api/healthcare/outpatientService/patientDiagnosis'
+// 价格向上取整到小数点后两位（进一法）
+// 例如: 8.123 → 8.13, 2.234 → 2.24, 8.02 → 8.02, 0.55 → 0.55
+// 先缩放到整数避免浮点精度问题（0.55*100=55.0000001 会导致 Math.ceil 错误进位）
+function ceilPrice(value) {
+  const num = Number(value)
+  if (isNaN(num)) return '0.00'
+  const scaled = Math.round(num * 10000)
+  const cents = Math.ceil(scaled / 100)
+  return (cents / 100).toFixed(2)
+}
+
+import { adjustBasic, deliverMedicine, delPatientDiagnosis, getPatientDiagnosis, listPatientDiagnosis, returnedMedication } from '@/api/healthcare/outpatientService/patientDiagnosis'
 // healthcare/outpatientService/patientDiagnosis
 // src\components\Healthcare\OutpatientService\PatientDossier\index.vue
 //  healthcareOsComplaints  DrugArchives
@@ -525,6 +557,10 @@ import DrugInventory from '@/components/Healthcare/OutpatientService/DrugInvento
 
 const { proxy } = getCurrentInstance()
 
+// 汇总展示变量（查看详情页）
+const currentReimbursement = ref(0)
+const patientPay = ref(0)
+
 // 新增  选择诊断地址后刷新页面数据--知无涯
 onActivated(() => {
   // 当组件被激活时刷新数据
@@ -591,6 +627,7 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const editMode = ref(false)
 
 const ListTotalPrice = ref(0)
 
@@ -726,6 +763,7 @@ function getList() {
 function cancel() {
   open.value = false
   reset()
+  editMode.value = false
 }
 
 // 表单重置
@@ -800,15 +838,58 @@ function handleUpdate(row) {
     console.log('处方信息---', form.value)
     open.value = true
     title.value = '查看患者诊断信息'
-    // 更新总价和
-    totalPriceSum.value = form.value.prescriptionDetailsList
-      .reduce((sum, prescription) => {
-        return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
-      }, 0)
-      .toFixed(2)
+    editMode.value = false
+    // 更新总价和（优先用行总价，缺失时用数量*单价回算）
+    const sumAll = (Array.isArray(form.value.prescriptionDetailsList) ?
+      form.value.prescriptionDetailsList.reduce((sum, prescription) => {
+        return sum + prescription.reduce((innerSum, drug) => {
+          const tp = parseFloat(drug.totalPrice)
+          if (!isNaN(tp)) return innerSum + tp
+          const qty = parseFloat(drug.totalQuantity || 0)
+          const up = parseFloat(drug.unitPrice || 0)
+          return innerSum + (qty * up)
+        }, 0)
+      }, 0) : 0)
+    totalPriceSum.value = ceilPrice(sumAll)
+    // 计算本次预计报销与应收
+    const insured = form.value?.isInsured
+    const sum = Number(totalPriceSum.value || 0)
+    if (insured === 0) {
+      const rate = Number(form.value?.value ?? form.value?.value) / 100
+      const r = isNaN(rate) ? 0 : rate
+      // 先计算个人应付（向上取整）
+      const pay = ceilPrice(sum * (1 - r))
+      patientPay.value = pay
+      // 预计报销 = 总价 - 个人应付
+      currentReimbursement.value = (sum - Number(pay)).toFixed(2)
+    } else {
+      currentReimbursement.value = '0.00'
+      patientPay.value = ceilPrice(sum)
+    }
   })
 }
 
+function startAdjust() {
+  editMode.value = true
+  proxy.$modal.msgInfo('已进入更正模式：可修改是否医保与报销比率')
+}
+
+function cancelAdjust() {
+  editMode.value = false
+}
+
+function saveAdjust() {
+  const payload = {
+    patientDiagnosisId: form.value.patientDiagnosisId,
+    isInsured: form.value.isInsured,
+    value: form.value.value
+  }
+  adjustBasic(payload).then(() => {
+    proxy.$modal.msgSuccess('更正已保存')
+    editMode.value = false
+    getList()
+  })
+}
 /** 发药按钮 */
 function submitForm() {
   // console.log("新增成功", form, form.value);
@@ -857,18 +938,17 @@ function calculationTotal(index, index2) {
   // console.log('totalPrice值:', totalPrice.value)
   if (!Number.isNaN(totalPrice.value)) {
     // 进行 四舍五入 0.00
-    totalPrice.value = totalPrice.value.toFixed(2)
+    totalPrice.value = ceilPrice(totalPrice.value)
     form.value.prescriptionDetailsList[index][index2].totalPrice = totalPrice
   } else {
     form.value.prescriptionDetailsList[index][index2].totalPrice = 0
   }
 
   // 更新总价和
-  totalPriceSum.value = form.value.prescriptionDetailsList
+  totalPriceSum.value = ceilPrice(form.value.prescriptionDetailsList
     .reduce((sum, prescription) => {
       return sum + prescription.reduce((innerSum, drug) => innerSum + parseFloat(drug.totalPrice || 0), 0)
-    }, 0)
-    .toFixed(2)
+    }, 0))
 
   // console.log('prescriptionDetailsList值:', form.value.prescriptionDetailsList)
 }
@@ -965,7 +1045,6 @@ const updateMedicineName = value => {
 // 患者 诊断 信息 弹框
 import DiagnosisInformation from '@/components/Healthcare/OutpatientService/DiagnosisInformation'
 import DiagnosisInformationUse from '@/components/Healthcare/OutpatientService/DiagnosisInformation/use.ts'
-import { el } from 'element-plus/es/locales.mjs'
 
 const diagnosisInformationRef = ref(null)
 
diff --git a/src/views/inspection/abnormal/index.vue b/src/views/inspection/abnormal/index.vue
new file mode 100644
index 0000000..aa3a4e4
--- /dev/null
+++ b/src/views/inspection/abnormal/index.vue
@@ -0,0 +1,381 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="巡检点地址" prop="inspectionPoint">
+        <el-input
+          v-model="queryParams.inspectionPoint"
+          placeholder="请输入巡检点地址"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巡检人" prop="inspectorId">
+        <el-input
+          v-model="queryParams.inspectorId"
+          placeholder="请输入巡检人"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <!-- 新增：巡检类型字典选择 -->
+      <el-form-item label="巡检类型" prop="inspectionType">
+        <el-select v-model="queryParams.inspectionType" placeholder="请选择巡检类型" clearable style="width: 240px">
+          <el-option v-for="dict in inspection_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="巡检时间" prop="inspectionTime" style="width: 308px">
+        <el-date-picker
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['inspection:abnormal:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['inspection:abnormal:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['inspection:abnormal:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['inspection:abnormal:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="abnormalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="巡检点地址" align="center" prop="inspectionPoint" />
+      <el-table-column label="巡检人" align="center" prop="inspectorId" />
+      <!-- 修改：巡检类型显示字典标签 -->
+      <el-table-column label="巡检类型" align="center" prop="inspectionType">
+        <template #default="scope">
+          <dict-tag :options="inspection_type" :value="scope.row.inspectionType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="巡检时间" align="center" prop="inspectionTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.inspectionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="巡检图片" align="center" prop="inspectionImg" width="100">
+        <template #default="scope">
+          <image-preview :src="scope.row.inspectionImg" :width="50" :height="50" />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Search" @click="handleUpdate(scope.row)"
+            v-hasPermi="['inspection:abnormal:query']">查看</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['inspection:abnormal:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['inspection:abnormal:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改巡检异常对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="abnormalRef" :model="form" :rules="rules" label-width="90px">
+        <el-form-item label="巡检点地址" prop="inspectionPoint">
+          <el-input v-model="form.inspectionPoint" placeholder="请输入巡检点地址" disabled="true"/>
+        </el-form-item>
+        <el-form-item label="巡检人" prop="inspectorId">
+          <el-input v-model="form.inspectorId" placeholder="请输入巡检人" disabled="true"/>
+        </el-form-item>
+        <!-- 新增：表单中的巡检类型字典选择 -->
+        <el-form-item label="巡检类型" prop="inspectionType">
+          <el-select v-model="form.inspectionType" placeholder="请选择巡检类型" disabled="true">
+            <el-option v-for="dict in inspection_type" :key="dict.value" :label="dict.label"
+              :value="parseInt(dict.value)"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="巡检时间" prop="inspectionTime">
+          <el-date-picker clearable
+            v-model="form.inspectionTime"
+            type="date" disabled="true"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择巡检时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="巡检图片" prop="inspectionImg">
+          <el-upload action="#" :auto-upload="false" :show-file-list="false" :on-change="handleImageUpload">
+          <template #tip>
+          <div class="el-upload__tip">
+          <!-- 展示已上传的图片 -->
+          <div v-if="form.inspectionImg && typeof form.inspectionImg === 'string'" style="display: flex; flex-wrap: wrap;">
+            <img
+              v-for="(url, index) in getFullImageUrls(form.inspectionImg)"
+              :key="index"
+              :src="url"
+              style="max-width: 200px; max-height: 200px; margin: 4px;"
+              :alt="'巡检图片' + index"
+            />
+          </div>
+          <!-- 没有图片时显示提示 -->
+          <span v-else>暂无图片</span>
+        </div>
+        </template>
+        </el-upload>
+      </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
+          <el-button @click="cancel">关  闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Abnormal">
+import { listAbnormal, getAbnormal, delAbnormal, addAbnormal, updateAbnormal } from "@/api/inspection/abnormal";
+import { getCurrentInstance, ref, reactive, toRefs } from 'vue';
+import { parseTime } from '@/utils/ruoyi';
+import { addWatermarkToImage } from '@/utils/watermark';
+import request from '@/utils/request'
+
+const { proxy } = getCurrentInstance();
+// 使用全局字典获取方式，保持与其它页面一致
+const { inspection_type } = proxy.useDict('inspection_type');
+
+const abnormalList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+// 基础路径，用于拼接图片完整URL
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const dateRange = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    inspectionPoint: null,
+    inspectorId: null,
+    inspectionType: null,
+    inspectionTime: null,
+    inspectionImg: null,
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+// 获取图片的完整URL（与巡检记录一致）
+function getFullImageUrls(relativePaths) {
+  if (!relativePaths) return [];
+  const paths = typeof relativePaths === 'string' ? relativePaths.split(',') : relativePaths;
+  return paths.map(path => `${baseUrl}${path.trim()}`);
+}
+// 处理图片上传，加水印并生成预览（与巡检记录一致）
+async function handleImageUpload(file) {
+  try {
+    if (!file || !file.raw) {
+      throw new Error('无效的文件对象');
+    }
+    const watermarkText = `${form.value.inspectionPoint || '未命名地点'} ${form.value.inspectionTime || '未设置时间'}`;
+    const watermarkedFile = await addWatermarkToImage(file.raw, watermarkText, {
+      font: 'bold 48px Arial',
+      color: 'rgba(0, 0, 0, 0.7)'
+    });
+    const previewUrl = URL.createObjectURL(watermarkedFile);
+    form.value.inspectionImg = { raw: watermarkedFile, name: watermarkedFile.name, url: previewUrl };
+  } catch (error) {
+    console.error('水印处理失败:', error);
+    proxy.$modal.msgError('图片处理失败: ' + error.message);
+  }
+}
+
+/** 查询巡检异常列表 */
+function getList() {
+  loading.value = true;
+  queryParams.value.params = {};
+  proxy.addDateRange(queryParams.value, dateRange.value);
+  listAbnormal(queryParams.value).then(response => {
+    abnormalList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    inspectionPoint: null,
+    inspectorId: null,
+    inspectionType: null,
+    inspectionTime: null,
+    inspectionImg: null,
+    remark: null
+  };
+  proxy.resetForm("abnormalRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加巡检异常";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getAbnormal(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改巡检异常";
+  });
+}
+
+/** 提交按钮 */
+async function submitForm() {
+  proxy.$refs["abnormalRef"].validate(async (valid) => {
+    if (valid) {
+      try {
+        // 克隆数据以避免直接修改响应式对象
+        const dataToSubmit = { ...form.value };
+
+        // 如果是新选择的图片对象，先上传到服务器换取字符串路径
+        if (dataToSubmit.inspectionImg && typeof dataToSubmit.inspectionImg === 'object' && dataToSubmit.inspectionImg.raw) {
+          const formData = new FormData();
+          formData.append('file', dataToSubmit.inspectionImg.raw);
+          const res = await request({
+            url: '/common/upload',
+            method: 'post',
+            data: formData,
+            headers: { 'Content-Type': 'multipart/form-data' }
+          });
+          if (res.code !== 200) {
+            throw new Error(res.msg || '图片上传失败');
+          }
+          // RuoYi 通用上传返回 fileName（相对路径），后端字段期望 String
+          dataToSubmit.inspectionImg = res.fileName;
+        }
+
+        if (dataToSubmit.id != null) {
+          await updateAbnormal(dataToSubmit);
+          proxy.$modal.msgSuccess("修改成功");
+        } else {
+          await addAbnormal(dataToSubmit);
+          proxy.$modal.msgSuccess("新增成功");
+        }
+
+        open.value = false;
+        getList();
+      } catch (error) {
+        console.error('提交失败:', error);
+        proxy.$modal.msgError('操作失败: ' + (error.message || '未知错误'));
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除巡检异常编号为"' + _ids + '"的数据项？').then(function() {
+    return delAbnormal(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('inspection/abnormal/export', {
+    ...queryParams.value
+  }, `abnormal_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>
diff --git a/src/views/inspection/manage/index.vue b/src/views/inspection/manage/index.vue
index d8e926c..211035d 100644
--- a/src/views/inspection/manage/index.vue
+++ b/src/views/inspection/manage/index.vue
@@ -36,7 +36,7 @@
         >删除</el-button>
       </el-col>-->
       <el-col :span="1.5">
-        <el-button type="success" plain :disabled="multiple" @click="getQRCodes">批量生产二维码</el-button>
+        <el-button type="success" plain :disabled="multiple" @click="getQRCodes">批量生成二维码</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -55,6 +55,12 @@
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="巡检点" align="center" prop="inspectionPoint" />
       <el-table-column label="巡检要求" align="center" prop="inspectionRequirements" />
+      <!-- 新增：巡检点类型展示 -->
+      <el-table-column label="巡检点类型" align="center" prop="inspectionPointType">
+        <template #default="scope">
+          <dict-tag :options="inspection_point_type" :value="scope.row.inspectionPointType" />
+        </template>
+      </el-table-column>
       <el-table-column label="巡检点状态" align="center" prop="inspectionStatus">
         <template #default="scope">
           <el-switch v-model="scope.row.inspectionStatus" :active-value="'1'" :inactive-value="'0'" active-text="开"
@@ -86,6 +92,12 @@
         <el-form-item label="巡检要求" prop="inspectionRequirements">
           <el-input v-model="form.inspectionRequirements" placeholder="请输入巡检要求" type="textarea" />
         </el-form-item>
+        <!-- 新增：巡检点类型选择 -->
+        <el-form-item label="巡检点类型" prop="inspectionPointType">
+          <el-select v-model="form.inspectionPointType" placeholder="请选择巡检点类型">
+            <el-option v-for="dict in inspection_point_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="巡检点状态" prop="inspectionStatus">
           <el-select v-model="form.inspectionStatus" placeholder="请选择巡检点状态">
             <el-option v-for="dict in inspection_point_status" :key="dict.value" :label="dict.label"
@@ -118,6 +130,8 @@ import { ref, onMounted, onUnmounted, nextTick } from "vue";
 
 const { proxy } = getCurrentInstance();
 const { inspection_point_status } = proxy.useDict("inspection_point_status");
+// 新增：巡检点类型字典
+const { inspection_point_type } = proxy.useDict("inspection_point_type");
 // 子组件
 const qrCodeDownloaderRef = ref(null);
 
@@ -149,6 +163,10 @@ const data = reactive({
     inspectionRequirements: [
       { required: true, message: "巡检要求不能为空", trigger: "blur" }
     ],
+    // 新增：类型为必填
+    inspectionPointType: [
+      { required: true, message: "巡检点类型不能为空", trigger: "change" }
+    ],
     inspectionStatus: [
       { required: true, message: "巡检点状态不能为空", trigger: "change" }
     ]
@@ -188,6 +206,8 @@ function reset() {
     id: null,
     inspectionPoint: null,
     inspectionRequirements: null,
+    // 新增：重置类型字段
+    inspectionPointType: null,
     inspectionStatus: null,
     inspectionQrCode: null
   };
@@ -296,14 +316,22 @@ function getQRCode(row) {
 
 // 多选二维码
 function getQRCodes() {
-  //console.log(ids.value);
-  //console.log(inspectionPoint.value);
-  ids.value.forEach((item, index) => {
-    qrCodeDownloaderRef.value.generateQRCodeWithTextAndNotifyParent(
-      item.id + "",
-      inspectionPoint.value[index]
-    );
-    //qrCodeDownloaderRef.value.Download(inspectionPoint.value[index]);
+  // 防呆：未选择任何项时提示
+  if (!ids.value || ids.value.length === 0) {
+    proxy.$modal.msgWarning("请先选择需要生成二维码的巡检点");
+    return;
+  }
+  // 逐个生成二维码：文本内容使用巡检点ID字符串，下方文字使用巡检点名称
+  ids.value.forEach((id, index) => {
+    if (
+      qrCodeDownloaderRef.value &&
+      qrCodeDownloaderRef.value.generateQRCodeWithTextAndNotifyParent
+    ) {
+      qrCodeDownloaderRef.value.generateQRCodeWithTextAndNotifyParent(
+        String(id),
+        inspectionPoint.value[index]
+      );
+    }
   });
 }
 
diff --git a/src/views/inspection/record/index.vue b/src/views/inspection/record/index.vue
index 60ec3db..8dfc2a4 100644
--- a/src/views/inspection/record/index.vue
+++ b/src/views/inspection/record/index.vue
@@ -84,28 +84,37 @@
             placeholder="请选择巡检时间" disabled="true"></el-date-picker>
         </el-form-item>
         <el-form-item label="巡检图片" prop="inspectionImg">
-        <el-upload action="#" :auto-upload="false" :show-file-list="false" :on-change="handleImageUpload">
-        <template #tip>
-        <div class="el-upload__tip">
-        <!-- 展示已上传的图片 -->
-        <div v-if="form.inspectionImg && typeof form.inspectionImg === 'string'" style="display: flex; flex-wrap: wrap;">
-          <img
-            v-for="(url, index) in getFullImageUrls(form.inspectionImg)"
-            :key="index"
-            :src="url"
-            style="max-width: 200px; max-height: 200px; margin: 4px;"
-            :alt="'巡检图片' + index"
-          />
+          <el-upload action="#" :auto-upload="false" :show-file-list="false" :on-change="handleImageUpload">
+          <template #tip>
+          <div class="el-upload__tip">
+          <!-- 展示已上传的图片 -->
+          <div v-if="form.inspectionImg && typeof form.inspectionImg === 'string'" style="display: flex; flex-wrap: wrap;">
+            <img
+              v-for="(url, index) in getFullImageUrls(form.inspectionImg)"
+              :key="index"
+              :src="url"
+              style="max-width: 200px; max-height: 200px; margin: 4px;"
+              :alt="'巡检图片' + index"
+            />
+          </div>
+          <!-- 没有图片时显示提示 -->
+          <span v-else>暂无图片</span>
         </div>
-        <!-- 没有图片时显示提示 -->
-        <span v-else>暂无图片</span>
-      </div>
-      </template>
-      </el-upload>
+        </template>
+        </el-upload>
       </el-form-item>
         <el-form-item label="备注：" prop="remark" v-if="form.remark != null">
           <span>{{ form.remark }}</span>
         </el-form-item>
+        <el-form-item label="创建者：" v-if="form.createBy">
+          <span>{{ form.createBy }}</span>
+        </el-form-item>
+        <el-form-item label="创建时间：" v-if="form.createTime">
+          <span>{{ parseTime(form.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </el-form-item>
+        <el-form-item label="更新时间：" v-if="form.updateTime">
+          <span>{{ parseTime(form.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </el-form-item>
       </el-form>
 
 
@@ -121,15 +130,15 @@
 
 <script setup name="Record">
 //引入新添加方法 --知无涯
-import { addWatermarkToImage } from '@/utils/watermark';
-import { getCurrentInstance, ref, reactive, toRefs } from 'vue';
 import {
-  listRecord,
-  getRecord,
-  delRecord,
   addRecord,
+  delRecord,
+  getRecord,
+  listRecord,
   updateRecord
 } from "@/api/inspection/record";
+import { addWatermarkToImage } from '@/utils/watermark';
+import { getCurrentInstance, reactive, ref, toRefs } from 'vue';
 //时间处理格式
 import { parseTime } from '@/utils/ruoyi';
 
diff --git a/src/views/inspection/report/bigScreen.vue b/src/views/inspection/report/bigScreen.vue
new file mode 100644
index 0000000..5058d35
--- /dev/null
+++ b/src/views/inspection/report/bigScreen.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="big-screen-wrap">
+    <div class="header">
+      <div class="filters">
+        <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+        <el-button type="primary" @click="reloadAll">查询</el-button>
+      </div>
+      <div class="cards">
+        <div class="card">
+          <div class="label">总巡检次数</div>
+          <div class="value">{{ total }}</div>
+        </div>
+        <div class="card">
+          <div class="label">期间巡检次数</div>
+          <div class="value">{{ monthTotal }}</div>
+        </div>
+        <div class="card">
+          <div class="label">覆盖率</div>
+          <div class="value">{{ (coverage.coverageRate * 100).toFixed(1) }}% ({{ coverage.inspectedCount }}/{{ coverage.totalCount }})</div>
+        </div>
+      </div>
+    </div>
+
+    <div class="charts-row">
+      <div class="chart" ref="barDom"></div>
+      <div class="chart" ref="pieInspectorDom"></div>
+      <div class="chart" ref="pieTypeDom"></div>
+    </div>
+
+    <div class="charts-row">
+      <div class="chart wide" ref="lineDom"></div>
+      <div class="chart" ref="barTypeDom"></div>
+      <div class="chart" ref="pieStatusDom"></div>
+    </div>
+
+    <div class="table-wrap">
+      <el-card>
+        <template #header>
+          <span>未巡检点位清单</span>
+        </template>
+        <el-table :data="uninspected" height="300">
+          <el-table-column prop="id" label="ID" width="80" />
+          <el-table-column prop="inspectionPoint" label="巡检点" />
+          <el-table-column prop="inspectionPointType" label="类型" width="120" />
+          <el-table-column prop="inspectionStatus" label="状态" width="120" />
+        </el-table>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted, nextTick } from 'vue'
+import * as echarts from 'echarts'
+import { ColumnList, RoundList, listTotal, listmonthTotal, trendDaily, typeProportion, coverage as fetchCoverage, uninspectedPoints, pointTypeCounts, statusDistribution } from '@/api/inspection/report.js'
+
+const dateRange = ref([])
+
+// numbers
+const total = ref(0)
+const monthTotal = ref(0)
+const coverageData = ref({ inspectedCount: 0, totalCount: 0, coverageRate: 0 })
+
+// tables
+const uninspected = ref([])
+
+// chart doms
+const barDom = ref(null)
+const pieInspectorDom = ref(null)
+const pieTypeDom = ref(null)
+const lineDom = ref(null)
+const barTypeDom = ref(null)
+const pieStatusDom = ref(null)
+
+let barChart, pieInspectorChart, pieTypeChart, lineChart, barTypeChart, pieStatusChart
+
+const buildParams = () => {
+  const params = {}
+  if (dateRange.value && dateRange.value.length === 2) {
+    params.startTime = dateRange.value[0]
+    params.endTime = dateRange.value[1]
+  }
+  return params
+}
+
+const reloadAll = async () => {
+  const params = buildParams()
+  // totals
+  const [totalRes, monthRes, covRes] = await Promise.all([
+    listTotal(params),
+    listmonthTotal(params),
+    fetchCoverage(params)
+  ])
+  total.value = (totalRes?.data?.data) ?? (totalRes?.data) ?? 0
+  monthTotal.value = (monthRes?.data?.data) ?? (monthRes?.data) ?? 0
+  const cov = (covRes?.data?.data) ?? covRes?.data ?? {}
+  coverageData.value = cov
+
+  // charts
+  const [barRes, pieInspectorRes, pieTypeRes, lineRes, barTypeRes, pieStatusRes] = await Promise.all([
+    ColumnList(params),
+    RoundList(params),
+    typeProportion(params),
+    trendDaily(params),
+    pointTypeCounts(params),
+    statusDistribution()
+  ])
+
+  // bar (地点巡检次数)
+  const barData = (barRes?.data?.data) ?? barRes?.data ?? {}
+  const barOption = {
+    title: { text: '地点巡检次数' },
+    tooltip: {},
+    xAxis: { type: 'category', data: barData.xAxis || [] },
+    yAxis: { type: 'value' },
+    series: [{ type: 'bar', data: barData.seriesData || [] }]
+  }
+  barChart && barChart.setOption(barOption)
+
+  // pie inspectors
+  const pieInspectorData = (pieInspectorRes?.data?.data) ?? pieInspectorRes?.data ?? {}
+  const pieInspectorOption = {
+    title: { text: '巡检人分布' },
+    tooltip: { trigger: 'item' },
+    series: [{ type: 'pie', radius: ['40%', '70%'], data: pieInspectorData.seriesData || [] }]
+  }
+  pieInspectorChart && pieInspectorChart.setOption(pieInspectorOption)
+
+  // pie types
+  const pieTypeData = (pieTypeRes?.data?.data) ?? pieTypeRes?.data ?? {}
+  const pieTypeOption = {
+    title: { text: '巡检类型占比' },
+    tooltip: { trigger: 'item' },
+    series: [{ type: 'pie', radius: ['40%', '70%'], data: pieTypeData.seriesData || [] }]
+  }
+  pieTypeChart && pieTypeChart.setOption(pieTypeOption)
+
+  // line daily trend
+  const lineData = (lineRes?.data?.data) ?? lineRes?.data ?? {}
+  const lineOption = {
+    title: { text: '按日巡检趋势' },
+    tooltip: { trigger: 'axis' },
+    xAxis: { type: 'category', data: lineData.xAxis || [] },
+    yAxis: { type: 'value' },
+    series: [{ type: 'line', smooth: true, data: lineData.seriesData || [] }]
+  }
+  lineChart && lineChart.setOption(lineOption)
+
+  // bar type counts
+  const barTypeData = (barTypeRes?.data?.data) ?? barTypeRes?.data ?? {}
+  const barTypeOption = {
+    title: { text: '类型已巡检点数量' },
+    tooltip: {},
+    xAxis: { type: 'category', data: barTypeData.xAxis || [] },
+    yAxis: { type: 'value' },
+    series: [{ type: 'bar', data: barTypeData.seriesData || [] }]
+  }
+  barTypeChart && barTypeChart.setOption(barTypeOption)
+
+  // pie status distribution
+  const pieStatusData = (pieStatusRes?.data?.data) ?? pieStatusRes?.data ?? {}
+  const pieStatusOption = {
+    title: { text: '点位状态分布' },
+    tooltip: { trigger: 'item' },
+    series: [{ type: 'pie', radius: ['40%', '70%'], data: pieStatusData.seriesData || [] }]
+  }
+  pieStatusChart && pieStatusChart.setOption(pieStatusOption)
+
+  // table
+  const uninspectedRes = await uninspectedPoints(params)
+  uninspected.value = uninspectedRes?.data?.rows ?? uninspectedRes?.data ?? []
+}
+
+onMounted(async () => {
+  await nextTick()
+  barChart = echarts.init(barDom.value)
+  pieInspectorChart = echarts.init(pieInspectorDom.value)
+  pieTypeChart = echarts.init(pieTypeDom.value)
+  lineChart = echarts.init(lineDom.value)
+  barTypeChart = echarts.init(barTypeDom.value)
+  pieStatusChart = echarts.init(pieStatusDom.value)
+  reloadAll()
+})
+
+onUnmounted(() => {
+  ;[barChart, pieInspectorChart, pieTypeChart, lineChart, barTypeChart, pieStatusChart].forEach(c => {
+    if (c && c.dispose) c.dispose()
+  })
+})
+
+// 暴露覆盖率方便模板取值
+const coverage = {
+  get inspectedCount() { return coverageData.value.inspectedCount || 0 },
+  get totalCount() { return coverageData.value.totalCount || 0 },
+  get coverageRate() { return coverageData.value.coverageRate || 0 }
+}
+</script>
+
+<style scoped>
+.big-screen-wrap { padding: 16px; }
+.header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12px; }
+.filters { display: flex; gap: 8px; align-items: center; }
+.cards { display: flex; gap: 12px; }
+.card { background: #fff; border-radius: 8px; padding: 12px 16px; box-shadow: 0 1px 4px rgba(0,0,0,0.08); min-width: 220px; }
+.card .label { font-size: 14px; color: #666; }
+.card .value { font-size: 20px; font-weight: 600; margin-top: 4px; }
+.charts-row { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; margin-bottom: 12px; }
+.chart { height: 320px; background: #fff; border-radius: 8px; }
+.chart.wide { grid-column: span 2; }
+.table-wrap { margin-top: 12px; }
+</style>
\ No newline at end of file
diff --git a/src/views/inspection/report/index.vue b/src/views/inspection/report/index.vue
index 20dc57e..a3b1a65 100644
--- a/src/views/inspection/report/index.vue
+++ b/src/views/inspection/report/index.vue
@@ -10,15 +10,11 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="巡检时间" style="width: 308px">
-            <el-date-picker
-              v-model="daterangeOccurTime"
-              value-format="YYYY-MM-DD"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
+          <el-form-item label="巡检点" prop="inspectionPoint">
+            <el-input v-model="queryParams.inspectionPoint" placeholder="输入巡检点"></el-input>
+          </el-form-item>
+          <el-form-item label="巡检人" prop="inspectorId">
+            <el-input v-model="queryParams.inspectorId" placeholder="输入巡检人姓名"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -27,29 +23,46 @@
         </el-form>
       </el-col>
     </el-row>
-    <el-row :gutter="20">
-      <el-col :span="6"></el-col>
-      <el-col :span="4">
-        <div class="box1">
-          <p class="p1">总巡检数</p>
-          <p class="p2">{{ total }}</p>
-        </div>
-      </el-col>
-      <el-col :span="3"></el-col>
-      <el-col :span="4">
-        <div class="box1">
-          <p class="p1">本月巡检数</p>
-          <p class="p2">{{ monthTotal }}</p>
-        </div>
-      </el-col>
-    </el-row>
+
+    <!-- 总计：左柱状（巡检点），右环形（巡检人） -->
     <el-row :gutter="24">
       <el-col :span="2"></el-col>
-      <el-col :span="10">
-        <Histogram :chart-data="histogramData" />
+      <el-col :span="20">
+        <el-card shadow="never" class="section-card">
+          <div class="section-title">总计</div>
+          <el-row :gutter="16">
+            <el-col :span="12"><Histogram :chart-data="histogramTotalData" /></el-col>
+            <el-col :span="12"><CircularDiagram :data="inspectorTotalData" /></el-col>
+          </el-row>
+        </el-card>
       </el-col>
-        <el-col :span="12">
-        <CircularDiagram :data="circularDiagramData"/>
+    </el-row>
+
+    <!-- 本月：左柱状（巡检点），右环形（巡检人） -->
+    <el-row :gutter="24">
+      <el-col :span="2"></el-col>
+      <el-col :span="20">
+        <el-card shadow="never" class="section-card">
+          <div class="section-title">本月</div>
+          <el-row :gutter="16">
+            <el-col :span="12"><Histogram :chart-data="histogramMonthData" /></el-col>
+            <el-col :span="12"><CircularDiagram :data="inspectorMonthData" /></el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 本日：左柱状（巡检点），右环形（巡检人） -->
+    <el-row :gutter="24">
+      <el-col :span="2"></el-col>
+      <el-col :span="20">
+        <el-card shadow="never" class="section-card">
+          <div class="section-title">本日</div>
+          <el-row :gutter="16">
+            <el-col :span="12"><Histogram :chart-data="histogramDayData" /></el-col>
+            <el-col :span="12"><CircularDiagram :data="inspectorDayData" /></el-col>
+          </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -59,70 +72,70 @@
 import * as echarts from "echarts";
 import Histogram from "@/components/ReportAnalytics/Histogram.vue";
 import CircularDiagram from "@/components/ReportAnalytics/reportCircularDiagram.vue" 
-import { ColumnList, listTotal ,RoundList,listmonthTotal} from "@/api/inspection/report.js";
+import { pointStats3, inspectorStats3 } from "@/api/inspection/report.js";
 import { ref, reactive, toRefs, getCurrentInstance } from "vue";
 
 const showSearch = ref(true);
 const { proxy } = getCurrentInstance();
 
-const total = ref(0);
-const monthTotal = ref(0);
-const histogramData = ref({ xAxis: [], seriesData: [] });
-const circularDiagramData = ref([]);
+// 三套柱状数据：总计 / 本月 / 本日（巡检点统计）
+const histogramTotalData = ref({ xAxis: [], seriesData: [] });
+const histogramMonthData = ref({ xAxis: [], seriesData: [] });
+const histogramDayData = ref({ xAxis: [], seriesData: [] });
+// 三套环形数据：总计 / 本月 / 本日（巡检人统计）
+const inspectorTotalData = ref([]);
+const inspectorMonthData = ref([]);
+const inspectorDayData = ref([]);
 
-const daterangeOccurTime = ref([]);
+// 汇总展示（可选）
+const totalPoint = ref(0);
+const totalUser = ref(0);
+const monthPoint = ref(0);
+const monthUser = ref(0);
+
+// const daterangeOccurTime = ref([]);
 
 const data = reactive({
   queryParams: {
     startTime: null,
-    endTime: null
+    endTime: null,
+    inspectionPoint: '',
+    inspectorId: ''
   }
 });
 
 const { queryParams } = toRefs(data);
 
 function getList() {
-  queryParams.value = {};
-  if (null != daterangeOccurTime && "" != daterangeOccurTime) {
-    queryParams.value["startTime"] = daterangeOccurTime.value[0];
-    queryParams.value["endTime"] = daterangeOccurTime.value[1];
-  }
-  // 柱形图请求
-
-  ColumnList(queryParams.value).then(response => {
-    const responseData = response.data;
-    // monthTotal.value = responseData.monthTotal;
-  // 赋值给 histogramData
-    histogramData.value = {
-      xAxis: responseData.xAxis,
-      seriesData: responseData.seriesData
+  queryParams.value = {
+    inspectionPoint: data.queryParams.inspectionPoint,
+    inspectorId: data.queryParams.inspectorId
   };
-  });
-  
-  //圆形图请求
-  RoundList(queryParams.value).then(response => {
-   circularDiagramData.value = response.data.seriesData.map(item => ({
-      value: item.value,
-      name: item.name
-    }));
-    console.log(circularDiagramData.value);
+  // 巡检点统计（三合一：总/月/日）
+  pointStats3(queryParams.value).then(res => {
+    const d = res.data || {};
+    const total = d.total || { xAxis: [], seriesData: [] };
+    const month = d.month || { xAxis: [], seriesData: [] };
+    const day = d.day || { xAxis: [], seriesData: [] };
+    histogramTotalData.value = { xAxis: total.xAxis || [], seriesData: total.seriesData || [] };
+    histogramMonthData.value = { xAxis: month.xAxis || [], seriesData: month.seriesData || [] };
+    histogramDayData.value = { xAxis: day.xAxis || [], seriesData: day.seriesData || [] };
+    totalPoint.value = (histogramTotalData.value.seriesData || []).reduce((a,b)=>a+(b||0),0);
+    monthPoint.value = (histogramMonthData.value.seriesData || []).reduce((a,b)=>a+(b||0),0);
   });
 
-  // 总条数请求
-  listTotal().then(response => {
-    total.value = response.data;
-  }).catch(error => {
-    console.error("Error fetching total count:", error);
-    proxy.$message.error("总条数数据获取失败，请稍后再试。");
-  });
-  
-  // 本月总条数请求
-  listmonthTotal(queryParams.value).then(response => {
-    monthTotal.value = response.data;
-  }).catch(error => {
-    console.error("Error fetching monthTotal count:", error);
-    proxy.$message.error("本月条数数据获取失败，请稍后再试。");
+  // 巡检人统计（三合一：总/月/日）
+  inspectorStats3(queryParams.value).then(res=>{
+    const d = res.data || {};
+    inspectorTotalData.value = (d.total || []).map(i=>({ name:i.name, value:i.value }));
+    inspectorMonthData.value = (d.month || []).map(i=>({ name:i.name, value:i.value }));
+    inspectorDayData.value = (d.day || []).map(i=>({ name:i.name, value:i.value }));
+    // 统计卡片上的“巡检人总次数”汇总
+    totalUser.value = inspectorTotalData.value.reduce((a,b)=>a+(b.value||0),0);
+    monthUser.value = inspectorMonthData.value.reduce((a,b)=>a+(b.value||0),0);
   });
+
+  // 巡检人统计（三合一：总/月/日）保持不变
 }
 
 function handleQuery() {
@@ -130,12 +143,24 @@ function handleQuery() {
 }
 
 function resetQuery() {
-  daterangeOccurTime.value = [];
   proxy.resetForm("queryRef");
   handleQuery();
 }
 
+
 getList();
+
+// 时间格式工具（yyyy-MM-dd HH:mm:ss）
+function pad(n){ return n < 10 ? '0'+n : ''+n }
+function formatDateTime(d){
+  const y = d.getFullYear();
+  const m = pad(d.getMonth()+1);
+  const day = pad(d.getDate());
+  const hh = pad(d.getHours());
+  const mm = pad(d.getMinutes());
+  const ss = pad(d.getSeconds());
+  return `${y}-${m}-${day} ${hh}:${mm}:${ss}`;
+}
 </script>
 
 <style lang="scss" scoped>
@@ -143,24 +168,6 @@ getList();
   margin-bottom: 20px;
   margin-top: 50px;
 }
-.box1 {
-  background-color: rgb(187, 187, 187);
-  width: 200px;
-  height: 100px;
-  .p1 {
-    display: inline-block;
-    color: #fff;
-    font-weight: 900;
-    font-size: larger;
-    margin-bottom: auto;
-    margin-top: 20px;
-    margin-left: 30%;
-  }
-  .p2 {
-    text-align: center;
-    color: #fff;
-    margin: auto;
-    font-size: 22px;
-  }
-}
+.section-card { padding: 8px 12px; }
+.section-title { font-weight: 600; margin-bottom: 8px; }
 </style>
\ No newline at end of file
diff --git a/src/views/login.vue b/src/views/login.vue
index 7a4c200..580fc16 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,73 +2,71 @@
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">平安水电后台管理系统</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          size="large"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          size="large"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          size="large"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+
+      <!-- CAS登录模式 -->
+      <div v-if="settings.casEnable" class="cas-login-container">
+        <div class="cas-login-info">
+          <el-icon class="info-icon">
+            <InfoFilled />
+          </el-icon>
+          <p>请使用学校统一身份认证系统登录</p>
         </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="large"
-          type="primary"
-          style="width:100%;"
-          @click.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
+        <el-button :loading="loading" size="large" type="primary" style="width:100%; margin-top: 20px;"
+          @click="handleCasLogin">
+          <span v-if="!loading">学校统一登录</span>
+          <span v-else>跳转中...</span>
         </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
+      </div>
+
+      <!-- 传统登录模式 -->
+      <div v-else>
+        <el-form-item prop="username">
+          <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
+            <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="密码"
+            @keyup.enter="handleLogin">
+            <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="code" v-if="captchaEnabled">
+          <el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="验证码" style="width: 63%"
+            @keyup.enter="handleLogin">
+            <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
+          </el-input>
+          <div class="login-code">
+            <img :src="codeUrl" @click="getCode" class="login-code-img" />
+          </div>
+        </el-form-item>
+        <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+        <el-form-item style="width:100%;">
+          <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
+            <span v-if="!loading">登 录</span>
+            <span v-else>登 录 中...</span>
+          </el-button>
+          <div style="float: right;" v-if="register">
+            <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          </div>
+        </el-form-item>
+      </div>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
+      <span></span>
     </div>
   </div>
 </template>
 
 <script setup>
 import { getCodeImg } from "@/api/login";
+import settings from "@/settings";
+import useUserStore from '@/store/modules/user';
+import { decrypt, encrypt } from "@/utils/jsencrypt";
+import { InfoFilled } from '@element-plus/icons-vue';
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from "@/utils/jsencrypt";
-import useUserStore from '@/store/modules/user'
+import { onMounted } from 'vue';
 
 const userStore = useUserStore()
 const route = useRoute();
@@ -78,7 +76,7 @@ const { proxy } = getCurrentInstance();
 const loginForm = ref({
   // username: "admin",
   // password: "admin123",
-    username: null,
+  username: null,
   password: null,
   rememberMe: false,
   code: "",
@@ -102,7 +100,7 @@ const redirect = ref(undefined);
 
 
 watch(route, (newRoute) => {
-    redirect.value = newRoute.query && newRoute.query.redirect;
+  redirect.value = newRoute.query && newRoute.query.redirect;
 }, { immediate: true });
 
 function handleLogin() {
@@ -162,8 +160,36 @@ function getCookie() {
   };
 }
 
-getCode();
-getCookie();
+// CAS登录处理函数
+function handleCasLogin() {
+  loading.value = true;
+  // 构建CAS登录URL(带 base 前缀以兼容不同部署路径)
+  // 使用统一的CAS回调地址,让后端处理设备检测和分发
+  const casServerUrl = settings.casServerUrl || 'https://cas.example.edu';
+  const base = import.meta.env?.BASE_URL || '/';
+  const serviceUrl = encodeURIComponent(window.location.origin + base + 'cas-callback');
+  const casLoginUrl = `${casServerUrl}/login?service=${serviceUrl}`;
+
+  // 跳转到CAS登录页面
+  window.location.href = casLoginUrl;
+}
+
+// 页面加载时检查CAS配置,如果启用则自动跳转
+onMounted(() => {
+  const path = (window.location && window.location.pathname) || '';
+  if (settings.casEnable && path.startsWith('/cas/')) {
+    handleCasLogin();
+  } else {
+    getCode();
+    getCookie();
+  }
+});
+
+// 非 CAS 页面或非 CAS 模式下初始化验证码与 cookie
+if (!(settings.casEnable && (typeof window !== 'undefined' && window.location && window.location.pathname.startsWith('/cas/')))) {
+  getCode();
+  getCookie();
+}
 </script>
 
 <style lang='scss' scoped>
@@ -175,6 +201,7 @@ getCookie();
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
@@ -186,32 +213,39 @@ getCookie();
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+
   .el-input {
     height: 40px;
+
     input {
       height: 40px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 0px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
   height: 40px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -224,8 +258,38 @@ getCookie();
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 40px;
   padding-left: 12px;
 }
+
+// CAS登录相关样式
+.cas-login-container {
+  text-align: center;
+  padding: 20px 0;
+
+  .cas-login-info {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 20px;
+    padding: 15px;
+    background-color: #f0f9ff;
+    border: 1px solid #bfdbfe;
+    border-radius: 6px;
+
+    .info-icon {
+      color: #3b82f6;
+      margin-right: 8px;
+      font-size: 16px;
+    }
+
+    p {
+      margin: 0;
+      color: #1e40af;
+      font-size: 14px;
+    }
+  }
+}
 </style>
diff --git a/src/views/register.vue b/src/views/register.vue
index 7bb3812..dcae782 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -70,7 +70,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
+      <span></span>
     </div>
   </div>
 </template>
diff --git a/vite.config.js b/vite.config.js
index 3441c9e..ec3666d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,11 +5,13 @@ import createVitePlugins from './vite/plugins'
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {
   const env = loadEnv(mode, process.cwd())
-  const { VITE_APP_ENV } = env
+  const { VITE_APP_ENV, VITE_APP_CAS_ENABLE } = env
 
   return {
     // 部署生产环境和开发环境下的URL.
-    base: VITE_APP_ENV === 'production' ? '/' : '/',
+    // 根据 .env 中的 CAS 开关动态设置 base 路径
+    // 注意:不要从 src/settings 引入,因为 vite 配置运行在 Node 环境,无法使用 import.meta.env
+    base: VITE_APP_ENV === 'production' ? ((VITE_APP_CAS_ENABLE === 'true') ? '/cas/' : '/srs/') : '/',
     plugins: createVitePlugins(env, command === 'build'),
     resolve: {
       // https://cn.vitejs.dev/config/#resolve-alias
@@ -26,8 +28,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-            target: 'http://localhost:8080', // 测试
-          // target: 'http://172.16.129.101:8080', // 正式环境
+          // target: 'http://localhost:8080', // 测试
+          target: 'http://172.16.129.101:8080', // 正式环境
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },
diff --git a/vite.config.js.timestamp-1760689999596-49762782f98ed.mjs b/vite.config.js.timestamp-1760689999596-49762782f98ed.mjs
new file mode 100644
index 0000000..b6ee6a1
--- /dev/null
+++ b/vite.config.js.timestamp-1760689999596-49762782f98ed.mjs
@@ -0,0 +1,202 @@
+// vite.config.js
+import path2 from "path";
+import { defineConfig, loadEnv } from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/vite/dist/node/index.js";
+
+// src/settings.js
+var settings_default = {
+  /**
+   * 网页标题
+   */
+  title: import.meta.env?.VITE_APP_TITLE || "\u5E73\u5B89\u6C34\u7535",
+  /**
+   * 侧边栏主题 深色主题theme-dark,浅色主题theme-light
+   */
+  sideTheme: "theme-dark",
+  /**
+   * 是否系统布局配置
+   */
+  showSettings: true,
+  /**
+   * 是否显示顶部导航
+   */
+  topNav: false,
+  /**
+   * 是否显示 tagsView
+   */
+  tagsView: true,
+  /**
+   * 是否固定头部
+   */
+  fixedHeader: false,
+  /**
+   * 是否显示logo
+   */
+  sidebarLogo: true,
+  /**
+   * 是否显示动态标题
+   */
+  dynamicTitle: false,
+  /**
+   * @type {string | array} 'production' | ['production', 'development']
+   * @description Need show err logs component.
+   * The default is only used in the production env
+   * If you want to also use it in dev, you can pass ['production', 'development']
+   */
+  errorLog: "production",
+  /**
+   * CAS登录配置
+   */
+  // 是否启用CAS登录 (true: CAS登录模式, false: 传统登录模式)
+  casEnable: true,
+  // CAS服务器地址
+  casServerUrl: "https://rsso.gxsdxy.cn",
+  // 部署路径配置 (CAS模式: /cas/, 传统模式: /srs/)
+  deployPath: function() {
+    return this.casEnable ? "/cas/" : "/srs/";
+  }
+};
+
+// vite/plugins/index.js
+import vue from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/auto-import.js
+import autoImport from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/unplugin-auto-import/dist/vite.js";
+function createAutoImport() {
+  return autoImport({
+    imports: [
+      "vue",
+      "vue-router",
+      "pinia"
+    ],
+    dts: false
+  });
+}
+
+// vite/plugins/svg-icon.js
+import { createSvgIconsPlugin } from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import path from "path";
+function createSvgIcon(isBuild) {
+  return createSvgIconsPlugin({
+    iconDirs: [path.resolve(process.cwd(), "src/assets/icons/svg")],
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
+}
+
+// vite/plugins/compression.js
+import compression from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/vite-plugin-compression/dist/index.mjs";
+function createCompression(env) {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugin = [];
+  if (VITE_BUILD_COMPRESS) {
+    const compressList = VITE_BUILD_COMPRESS.split(",");
+    if (compressList.includes("gzip")) {
+      plugin.push(
+        compression({
+          ext: ".gz",
+          deleteOriginFile: false
+        })
+      );
+    }
+    if (compressList.includes("brotli")) {
+      plugin.push(
+        compression({
+          ext: ".br",
+          algorithm: "brotliCompress",
+          deleteOriginFile: false
+        })
+      );
+    }
+  }
+  return plugin;
+}
+
+// vite/plugins/setup-extend.js
+import setupExtend from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
+function createSetupExtend() {
+  return setupExtend({});
+}
+
+// vite/plugins/index.js
+function createVitePlugins(viteEnv, isBuild = false) {
+  const vitePlugins = [vue()];
+  vitePlugins.push(createAutoImport());
+  vitePlugins.push(createSetupExtend());
+  vitePlugins.push(createSvgIcon(isBuild));
+  isBuild && vitePlugins.push(...createCompression(viteEnv));
+  return vitePlugins;
+}
+
+// vite.config.js
+var __vite_injected_original_dirname = "D:\\code\\pasd_V1.0\\pasd_pc";
+var vite_config_default = defineConfig(({ mode, command }) => {
+  const env = loadEnv(mode, process.cwd());
+  const { VITE_APP_ENV } = env;
+  return {
+    // 部署生产环境和开发环境下的URL.
+    // 根据CAS配置动态设置base路径
+    base: env.VITE_APP_ENV === "production" ? settings_default.deployPath() : "/",
+    plugins: createVitePlugins(env, command === "build"),
+    resolve: {
+      // https://cn.vitejs.dev/config/#resolve-alias
+      alias: {
+        "~": path2.resolve(__vite_injected_original_dirname, "./"),
+        "@": path2.resolve(__vite_injected_original_dirname, "./src")
+      },
+      // https://cn.vitejs.dev/config/#resolve-extensions
+      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"]
+    },
+    server: {
+      host: true,
+      open: true,
+      proxy: {
+        // https://cn.vitejs.dev/config/#server-proxy
+        "/dev-api": {
+          target: "http://localhost:8080",
+          // 测试
+          // target: 'http://172.16.129.101:8080', // 正式环境
+          changeOrigin: true,
+          rewrite: (p) => p.replace(/^\/dev-api/, "")
+        },
+        // 添加对第三方 API 的代理配置
+        "/api/v1/jssdk/upload": {
+          target: "https://px.effirst.com",
+          changeOrigin: true,
+          rewrite: (p) => p.replace(/^\/api\/v1\/jssdk\/upload/, "/api/v1/jssdk/upload")
+        }
+      }
+    },
+    // fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+    css: {
+      postcss: {
+        plugins: [
+          {
+            postcssPlugin: "internal:charset-removal",
+            AtRule: {
+              charset: (atRule) => {
+                if (atRule.name === "charset") {
+                  atRule.remove();
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    build: {
+      target: "es2015",
+      // 指定编译目标
+      minify: "terser",
+      terserOptions: {
+        compress: {
+          drop_console: true,
+          drop_debugger: true
+        }
+      }
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.js", "src/settings.js", "vite/plugins/index.js", "vite/plugins/auto-import.js", "vite/plugins/svg-icon.js", "vite/plugins/compression.js", "vite/plugins/setup-extend.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite.config.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite.config.js\";import path from 'path'\r\nimport { defineConfig, loadEnv } from 'vite'\r\nimport settings from './src/settings'\r\nimport createVitePlugins from './vite/plugins'\r\n\r\n// https://vitejs.dev/config/\r\nexport default defineConfig(({ mode, command }) => {\r\n  const env = loadEnv(mode, process.cwd())\r\n  const { VITE_APP_ENV } = env\r\n\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL.\r\n    // \u6839\u636ECAS\u914D\u7F6E\u52A8\u6001\u8BBE\u7F6Ebase\u8DEF\u5F84\r\n    base: env.VITE_APP_ENV === 'production' ? settings.deployPath() : '/',\r\n    plugins: createVitePlugins(env, command === 'build'),\r\n    resolve: {\r\n      // https://cn.vitejs.dev/config/#resolve-alias\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      // https://cn.vitejs.dev/config/#resolve-extensions\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']\r\n    },\r\n    server: {\r\n      host: true,\r\n      open: true,\r\n      proxy: {\r\n        // https://cn.vitejs.dev/config/#server-proxy\r\n        '/dev-api': {\r\n            target: 'http://localhost:8080', // \u6D4B\u8BD5\r\n          // target: 'http://172.16.129.101:8080', // \u6B63\u5F0F\u73AF\u5883\r\n          changeOrigin: true,\r\n          rewrite: (p) => p.replace(/^\\/dev-api/, '')\r\n        },\r\n        // \u6DFB\u52A0\u5BF9\u7B2C\u4E09\u65B9 API \u7684\u4EE3\u7406\u914D\u7F6E\r\n        '/api/v1/jssdk/upload': {\r\n          target: 'https://px.effirst.com',\r\n          changeOrigin: true,\r\n          rewrite: (p) => p.replace(/^\\/api\\/v1\\/jssdk\\/upload/, '/api/v1/jssdk/upload')\r\n        }\r\n      }\r\n    },\r\n    // fix:error:stdin>:7356:1: warning: \"@charset\" must be the first rule in the file\r\n    css: {\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    build: {\r\n      target: 'es2015', // \u6307\u5B9A\u7F16\u8BD1\u76EE\u6807\r\n      minify: 'terser',\r\n      terserOptions: {\r\n        compress: {\r\n          drop_console: true,\r\n          drop_debugger: true,\r\n        }\r\n      }\r\n    }\r\n  }\r\n})", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\src\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\src\\\\settings.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/src/settings.js\";export default {\r\n  /**\r\n   * \u7F51\u9875\u6807\u9898\r\n   */\r\n  title: import.meta.env?.VITE_APP_TITLE || '\u5E73\u5B89\u6C34\u7535',\r\n  /**\r\n   * \u4FA7\u8FB9\u680F\u4E3B\u9898 \u6DF1\u8272\u4E3B\u9898theme-dark,\u6D45\u8272\u4E3B\u9898theme-light\r\n   */\r\n  sideTheme: 'theme-dark',\r\n  /**\r\n   * \u662F\u5426\u7CFB\u7EDF\u5E03\u5C40\u914D\u7F6E\r\n   */\r\n  showSettings: true,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793A\u9876\u90E8\u5BFC\u822A\r\n   */\r\n  topNav: false,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793A tagsView\r\n   */\r\n  tagsView: true,\r\n\r\n  /**\r\n   * \u662F\u5426\u56FA\u5B9A\u5934\u90E8\r\n   */\r\n  fixedHeader: false,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793Alogo\r\n   */\r\n  sidebarLogo: true,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793A\u52A8\u6001\u6807\u9898\r\n   */\r\n  dynamicTitle: false,\r\n\r\n  /**\r\n   * @type {string | array} 'production' | ['production', 'development']\r\n   * @description Need show err logs component.\r\n   * The default is only used in the production env\r\n   * If you want to also use it in dev, you can pass ['production', 'development']\r\n   */\r\n  errorLog: 'production',\r\n\r\n  /**\r\n   * CAS\u767B\u5F55\u914D\u7F6E\r\n   */\r\n  // \u662F\u5426\u542F\u7528CAS\u767B\u5F55 (true: CAS\u767B\u5F55\u6A21\u5F0F, false: \u4F20\u7EDF\u767B\u5F55\u6A21\u5F0F)\r\n  casEnable: true,\r\n  \r\n  // CAS\u670D\u52A1\u5668\u5730\u5740\r\n  casServerUrl: 'https://rsso.gxsdxy.cn',\r\n  \r\n  // \u90E8\u7F72\u8DEF\u5F84\u914D\u7F6E (CAS\u6A21\u5F0F: /cas/, \u4F20\u7EDF\u6A21\u5F0F: /srs/)\r\n  deployPath: function() {\r\n    return this.casEnable ? '/cas/' : '/srs/';\r\n  }\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\index.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/index.js\";import vue from '@vitejs/plugin-vue'\r\n\r\nimport createAutoImport from './auto-import'\r\nimport createSvgIcon from './svg-icon'\r\nimport createCompression from './compression'\r\nimport createSetupExtend from './setup-extend'\r\n\r\nexport default function createVitePlugins(viteEnv, isBuild = false) {\r\n    const vitePlugins = [vue()]\r\n    vitePlugins.push(createAutoImport())\r\n\tvitePlugins.push(createSetupExtend())\r\n    vitePlugins.push(createSvgIcon(isBuild))\r\n\tisBuild && vitePlugins.push(...createCompression(viteEnv))\r\n    return vitePlugins\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\auto-import.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/auto-import.js\";import autoImport from 'unplugin-auto-import/vite'\r\n\r\nexport default function createAutoImport() {\r\n    return autoImport({\r\n        imports: [\r\n            'vue',\r\n            'vue-router',\r\n            'pinia'\r\n        ],\r\n        dts: false\r\n    })\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\svg-icon.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/svg-icon.js\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'\r\nimport path from 'path'\r\n\r\nexport default function createSvgIcon(isBuild) {\r\n    return createSvgIconsPlugin({\r\n\t\ticonDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],\r\n        symbolId: 'icon-[dir]-[name]',\r\n        svgoOptions: isBuild\r\n    })\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\compression.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/compression.js\";import compression from 'vite-plugin-compression'\r\n\r\nexport default function createCompression(env) {\r\n    const { VITE_BUILD_COMPRESS } = env\r\n    const plugin = []\r\n    if (VITE_BUILD_COMPRESS) {\r\n        const compressList = VITE_BUILD_COMPRESS.split(',')\r\n        if (compressList.includes('gzip')) {\r\n            // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n            plugin.push(\r\n                compression({\r\n                    ext: '.gz',\r\n                    deleteOriginFile: false\r\n                })\r\n            )\r\n        }\r\n        if (compressList.includes('brotli')) {\r\n            plugin.push(\r\n                compression({\r\n                    ext: '.br',\r\n                    algorithm: 'brotliCompress',\r\n                    deleteOriginFile: false\r\n                })\r\n            )\r\n        }\r\n    }\r\n    return plugin\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\setup-extend.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/setup-extend.js\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite'\r\n\r\nexport default function createSetupExtend() {\r\n    return setupExtend({})\r\n}\r\n"],
  "mappings": ";AAAqQ,OAAOA,WAAU;AACtR,SAAS,cAAc,eAAe;;;ACDuO,IAAO,mBAAQ;AAAA;AAAA;AAAA;AAAA,EAI1R,OAAO,YAAY,KAAK,kBAAkB;AAAA;AAAA;AAAA;AAAA,EAI1C,WAAW;AAAA;AAAA;AAAA;AAAA,EAIX,cAAc;AAAA;AAAA;AAAA;AAAA,EAKd,QAAQ;AAAA;AAAA;AAAA;AAAA,EAKR,UAAU;AAAA;AAAA;AAAA;AAAA,EAKV,aAAa;AAAA;AAAA;AAAA;AAAA,EAKb,aAAa;AAAA;AAAA;AAAA;AAAA,EAKb,cAAc;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQd,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA,EAMV,WAAW;AAAA;AAAA,EAGX,cAAc;AAAA;AAAA,EAGd,YAAY,WAAW;AACrB,WAAO,KAAK,YAAY,UAAU;AAAA,EACpC;AACF;;;AC5DoS,OAAO,SAAS;;;ACAJ,OAAO,gBAAgB;AAExT,SAAR,mBAAoC;AACvC,SAAO,WAAW;AAAA,IACd,SAAS;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,IACA,KAAK;AAAA,EACT,CAAC;AACL;;;ACX0S,SAAS,4BAA4B;AAC/U,OAAO,UAAU;AAEF,SAAR,cAA+B,SAAS;AAC3C,SAAO,qBAAqB;AAAA,IAC9B,UAAU,CAAC,KAAK,QAAQ,QAAQ,IAAI,GAAG,sBAAsB,CAAC;AAAA,IACxD,UAAU;AAAA,IACV,aAAa;AAAA,EACjB,CAAC;AACL;;;ACTgT,OAAO,iBAAiB;AAEzT,SAAR,kBAAmC,KAAK;AAC3C,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAS,CAAC;AAChB,MAAI,qBAAqB;AACrB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AAE/B,aAAO;AAAA,QACH,YAAY;AAAA,UACR,KAAK;AAAA,UACL,kBAAkB;AAAA,QACtB,CAAC;AAAA,MACL;AAAA,IACJ;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACjC,aAAO;AAAA,QACH,YAAY;AAAA,UACR,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACtB,CAAC;AAAA,MACL;AAAA,IACJ;AAAA,EACJ;AACA,SAAO;AACX;;;AC3BkT,OAAO,iBAAiB;AAE3T,SAAR,oBAAqC;AACxC,SAAO,YAAY,CAAC,CAAC;AACzB;;;AJGe,SAAR,kBAAmC,SAAS,UAAU,OAAO;AAChE,QAAM,cAAc,CAAC,IAAI,CAAC;AAC1B,cAAY,KAAK,iBAAiB,CAAC;AACtC,cAAY,KAAK,kBAAkB,CAAC;AACjC,cAAY,KAAK,cAAc,OAAO,CAAC;AAC1C,aAAW,YAAY,KAAK,GAAG,kBAAkB,OAAO,CAAC;AACtD,SAAO;AACX;;;AFdA,IAAM,mCAAmC;AAMzC,IAAO,sBAAQ,aAAa,CAAC,EAAE,MAAM,QAAQ,MAAM;AACjD,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,QAAM,EAAE,aAAa,IAAI;AAEzB,SAAO;AAAA;AAAA;AAAA,IAGL,MAAM,IAAI,iBAAiB,eAAe,iBAAS,WAAW,IAAI;AAAA,IAClE,SAAS,kBAAkB,KAAK,YAAY,OAAO;AAAA,IACnD,SAAS;AAAA;AAAA,MAEP,OAAO;AAAA,QACL,KAAKC,MAAK,QAAQ,kCAAW,IAAI;AAAA,QACjC,KAAKA,MAAK,QAAQ,kCAAW,OAAO;AAAA,MACtC;AAAA;AAAA,MAEA,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,SAAS,MAAM;AAAA,IACpE;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,YAAY;AAAA,UACR,QAAQ;AAAA;AAAA;AAAA,UAEV,cAAc;AAAA,UACd,SAAS,CAAC,MAAM,EAAE,QAAQ,cAAc,EAAE;AAAA,QAC5C;AAAA;AAAA,QAEA,wBAAwB;AAAA,UACtB,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,SAAS,CAAC,MAAM,EAAE,QAAQ,6BAA6B,sBAAsB;AAAA,QAC/E;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,KAAK;AAAA,MACH,SAAS;AAAA,QACP,SAAS;AAAA,UACP;AAAA,YACE,eAAe;AAAA,YACf,QAAQ;AAAA,cACN,SAAS,CAAC,WAAW;AACnB,oBAAI,OAAO,SAAS,WAAW;AAC7B,yBAAO,OAAO;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,IACA,OAAO;AAAA,MACL,QAAQ;AAAA;AAAA,MACR,QAAQ;AAAA,MACR,eAAe;AAAA,QACb,UAAU;AAAA,UACR,cAAc;AAAA,UACd,eAAe;AAAA,QACjB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path", "path"]
}

diff --git a/vite.config.js.timestamp-1761642518249-ed073713ec89a.mjs b/vite.config.js.timestamp-1761642518249-ed073713ec89a.mjs
new file mode 100644
index 0000000..3967132
--- /dev/null
+++ b/vite.config.js.timestamp-1761642518249-ed073713ec89a.mjs
@@ -0,0 +1,204 @@
+// vite.config.js
+import path2 from "path";
+import { defineConfig, loadEnv } from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/vite/dist/node/index.js";
+
+// src/settings.js
+var settings_default = {
+  /**
+   * 网页标题
+   */
+  title: import.meta.env?.VITE_APP_TITLE || "\u5E73\u5B89\u6C34\u7535",
+  /**
+   * 侧边栏主题 深色主题theme-dark,浅色主题theme-light
+   */
+  sideTheme: "theme-dark",
+  /**
+   * 是否系统布局配置
+   */
+  showSettings: true,
+  /**
+   * 是否显示顶部导航
+   */
+  topNav: false,
+  /**
+   * 是否显示 tagsView
+   */
+  tagsView: true,
+  /**
+   * 是否固定头部
+   */
+  fixedHeader: false,
+  /**
+   * 是否显示logo
+   */
+  sidebarLogo: true,
+  /**
+   * 是否显示动态标题
+   */
+  dynamicTitle: false,
+  /**
+   * @type {string | array} 'production' | ['production', 'development']
+   * @description Need show err logs component.
+   * The default is only used in the production env
+   * If you want to also use it in dev, you can pass ['production', 'development']
+   */
+  errorLog: "production",
+  /**
+   * CAS登录配置
+   */
+  // 是否启用CAS登录 (true: CAS登录模式, false: 传统登录模式)
+  casEnable: (import.meta.env?.VITE_APP_CAS_ENABLE || "false") === "true",
+  // CAS服务器地址
+  casServerUrl: import.meta.env?.VITE_APP_CAS_SERVER_URL || "https://rsso.gxsdxy.cn",
+  // CAS票据验证地址（CAS3默认 p3）
+  casValidateUrl: import.meta.env?.VITE_APP_CAS_VALIDATE_URL || "https://rsso.gxsdxy.cn/p3/serviceValidate",
+  // 部署路径配置 (CAS模式: /cas/, 传统模式: /srs/)
+  deployPath: function() {
+    return this.casEnable ? "/cas/" : "/srs/";
+  }
+};
+
+// vite/plugins/index.js
+import vue from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/auto-import.js
+import autoImport from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/unplugin-auto-import/dist/vite.js";
+function createAutoImport() {
+  return autoImport({
+    imports: [
+      "vue",
+      "vue-router",
+      "pinia"
+    ],
+    dts: false
+  });
+}
+
+// vite/plugins/svg-icon.js
+import { createSvgIconsPlugin } from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import path from "path";
+function createSvgIcon(isBuild) {
+  return createSvgIconsPlugin({
+    iconDirs: [path.resolve(process.cwd(), "src/assets/icons/svg")],
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
+}
+
+// vite/plugins/compression.js
+import compression from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/vite-plugin-compression/dist/index.mjs";
+function createCompression(env) {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugin = [];
+  if (VITE_BUILD_COMPRESS) {
+    const compressList = VITE_BUILD_COMPRESS.split(",");
+    if (compressList.includes("gzip")) {
+      plugin.push(
+        compression({
+          ext: ".gz",
+          deleteOriginFile: false
+        })
+      );
+    }
+    if (compressList.includes("brotli")) {
+      plugin.push(
+        compression({
+          ext: ".br",
+          algorithm: "brotliCompress",
+          deleteOriginFile: false
+        })
+      );
+    }
+  }
+  return plugin;
+}
+
+// vite/plugins/setup-extend.js
+import setupExtend from "file:///D:/code/pasd_V1.0/pasd_pc/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
+function createSetupExtend() {
+  return setupExtend({});
+}
+
+// vite/plugins/index.js
+function createVitePlugins(viteEnv, isBuild = false) {
+  const vitePlugins = [vue()];
+  vitePlugins.push(createAutoImport());
+  vitePlugins.push(createSetupExtend());
+  vitePlugins.push(createSvgIcon(isBuild));
+  isBuild && vitePlugins.push(...createCompression(viteEnv));
+  return vitePlugins;
+}
+
+// vite.config.js
+var __vite_injected_original_dirname = "D:\\code\\pasd_V1.0\\pasd_pc";
+var vite_config_default = defineConfig(({ mode, command }) => {
+  const env = loadEnv(mode, process.cwd());
+  const { VITE_APP_ENV } = env;
+  return {
+    // 部署生产环境和开发环境下的URL.
+    // 根据CAS配置动态设置base路径
+    base: env.VITE_APP_ENV === "production" ? settings_default.deployPath() : "/",
+    plugins: createVitePlugins(env, command === "build"),
+    resolve: {
+      // https://cn.vitejs.dev/config/#resolve-alias
+      alias: {
+        "~": path2.resolve(__vite_injected_original_dirname, "./"),
+        "@": path2.resolve(__vite_injected_original_dirname, "./src")
+      },
+      // https://cn.vitejs.dev/config/#resolve-extensions
+      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"]
+    },
+    server: {
+      host: true,
+      open: true,
+      proxy: {
+        // https://cn.vitejs.dev/config/#server-proxy
+        "/dev-api": {
+          // target: 'http://localhost:8080', // 测试
+          target: "http://172.16.129.101:8080",
+          // 正式环境
+          changeOrigin: true,
+          rewrite: (p) => p.replace(/^\/dev-api/, "")
+        },
+        // 添加对第三方 API 的代理配置
+        "/api/v1/jssdk/upload": {
+          target: "https://px.effirst.com",
+          changeOrigin: true,
+          rewrite: (p) => p.replace(/^\/api\/v1\/jssdk\/upload/, "/api/v1/jssdk/upload")
+        }
+      }
+    },
+    // fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+    css: {
+      postcss: {
+        plugins: [
+          {
+            postcssPlugin: "internal:charset-removal",
+            AtRule: {
+              charset: (atRule) => {
+                if (atRule.name === "charset") {
+                  atRule.remove();
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    build: {
+      target: "es2015",
+      // 指定编译目标
+      minify: "terser",
+      terserOptions: {
+        compress: {
+          drop_console: true,
+          drop_debugger: true
+        }
+      }
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.js", "src/settings.js", "vite/plugins/index.js", "vite/plugins/auto-import.js", "vite/plugins/svg-icon.js", "vite/plugins/compression.js", "vite/plugins/setup-extend.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite.config.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite.config.js\";import path from 'path'\r\nimport { defineConfig, loadEnv } from 'vite'\r\nimport settings from './src/settings'\r\nimport createVitePlugins from './vite/plugins'\r\n\r\n// https://vitejs.dev/config/\r\nexport default defineConfig(({ mode, command }) => {\r\n  const env = loadEnv(mode, process.cwd())\r\n  const { VITE_APP_ENV } = env\r\n\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL.\r\n    // \u6839\u636ECAS\u914D\u7F6E\u52A8\u6001\u8BBE\u7F6Ebase\u8DEF\u5F84\r\n    base: env.VITE_APP_ENV === 'production' ? settings.deployPath() : '/',\r\n    plugins: createVitePlugins(env, command === 'build'),\r\n    resolve: {\r\n      // https://cn.vitejs.dev/config/#resolve-alias\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      // https://cn.vitejs.dev/config/#resolve-extensions\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']\r\n    },\r\n    server: {\r\n      host: true,\r\n      open: true,\r\n      proxy: {\r\n        // https://cn.vitejs.dev/config/#server-proxy\r\n        '/dev-api': {\r\n            // target: 'http://localhost:8080', // \u6D4B\u8BD5\r\n          target: 'http://172.16.129.101:8080', // \u6B63\u5F0F\u73AF\u5883\r\n          changeOrigin: true,\r\n          rewrite: (p) => p.replace(/^\\/dev-api/, '')\r\n        },\r\n        // \u6DFB\u52A0\u5BF9\u7B2C\u4E09\u65B9 API \u7684\u4EE3\u7406\u914D\u7F6E\r\n        '/api/v1/jssdk/upload': {\r\n          target: 'https://px.effirst.com',\r\n          changeOrigin: true,\r\n          rewrite: (p) => p.replace(/^\\/api\\/v1\\/jssdk\\/upload/, '/api/v1/jssdk/upload')\r\n        }\r\n      }\r\n    },\r\n    // fix:error:stdin>:7356:1: warning: \"@charset\" must be the first rule in the file\r\n    css: {\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    build: {\r\n      target: 'es2015', // \u6307\u5B9A\u7F16\u8BD1\u76EE\u6807\r\n      minify: 'terser',\r\n      terserOptions: {\r\n        compress: {\r\n          drop_console: true,\r\n          drop_debugger: true,\r\n        }\r\n      }\r\n    }\r\n  }\r\n})", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\src\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\src\\\\settings.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/src/settings.js\";export default {\r\n  /**\r\n   * \u7F51\u9875\u6807\u9898\r\n   */\r\n  title: import.meta.env?.VITE_APP_TITLE || '\u5E73\u5B89\u6C34\u7535',\r\n  /**\r\n   * \u4FA7\u8FB9\u680F\u4E3B\u9898 \u6DF1\u8272\u4E3B\u9898theme-dark,\u6D45\u8272\u4E3B\u9898theme-light\r\n   */\r\n  sideTheme: 'theme-dark',\r\n  /**\r\n   * \u662F\u5426\u7CFB\u7EDF\u5E03\u5C40\u914D\u7F6E\r\n   */\r\n  showSettings: true,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793A\u9876\u90E8\u5BFC\u822A\r\n   */\r\n  topNav: false,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793A tagsView\r\n   */\r\n  tagsView: true,\r\n\r\n  /**\r\n   * \u662F\u5426\u56FA\u5B9A\u5934\u90E8\r\n   */\r\n  fixedHeader: false,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793Alogo\r\n   */\r\n  sidebarLogo: true,\r\n\r\n  /**\r\n   * \u662F\u5426\u663E\u793A\u52A8\u6001\u6807\u9898\r\n   */\r\n  dynamicTitle: false,\r\n\r\n  /**\r\n   * @type {string | array} 'production' | ['production', 'development']\r\n   * @description Need show err logs component.\r\n   * The default is only used in the production env\r\n   * If you want to also use it in dev, you can pass ['production', 'development']\r\n   */\r\n  errorLog: 'production',\r\n\r\n  /**\r\n   * CAS\u767B\u5F55\u914D\u7F6E\r\n   */\r\n  // \u662F\u5426\u542F\u7528CAS\u767B\u5F55 (true: CAS\u767B\u5F55\u6A21\u5F0F, false: \u4F20\u7EDF\u767B\u5F55\u6A21\u5F0F)\r\n  casEnable: (import.meta.env?.VITE_APP_CAS_ENABLE || 'false') === 'true',\r\n  \r\n  // CAS\u670D\u52A1\u5668\u5730\u5740\r\n  casServerUrl: import.meta.env?.VITE_APP_CAS_SERVER_URL || 'https://rsso.gxsdxy.cn',\r\n\r\n  // CAS\u7968\u636E\u9A8C\u8BC1\u5730\u5740\uFF08CAS3\u9ED8\u8BA4 p3\uFF09\r\n  casValidateUrl: import.meta.env?.VITE_APP_CAS_VALIDATE_URL || 'https://rsso.gxsdxy.cn/p3/serviceValidate',\r\n  \r\n  // \u90E8\u7F72\u8DEF\u5F84\u914D\u7F6E (CAS\u6A21\u5F0F: /cas/, \u4F20\u7EDF\u6A21\u5F0F: /srs/)\r\n  deployPath: function() {\r\n    return this.casEnable ? '/cas/' : '/srs/'\r\n  }\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\index.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/index.js\";import vue from '@vitejs/plugin-vue'\r\n\r\nimport createAutoImport from './auto-import'\r\nimport createSvgIcon from './svg-icon'\r\nimport createCompression from './compression'\r\nimport createSetupExtend from './setup-extend'\r\n\r\nexport default function createVitePlugins(viteEnv, isBuild = false) {\r\n    const vitePlugins = [vue()]\r\n    vitePlugins.push(createAutoImport())\r\n\tvitePlugins.push(createSetupExtend())\r\n    vitePlugins.push(createSvgIcon(isBuild))\r\n\tisBuild && vitePlugins.push(...createCompression(viteEnv))\r\n    return vitePlugins\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\auto-import.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/auto-import.js\";import autoImport from 'unplugin-auto-import/vite'\r\n\r\nexport default function createAutoImport() {\r\n    return autoImport({\r\n        imports: [\r\n            'vue',\r\n            'vue-router',\r\n            'pinia'\r\n        ],\r\n        dts: false\r\n    })\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\svg-icon.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/svg-icon.js\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'\r\nimport path from 'path'\r\n\r\nexport default function createSvgIcon(isBuild) {\r\n    return createSvgIconsPlugin({\r\n\t\ticonDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],\r\n        symbolId: 'icon-[dir]-[name]',\r\n        svgoOptions: isBuild\r\n    })\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\compression.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/compression.js\";import compression from 'vite-plugin-compression'\r\n\r\nexport default function createCompression(env) {\r\n    const { VITE_BUILD_COMPRESS } = env\r\n    const plugin = []\r\n    if (VITE_BUILD_COMPRESS) {\r\n        const compressList = VITE_BUILD_COMPRESS.split(',')\r\n        if (compressList.includes('gzip')) {\r\n            // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n            plugin.push(\r\n                compression({\r\n                    ext: '.gz',\r\n                    deleteOriginFile: false\r\n                })\r\n            )\r\n        }\r\n        if (compressList.includes('brotli')) {\r\n            plugin.push(\r\n                compression({\r\n                    ext: '.br',\r\n                    algorithm: 'brotliCompress',\r\n                    deleteOriginFile: false\r\n                })\r\n            )\r\n        }\r\n    }\r\n    return plugin\r\n}\r\n", "const __vite_injected_original_dirname = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\code\\\\pasd_V1.0\\\\pasd_pc\\\\vite\\\\plugins\\\\setup-extend.js\";const __vite_injected_original_import_meta_url = \"file:///D:/code/pasd_V1.0/pasd_pc/vite/plugins/setup-extend.js\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite'\r\n\r\nexport default function createSetupExtend() {\r\n    return setupExtend({})\r\n}\r\n"],
  "mappings": ";AAAqQ,OAAOA,WAAU;AACtR,SAAS,cAAc,eAAe;;;ACDuO,IAAO,mBAAQ;AAAA;AAAA;AAAA;AAAA,EAI1R,OAAO,YAAY,KAAK,kBAAkB;AAAA;AAAA;AAAA;AAAA,EAI1C,WAAW;AAAA;AAAA;AAAA;AAAA,EAIX,cAAc;AAAA;AAAA;AAAA;AAAA,EAKd,QAAQ;AAAA;AAAA;AAAA;AAAA,EAKR,UAAU;AAAA;AAAA;AAAA;AAAA,EAKV,aAAa;AAAA;AAAA;AAAA;AAAA,EAKb,aAAa;AAAA;AAAA;AAAA;AAAA,EAKb,cAAc;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQd,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA,EAMV,YAAY,YAAY,KAAK,uBAAuB,aAAa;AAAA;AAAA,EAGjE,cAAc,YAAY,KAAK,2BAA2B;AAAA;AAAA,EAG1D,gBAAgB,YAAY,KAAK,6BAA6B;AAAA;AAAA,EAG9D,YAAY,WAAW;AACrB,WAAO,KAAK,YAAY,UAAU;AAAA,EACpC;AACF;;;AC/DoS,OAAO,SAAS;;;ACAJ,OAAO,gBAAgB;AAExT,SAAR,mBAAoC;AACvC,SAAO,WAAW;AAAA,IACd,SAAS;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,IACA,KAAK;AAAA,EACT,CAAC;AACL;;;ACX0S,SAAS,4BAA4B;AAC/U,OAAO,UAAU;AAEF,SAAR,cAA+B,SAAS;AAC3C,SAAO,qBAAqB;AAAA,IAC9B,UAAU,CAAC,KAAK,QAAQ,QAAQ,IAAI,GAAG,sBAAsB,CAAC;AAAA,IACxD,UAAU;AAAA,IACV,aAAa;AAAA,EACjB,CAAC;AACL;;;ACTgT,OAAO,iBAAiB;AAEzT,SAAR,kBAAmC,KAAK;AAC3C,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAS,CAAC;AAChB,MAAI,qBAAqB;AACrB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AAE/B,aAAO;AAAA,QACH,YAAY;AAAA,UACR,KAAK;AAAA,UACL,kBAAkB;AAAA,QACtB,CAAC;AAAA,MACL;AAAA,IACJ;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACjC,aAAO;AAAA,QACH,YAAY;AAAA,UACR,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACtB,CAAC;AAAA,MACL;AAAA,IACJ;AAAA,EACJ;AACA,SAAO;AACX;;;AC3BkT,OAAO,iBAAiB;AAE3T,SAAR,oBAAqC;AACxC,SAAO,YAAY,CAAC,CAAC;AACzB;;;AJGe,SAAR,kBAAmC,SAAS,UAAU,OAAO;AAChE,QAAM,cAAc,CAAC,IAAI,CAAC;AAC1B,cAAY,KAAK,iBAAiB,CAAC;AACtC,cAAY,KAAK,kBAAkB,CAAC;AACjC,cAAY,KAAK,cAAc,OAAO,CAAC;AAC1C,aAAW,YAAY,KAAK,GAAG,kBAAkB,OAAO,CAAC;AACtD,SAAO;AACX;;;AFdA,IAAM,mCAAmC;AAMzC,IAAO,sBAAQ,aAAa,CAAC,EAAE,MAAM,QAAQ,MAAM;AACjD,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,QAAM,EAAE,aAAa,IAAI;AAEzB,SAAO;AAAA;AAAA;AAAA,IAGL,MAAM,IAAI,iBAAiB,eAAe,iBAAS,WAAW,IAAI;AAAA,IAClE,SAAS,kBAAkB,KAAK,YAAY,OAAO;AAAA,IACnD,SAAS;AAAA;AAAA,MAEP,OAAO;AAAA,QACL,KAAKC,MAAK,QAAQ,kCAAW,IAAI;AAAA,QACjC,KAAKA,MAAK,QAAQ,kCAAW,OAAO;AAAA,MACtC;AAAA;AAAA,MAEA,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,SAAS,MAAM;AAAA,IACpE;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,YAAY;AAAA;AAAA,UAEV,QAAQ;AAAA;AAAA,UACR,cAAc;AAAA,UACd,SAAS,CAAC,MAAM,EAAE,QAAQ,cAAc,EAAE;AAAA,QAC5C;AAAA;AAAA,QAEA,wBAAwB;AAAA,UACtB,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,SAAS,CAAC,MAAM,EAAE,QAAQ,6BAA6B,sBAAsB;AAAA,QAC/E;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,KAAK;AAAA,MACH,SAAS;AAAA,QACP,SAAS;AAAA,UACP;AAAA,YACE,eAAe;AAAA,YACf,QAAQ;AAAA,cACN,SAAS,CAAC,WAAW;AACnB,oBAAI,OAAO,SAAS,WAAW;AAC7B,yBAAO,OAAO;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,IACA,OAAO;AAAA,MACL,QAAQ;AAAA;AAAA,MACR,QAAQ;AAAA,MACR,eAAe;AAAA,QACb,UAAU;AAAA,UACR,cAAc;AAAA,UACd,eAAe;AAAA,QACjB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path", "path"]
}
