From 73aa8125445bd805c889a220d98207838e98dbb0 Mon Sep 17 00:00:00 2001 From: chenqi Date: Wed, 17 Jun 2026 14:25:32 +0800 Subject: [PATCH] =?UTF-8?q?fix(database):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E5=85=B8=E9=87=8D=E5=A4=8D=E5=92=8C?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除手术状态下拉框的重复字典数据，保留每组中dict_code最小的记录 - 修复HisBaseEntity列缺失问题，为多个表添加create_by、update_by、update_time等基础字段 - 为adm_patient表添加邮政编码、户籍地址、监护人信息、患者来源等缺失字段 - 添加文化程度字典类型和相关字典数据，补充3919到3914等10个学历级别选项 - 为adm_patient_identifier表创建tenant_id和patient_id的联合索引以提升查询性能 - 修复prescription_intercept_log和clinical_pathway_execution表的基础实体字段缺失 - 为wor_device_request表增加医嘱退回相关的back_reason、performer_check_id等字段 - 创建EMPI核心表empi_person和empi_person_id_mapping用于全局患者主 --- AGENTS.md | 4 +- RULES.md | 2 +- healthlink-his-server/AGENTS.md | 2 +- healthlink-his-ui/src/api/quality.js | 6 + .../src/assets/icons/svg/appointment.svg | 8 +- .../src/assets/icons/svg/billing.svg | 9 +- .../src/assets/icons/svg/diagnosis.svg | 9 +- .../src/assets/icons/svg/email.svg | 8 +- .../src/assets/icons/svg/emergency.svg | 9 +- .../src/assets/icons/svg/insurance.svg | 9 +- .../src/assets/icons/svg/inventory.svg | 9 +- .../src/assets/icons/svg/laboratory.svg | 7 +- .../src/assets/icons/svg/lock.svg | 8 +- .../src/assets/icons/svg/log.svg | 10 +- .../src/assets/icons/svg/message.svg | 7 +- .../src/assets/icons/svg/password.svg | 9 +- .../src/assets/icons/svg/pharmacy.svg | 9 +- .../src/assets/icons/svg/phone.svg | 10 +- .../src/assets/icons/svg/prescription.svg | 10 +- .../src/assets/icons/svg/receipt.svg | 8 +- .../src/assets/icons/svg/server.svg | 10 +- .../src/assets/icons/svg/star.svg | 7 +- .../src/assets/icons/svg/surgery.svg | 8 +- .../src/assets/icons/svg/ward.svg | 9 +- .../src/components/Crontab/day.vue | 25 +- .../src/components/Crontab/hour.vue | 16 +- .../src/components/Crontab/min.vue | 16 +- .../src/components/Crontab/month.vue | 16 +- .../src/components/Crontab/second.vue | 16 +- .../src/components/Crontab/week.vue | 24 +- .../src/components/Crontab/year.vue | 21 +- .../components/ExcelImportDialog/index.vue | 55 +- .../src/components/FileUpload/index.vue | 2 +- .../src/components/PatientList/index.vue | 132 ++- .../components/PendingPatientList/index.vue | 36 +- .../components/TableLayout/EditableTable.vue | 60 +- .../src/components/TableLayout/Filter.vue | 58 +- .../src/components/TableLayout/Form.vue | 16 +- .../src/components/TableLayout/FormItem.vue | 10 +- .../src/components/TableLayout/FormLayout.vue | 27 +- .../components/TableLayout/QuickDateRange.vue | 36 +- .../src/components/TableLayout/Table.vue | 45 +- .../src/components/TableLayout/index.vue | 49 +- .../src/components/TreePanel/index.vue | 86 +- .../patientBar/inPatientBarDoctorFold.vue | 64 +- .../src/layout/components/Copyright/index.vue | 5 +- .../components/HeaderNotice/DetailView.vue | 63 +- .../layout/components/HeaderNotice/index.vue | 152 +++- .../src/layout/components/Navbar.vue | 2 - .../src/layout/components/Settings/index.vue | 192 ++++- .../src/template/ProgressNoteform.vue | 136 ++- .../src/template/surgicalPatientHandover.vue | 3 +- healthlink-his-ui/src/template/template3.vue | 108 ++- .../src/views/anesthesia/record/index.vue | 319 +++++-- .../src/views/anesthesiaenhanced/index.vue | 267 +++++- .../src/views/antibiotic/rules/index.vue | 361 ++++++-- healthlink-his-ui/src/views/apiauth/index.vue | 294 +++++-- .../src/views/assessmenttrend/index.vue | 214 ++++- .../src/views/auditlog/index.vue | 218 ++++- .../basicmanage/automaticBilling/index.vue | 88 +- .../views/basicmanage/bargainSets/index.vue | 88 +- .../src/views/basicmanage/bedspace/index.vue | 271 +++++- .../caseTemplates/components/editTemplate.vue | 3 +- .../caseTemplatesStatistics/index.vue | 3 +- .../basicmanage/commonlyDiagnosis/index.vue | 191 ++++- .../basicmanage/consumablesBinding/index.vue | 3 +- .../src/views/basicmanage/contract/index.vue | 88 +- .../src/views/basicmanage/customer/index.vue | 88 +- .../src/views/basicmanage/fee/index.vue | 182 +++- .../src/views/basicmanage/lisMerge/index.vue | 88 +- .../basicmanage/locationManagement/index.vue | 93 ++- .../components/adviceBaseList.vue | 2 +- .../components/adviceBaseList.vue | 2 +- .../basicmanage/ordersCombination/index.vue | 3 +- .../basicmanage/tcmPrescription/index.vue | 156 +++- .../src/views/basicmanage/ward/index.vue | 3 +- .../src/views/businessanalytics/index.vue | 159 +++- .../casignature/components/SignDialog.vue | 65 +- .../views/casignature/signature-log/index.vue | 151 +++- .../views/casignature/statistics/index.vue | 64 +- .../device/components/deviceYbDialog.vue | 3 +- .../components/diagTreYbDialog.vue | 3 +- .../medicine/components/medicineYbDialog.vue | 3 +- .../src/views/catalog/service/index.vue | 103 ++- .../src/views/charge/cliniccharge/index.vue | 2 +- .../clinicrefund/components/refundDialog.vue | 4 +- .../components/chargeDialog.vue | 4 +- .../components/refundDialog.vue | 2 +- .../components/reprintDialog.vue | 3 +- .../charge/outpatientregistration/index.vue | 9 +- .../views/charge/patientCardRenewal/index.vue | 3 +- .../views/charge/registerRecords/index.vue | 72 +- .../src/views/charge/schedule/index.vue | 72 +- .../src/views/charge/surgerycharge/index.vue | 2 +- .../views/clinicalmanage/pathway/index.vue | 219 ++++- .../bargain/component/adviceBaseList.vue | 2 +- .../clinicmanagement/chargeDetail/index.vue | 373 +++++++-- .../consultationCharge/index.vue | 88 +- .../consultationRefund/index.vue | 256 +++++- .../components/performRecordDialog.vue | 3 +- .../views/clinicmanagement/disposal/index.vue | 3 +- .../component/adviceListDialog.vue | 2 +- .../clinicmanagement/infusionrecord/index.vue | 3 +- .../clinicmanagement/lisPascResult/index.vue | 461 +++++++++-- .../clinicmanagement/orderViewPrint/index.vue | 354 ++++++-- .../clinicmanagement/refundNumber/index.vue | 189 ++++- .../clinicmanagement/requisition/index.vue | 331 ++++++-- .../clinicmanagement/techExecute/index.vue | 205 ++++- .../techfundApprove/index.vue | 216 ++++- .../clinicmanagement/withdrawal/index.vue | 131 ++- .../consultationapplication/index.vue | 3 +- .../consultationconfirmation/index.vue | 3 +- .../src/views/criticalvalue/pending/index.vue | 193 ++++- .../crossmodule/consult-feedback/index.vue | 278 ++++++- .../crossmodule/consulttimeout/index.vue | 163 +++- .../src/views/crossmodule/drgperf/index.vue | 121 ++- .../views/crossmodule/drugexpiry/index.vue | 182 +++- .../crossmodule/enhanced-ambulance/index.vue | 146 +++- .../crossmodule/enhanced-antibiotic/index.vue | 132 ++- .../crossmodule/enhanced-consent/index.vue | 161 +++- .../crossmodule/enhanced-drg-alert/index.vue | 152 +++- .../crossmodule/enhanced-nursing/index.vue | 184 ++++- .../views/crossmodule/handoffstat/index.vue | 163 +++- .../src/views/crossmodule/labalert/index.vue | 264 +++++- .../src/views/crossmodule/mrquality/index.vue | 160 +++- .../views/crossmodule/nurse-exec/index.vue | 131 ++- .../crossmodule/report-feedback/index.vue | 125 ++- .../views/crossmodule/reviewstat/index.vue | 147 +++- .../crossmodule/stock-intercept/index.vue | 119 ++- .../views/crossmodule/surgery-chain/index.vue | 208 ++++- .../views/crossmodule/surgerylink/index.vue | 217 ++++- .../src/views/crossmodule/transfer/index.vue | 244 +++++- .../src/views/cssd/trace/index.vue | 661 +++++++++++---- .../src/views/dashboard/index.vue | 165 +++- .../doctorstation/components/consultation.vue | 3 +- .../diagnosis/addDiagnosisDialog.vue | 3 +- .../examination/examinationApplication.vue | 258 +++--- .../components/pendingEmr/index.vue | 3 +- .../prescription/orderGroupDrawer.vue | 3 +- .../prescription/prescriptionInfo.vue | 2 +- .../prescription/prescriptionlist.vue | 409 ++++----- .../prescription/refundListDialog.vue | 2 +- .../components/surgery/surgeryApplication.vue | 5 +- .../components/tcm/tcmAdvice.vue | 79 +- .../components/tcm/tcmMedicineList.vue | 2 +- .../src/views/doctorstation/pendingEmr.vue | 3 +- .../components/MedicationDetails.vue | 4 +- .../components/MedicationSummary.vue | 166 ++-- .../src/views/drugtrace/alert/index.vue | 196 ++++- .../src/views/drugtrace/batch/index.vue | 240 +++++- .../src/views/drugtrace/code/index.vue | 249 +++++- .../src/views/drugtrace/scan/index.vue | 222 ++++- .../src/views/emergency/greentrack/index.vue | 273 +++++- .../src/views/emergency/observation/index.vue | 260 +++++- .../src/views/emergency/rescue/index.vue | 289 ++++++- .../src/views/emergency/triage/index.vue | 384 +++++++-- .../src/views/empienhanced/index.vue | 158 +++- .../src/views/empienhanced/merge/index.vue | 275 +++++-- .../src/views/empienhanced/patient/index.vue | 410 +++++++-- .../views/empienhanced/statistics/index.vue | 61 +- .../src/views/emr/archive/index.vue | 236 +++++- .../src/views/emr/revision-history/index.vue | 137 +++- .../src/views/emr/timeliness/index.vue | 137 +++- .../src/views/emrsearch/index.vue | 130 ++- .../src/views/esbmanage/message/index.vue | 277 ++++++- .../src/views/esbmanage/monitor/index.vue | 153 +++- .../src/views/esbmanage/registry/index.vue | 259 +++++- .../src/views/esbmanage/reliability/index.vue | 254 +++++- healthlink-his-ui/src/views/fhircda/index.vue | 242 +++++- .../src/views/flowable/definition/index.vue | 86 +- .../src/views/flowable/expression/index.vue | 86 +- .../src/views/flowable/listener/index.vue | 86 +- .../views/flowable/task/finished/index.vue | 86 +- .../src/views/flowable/task/form/index.vue | 86 +- .../src/views/flowable/task/todo/index.vue | 86 +- .../src/views/followup/complaint/index.vue | 276 ++++++- .../src/views/followup/plan/index.vue | 332 ++++++-- .../src/views/followup/record/index.vue | 170 +++- .../src/views/followup/survey/index.vue | 249 +++++- .../src/views/followup/task/index.vue | 336 ++++++-- .../views/gf/ratioApplicationRecord/index.vue | 6 +- .../src/views/gf/studentList/index.vue | 3 +- .../src/views/idverification/index.vue | 224 ++++- .../charge/feeSettlement/index.vue | 2 +- .../components/PatientList.vue | 3 +- .../register/components/accomplishList.vue | 37 +- .../charge/register/components/awaitList.vue | 7 +- .../register/components/patientInfoForm.vue | 3 +- .../components/home/components/derate.vue | 54 +- .../home/components/patientList.vue | 85 +- .../home/components/patientListDialog.vue | 98 ++- .../components/home/components/receipt.vue | 158 +++- .../components/home/components/refund.vue | 159 +++- .../settlement/components/midway/index.vue | 294 +++++-- .../inpatientDiagnosis/index.vue | 215 ++++- .../inHospitalManagement/listFee/index.vue | 149 +++- .../medicalRecord/index.vue | 246 +++++- .../orderManage/index.vue | 195 ++++- .../inHospitalManagement/portal/index.vue | 88 +- .../surgeryManage/index.vue | 384 +++++++-- healthlink-his-ui/src/views/index.vue | 4 +- .../infection/antibiotic-usage/index.vue | 73 +- .../src/views/infection/case/index.vue | 138 +++- .../src/views/infection/environment/index.vue | 342 ++++++-- .../src/views/infection/exposure/index.vue | 303 +++++-- .../src/views/infection/hygiene/index.vue | 280 +++++-- .../src/views/infection/resistant/index.vue | 331 ++++++-- .../views/infection/surveillance/index.vue | 336 ++++++-- .../src/views/infection/warning/index.vue | 341 ++++++-- .../src/views/infectionenhanced/index.vue | 643 ++++++++++++--- .../src/views/informedconsent/index.vue | 417 ++++++++-- .../inpatientDoctor/AnesthesiaAssessment.vue | 476 +++++++++-- .../inpatientDoctor/AnesthesiaSummary.vue | 395 +++++++-- .../inpatientDoctor/BloodTransfusion.vue | 776 +++++++++++++++--- .../views/inpatientDoctor/ClinicalPathway.vue | 560 +++++++++++-- .../inpatientDoctor/CriticalValueHandle.vue | 342 ++++++-- .../inpatientDoctor/EmrRevisionTrack.vue | 148 +++- .../inpatientDoctor/IntraopVitalSign.vue | 257 +++++- .../inpatientDoctor/OrderExecuteTrace.vue | 167 +++- .../views/inpatientDoctor/PostopFollowup.vue | 314 +++++-- .../home/components/adviceBaseList.vue | 7 +- .../applicationShow/surgeryApplication.vue | 4 +- .../diagnosis/addDiagnosisDialog.vue | 3 +- .../diagnosis/chineseMedicineDialog.vue | 2 +- .../home/components/diagnosis/diagnosis.vue | 4 +- .../home/components/diagnosis/index.vue | 2 +- .../home/components/order/OrderForm.vue | 444 +++++++--- .../home/components/order/index.vue | 508 +++++++++--- .../src/views/inpatientDoctor/home/index.vue | 5 +- .../InpatientBilling/components/FeeDialog.vue | 4 +- .../src/views/inpatientNurse/home/index.vue | 3 +- .../inOut/components/bedAllocation.vue | 38 +- .../inOut/components/signEntryDialog.vue | 133 ++- .../inOut/components/transferInDialog.vue | 168 ++-- .../inOut/components/transferOut.vue | 365 ++++++-- .../check/MedicalOrderManagement.vue | 128 ++- .../components/check/patientList.vue | 73 +- .../components/execute/patientList.vue | 73 +- .../medicalOrderManagement/index.vue | 9 +- .../components/prescriptionList.vue | 432 +++++----- .../inpatientNurse/nursingRecord/index.vue | 20 +- .../src/views/knowledgebase/index.vue | 331 ++++++-- .../views/labenhanced/appointment/index.vue | 267 ++++-- .../src/views/labenhanced/icd10/index.vue | 148 +++- .../src/views/labenhanced/index.vue | 184 ++++- .../src/views/labenhanced/pathway/index.vue | 226 ++++- .../labenhanced/radiologyreport/index.vue | 242 ++++-- .../src/views/labenhanced/refrange/index.vue | 246 +++++- .../src/views/labhistory/index.vue | 201 ++++- healthlink-his-ui/src/views/lock.vue | 69 +- healthlink-his-ui/src/views/login.vue | 87 +- .../dayEndSettlement/index.vue | 3 +- .../reconciliationDetails.vue | 2 +- .../components/orderDialog.vue | 3 +- .../returnOrder/components/orderDialog.vue | 3 +- .../components/orderDialog.vue | 3 +- .../stockInOrder/components/orderDialog.vue | 3 +- .../stockOutOrder/components/orderDialog.vue | 3 +- .../components/orderDialog.vue | 3 +- .../src/views/monitor/cache/list.vue | 3 +- .../src/views/monitor/job/index.vue | 3 +- .../src/views/mrhomepage/drg/index.vue | 339 ++++++-- .../src/views/mrhomepage/management/index.vue | 148 +++- .../src/views/mrhomepage/statistics/index.vue | 101 ++- .../src/views/mrmanagement/index.vue | 461 +++++++++-- .../src/views/nursing/assessment/index.vue | 68 +- .../src/views/nursingenhanced/assessment.vue | 635 +++++++++++--- .../src/views/nursingenhanced/index.vue | 250 +++++- .../src/views/nursingexecution/index.vue | 245 +++++- .../src/views/nursingquality/index.vue | 328 ++++++-- .../orderclosedloop/execution-track/index.vue | 248 +++++- .../orderclosedloop/statistics/index.vue | 223 ++++- .../dayEndSettlement/index.vue | 108 ++- .../src/views/outpatientenhanced/index.vue | 371 +++++++-- .../src/views/pathology/order/index.vue | 298 +++++-- .../src/views/pathology/report/index.vue | 304 +++++-- .../src/views/pathology/specimen/index.vue | 340 ++++++-- .../outpatienrecords/index.vue | 30 +- .../components/orderDialog.vue | 3 +- .../components/orderDialog.vue | 3 +- .../westernmedicine/index.vue | 4 +- .../src/views/pharmacystockalert/index.vue | 307 +++++-- .../views/preopmanage/discussion/index.vue | 634 ++++++++++++-- .../src/views/progressnotes/index.vue | 333 ++++++-- .../src/views/quality/statistics/index.vue | 255 +++++- .../src/views/qualityenhanced/index.vue | 163 +++- .../src/views/radiologycomparison/index.vue | 323 ++++++-- .../src/views/radiologyenhanced/index.vue | 164 +++- .../views/rationaldrug/audit-log/index.vue | 267 +++++- .../rationaldrug/interaction-rule/index.vue | 329 ++++++-- .../views/rationaldrug/statistics/index.vue | 152 +++- .../src/views/reconstruction/3d/index.vue | 575 ++++++++++--- .../src/views/reconstruction/3d/viewer.vue | 96 ++- .../src/views/review/plan/index.vue | 275 ++++++- .../src/views/review/ranking/index.vue | 108 ++- .../src/views/review/records/index.vue | 115 ++- .../src/views/review/statistics/index.vue | 134 ++- .../src/views/review/workbench/index.vue | 155 +++- .../src/views/specimenbarcode/index.vue | 250 +++++- .../src/views/surgerysafetycheck/index.vue | 248 +++++- .../src/views/surgicalschedule/index.vue | 2 +- .../surgicalschedule/temporaryMedical.vue | 3 +- .../src/views/system/config/index.vue | 3 +- .../src/views/system/dept/index.vue | 3 +- .../src/views/system/dict/data.vue | 3 +- .../src/views/system/dict/index.vue | 3 +- .../src/views/system/menu/index.vue | 30 +- .../src/views/system/notice/index.vue | 3 +- .../src/views/system/post/index.vue | 3 +- .../src/views/system/role/index.vue | 3 +- .../src/views/system/tenant/index.vue | 3 +- .../src/views/system/user/authRole.vue | 3 +- .../src/views/system/user/index.vue | 3 +- .../src/views/tcm/constitution/index.vue | 161 +++- .../src/views/tcm/traditional/index.vue | 279 ++++++- .../src/views/vitalsignschart/index.vue | 288 ++++++- .../ybmanagement/catalogManagement/index.vue | 133 ++- .../index.vue | 3 +- .../register/components/patientInfoForm.vue | 3 +- .../ybmanagement/medicalInsurance/index.vue | 177 +++- .../views/ybmanagement/settlement/index.vue | 152 +++- 321 files changed, 36390 insertions(+), 7997 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index e629574b2..15e4040d3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -47,7 +47,7 @@ **铁律2: Flyway 数据库迁移** - 凡是新建表、新增字段，必须创建 Flyway 迁移脚本 -- 路径：`healthlink-his-domain/src/main/resources/db/migration/` +- 路径：`healthlink-his-application/src/main/resources/db/migration/` - 命名：`V{版本号}__{描述}.sql`（双下划线） **铁律3: 测试通过后才提交** @@ -184,7 +184,7 @@ **铁律2: Flyway 数据库迁移** - 凡是新建表、新增字段，必须创建 Flyway 迁移脚本 -- 路径：`healthlink-his-domain/src/main/resources/db/migration/` +- 路径：`healthlink-his-application/src/main/resources/db/migration/` - 命名：`V{版本号}__{描述}.sql`（双下划线） **铁律3: 测试通过后才提交** diff --git a/RULES.md b/RULES.md index 002e403e9..e77c56314 100644 --- a/RULES.md +++ b/RULES.md @@ -40,7 +40,7 @@ **铁律2: Flyway 数据库迁移** - 凡是新建表、新增字段，必须创建 Flyway 迁移脚本 -- 路径：`healthlink-his-domain/src/main/resources/db/migration/` +- 路径：`healthlink-his-application/src/main/resources/db/migration/` - 命名：`V{版本号}__{描述}.sql`（双下划线） **铁律3: 测试通过后才提交** diff --git a/healthlink-his-server/AGENTS.md b/healthlink-his-server/AGENTS.md index d320b4a8a..f9b2d11c5 100644 --- a/healthlink-his-server/AGENTS.md +++ b/healthlink-his-server/AGENTS.md @@ -40,7 +40,7 @@ **铁律2: Flyway 数据库迁移** - 凡是新建表、新增字段，必须创建 Flyway 迁移脚本 -- 路径：`healthlink-his-domain/src/main/resources/db/migration/` +- 路径：`healthlink-his-application/src/main/resources/db/migration/` - 命名：`V{版本号}__{描述}.sql`（双下划线） **铁律3: 测试通过后才提交** diff --git a/healthlink-his-ui/src/api/quality.js b/healthlink-his-ui/src/api/quality.js index 7525e93cc..a399171b3 100644 --- a/healthlink-his-ui/src/api/quality.js +++ b/healthlink-his-ui/src/api/quality.js @@ -6,3 +6,9 @@ export function getDefects(encounterId) { return request({ url: "/api/v1/emr-qua export function getDefectStatistics() { return request({ url: "/api/v1/emr-quality/defect-statistics", method: "get" }) } export function getCompletionRate() { return request({ url: "/api/v1/emr-quality/completion-rate", method: "get" }) } export function getQualityStatistics(params) { return request({ url: "/api/v1/emr-quality/defect-statistics", method: "get", params }) } + +// 终末质控 +export function runTerminalCheck(encounterId) { return request({ url: "/api/v1/quality/terminal/check/" + encounterId, method: "post" }) } +export function getTerminalResults(encounterId) { return request({ url: "/api/v1/quality/terminal/results/" + encounterId, method: "get" }) } +export function startDefectRectify(defectId) { return request({ url: "/api/v1/emr-quality/defect/rectify/" + defectId, method: "post" }) } +export function completeDefectRectify(defectId) { return request({ url: "/api/v1/emr-quality/defect/complete/" + defectId, method: "post" }) } diff --git a/healthlink-his-ui/src/assets/icons/svg/appointment.svg b/healthlink-his-ui/src/assets/icons/svg/appointment.svg index caed84fb7..eb1d5894a 100755 --- a/healthlink-his-ui/src/assets/icons/svg/appointment.svg +++ b/healthlink-his-ui/src/assets/icons/svg/appointment.svg @@ -1,4 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/billing.svg b/healthlink-his-ui/src/assets/icons/svg/billing.svg index 5d751de85..d8a9db0e1 100755 --- a/healthlink-his-ui/src/assets/icons/svg/billing.svg +++ b/healthlink-his-ui/src/assets/icons/svg/billing.svg @@ -1,4 +1,7 @@ - - - + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/diagnosis.svg b/healthlink-his-ui/src/assets/icons/svg/diagnosis.svg index 537892d9d..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/diagnosis.svg +++ b/healthlink-his-ui/src/assets/icons/svg/diagnosis.svg @@ -1,4 +1,7 @@ - - - + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/email.svg b/healthlink-his-ui/src/assets/icons/svg/email.svg index 74d25e21a..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/email.svg +++ b/healthlink-his-ui/src/assets/icons/svg/email.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/emergency.svg b/healthlink-his-ui/src/assets/icons/svg/emergency.svg index bc060d6a9..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/emergency.svg +++ b/healthlink-his-ui/src/assets/icons/svg/emergency.svg @@ -1,4 +1,7 @@ - - - + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/insurance.svg b/healthlink-his-ui/src/assets/icons/svg/insurance.svg index 13c146614..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/insurance.svg +++ b/healthlink-his-ui/src/assets/icons/svg/insurance.svg @@ -1,4 +1,7 @@ - - - + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/inventory.svg b/healthlink-his-ui/src/assets/icons/svg/inventory.svg index 245f7b182..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/inventory.svg +++ b/healthlink-his-ui/src/assets/icons/svg/inventory.svg @@ -1,4 +1,7 @@ - - - + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/laboratory.svg b/healthlink-his-ui/src/assets/icons/svg/laboratory.svg index d62f03e4d..5781e85f8 100755 --- a/healthlink-his-ui/src/assets/icons/svg/laboratory.svg +++ b/healthlink-his-ui/src/assets/icons/svg/laboratory.svg @@ -1,4 +1,5 @@ - - - + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/lock.svg b/healthlink-his-ui/src/assets/icons/svg/lock.svg index 74fee543d..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/lock.svg +++ b/healthlink-his-ui/src/assets/icons/svg/lock.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/log.svg b/healthlink-his-ui/src/assets/icons/svg/log.svg index fdf39ce86..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/log.svg +++ b/healthlink-his-ui/src/assets/icons/svg/log.svg @@ -1,3 +1,7 @@ - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/message.svg b/healthlink-his-ui/src/assets/icons/svg/message.svg index 14ca81728..815bc8555 100755 --- a/healthlink-his-ui/src/assets/icons/svg/message.svg +++ b/healthlink-his-ui/src/assets/icons/svg/message.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/password.svg b/healthlink-his-ui/src/assets/icons/svg/password.svg index b0c2cc343..815bc8555 100755 --- a/healthlink-his-ui/src/assets/icons/svg/password.svg +++ b/healthlink-his-ui/src/assets/icons/svg/password.svg @@ -1,3 +1,6 @@ - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/pharmacy.svg b/healthlink-his-ui/src/assets/icons/svg/pharmacy.svg index d46c0058a..815bc8555 100755 --- a/healthlink-his-ui/src/assets/icons/svg/pharmacy.svg +++ b/healthlink-his-ui/src/assets/icons/svg/pharmacy.svg @@ -1,5 +1,6 @@ - - - - + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/phone.svg b/healthlink-his-ui/src/assets/icons/svg/phone.svg index 70b05711d..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/phone.svg +++ b/healthlink-his-ui/src/assets/icons/svg/phone.svg @@ -1,3 +1,7 @@ - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/prescription.svg b/healthlink-his-ui/src/assets/icons/svg/prescription.svg index 16bd8ed97..2af87e76a 100755 --- a/healthlink-his-ui/src/assets/icons/svg/prescription.svg +++ b/healthlink-his-ui/src/assets/icons/svg/prescription.svg @@ -1,4 +1,8 @@ - - - + + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/receipt.svg b/healthlink-his-ui/src/assets/icons/svg/receipt.svg index 2b4a6fc8f..815bc8555 100755 --- a/healthlink-his-ui/src/assets/icons/svg/receipt.svg +++ b/healthlink-his-ui/src/assets/icons/svg/receipt.svg @@ -1,4 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/server.svg b/healthlink-his-ui/src/assets/icons/svg/server.svg index f568d5f8d..815bc8555 100755 --- a/healthlink-his-ui/src/assets/icons/svg/server.svg +++ b/healthlink-his-ui/src/assets/icons/svg/server.svg @@ -1,4 +1,6 @@ - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/star.svg b/healthlink-his-ui/src/assets/icons/svg/star.svg index 6cf86e66a..815bc8555 100755 --- a/healthlink-his-ui/src/assets/icons/svg/star.svg +++ b/healthlink-his-ui/src/assets/icons/svg/star.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/surgery.svg b/healthlink-his-ui/src/assets/icons/svg/surgery.svg index f229b3ae0..063172cd7 100755 --- a/healthlink-his-ui/src/assets/icons/svg/surgery.svg +++ b/healthlink-his-ui/src/assets/icons/svg/surgery.svg @@ -1,4 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/assets/icons/svg/ward.svg b/healthlink-his-ui/src/assets/icons/svg/ward.svg index bd3814ced..1c59a15b2 100755 --- a/healthlink-his-ui/src/assets/icons/svg/ward.svg +++ b/healthlink-his-ui/src/assets/icons/svg/ward.svg @@ -1,4 +1,7 @@ - - - + + + + + + \ No newline at end of file diff --git a/healthlink-his-ui/src/components/Crontab/day.vue b/healthlink-his-ui/src/components/Crontab/day.vue index 7b9605dbd..8f5d05198 100755 --- a/healthlink-his-ui/src/components/Crontab/day.vue +++ b/healthlink-his-ui/src/components/Crontab/day.vue @@ -2,7 +2,8 @@ 日，允许的通配符[, - * ? / L W] @@ -10,7 +11,8 @@ 不指定 @@ -18,7 +20,8 @@ 周期从 从 每月 本月最后一天 @@ -75,7 +81,8 @@ 指定 ({ second: "*", min: "*", hour: "*", @@ -109,7 +116,7 @@ const props = defineProps({ month: "*", week: "?", year: "", - } + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/Crontab/hour.vue b/healthlink-his-ui/src/components/Crontab/hour.vue index 2cec5d540..036baf127 100755 --- a/healthlink-his-ui/src/components/Crontab/hour.vue +++ b/healthlink-his-ui/src/components/Crontab/hour.vue @@ -2,7 +2,8 @@ 小时，允许的通配符[, - * /] @@ -10,7 +11,8 @@ 周期从 从 指定 ({ second: "*", min: "*", hour: "*", @@ -81,7 +85,7 @@ const props = defineProps({ month: "*", week: "?", year: "", - } + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/Crontab/min.vue b/healthlink-his-ui/src/components/Crontab/min.vue index 7e649a60d..2a815641f 100755 --- a/healthlink-his-ui/src/components/Crontab/min.vue +++ b/healthlink-his-ui/src/components/Crontab/min.vue @@ -2,7 +2,8 @@ 分钟，允许的通配符[, - * /] @@ -10,7 +11,8 @@ 周期从 从 指定 ({ second: "*", min: "*", hour: "*", @@ -80,7 +84,7 @@ const props = defineProps({ month: "*", week: "?", year: "", - } + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/Crontab/month.vue b/healthlink-his-ui/src/components/Crontab/month.vue index 888d4d1c1..48c19dc06 100755 --- a/healthlink-his-ui/src/components/Crontab/month.vue +++ b/healthlink-his-ui/src/components/Crontab/month.vue @@ -2,7 +2,8 @@ 月，允许的通配符[, - * /] @@ -10,7 +11,8 @@ 周期从 从 指定 ({ second: "*", min: "*", hour: "*", @@ -81,7 +85,7 @@ const props = defineProps({ month: "*", week: "?", year: "", - } + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/Crontab/second.vue b/healthlink-his-ui/src/components/Crontab/second.vue index 2986dd3da..9cc2e416b 100755 --- a/healthlink-his-ui/src/components/Crontab/second.vue +++ b/healthlink-his-ui/src/components/Crontab/second.vue @@ -2,7 +2,8 @@ 秒，允许的通配符[, - * /] @@ -10,7 +11,8 @@ 周期从 从 指定 ({ second: "*", min: "*", hour: "*", @@ -81,7 +85,7 @@ const props = defineProps({ month: "*", week: "?", year: "", - } + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/Crontab/week.vue b/healthlink-his-ui/src/components/Crontab/week.vue index 4af6ac82b..d8b088ef5 100755 --- a/healthlink-his-ui/src/components/Crontab/week.vue +++ b/healthlink-his-ui/src/components/Crontab/week.vue @@ -2,7 +2,8 @@ 周，允许的通配符[, - * ? / L #] @@ -10,7 +11,8 @@ 不指定 @@ -18,7 +20,8 @@ 周期从 第 本月最后一个 指定 ({ second: "*", min: "*", hour: "*", day: "*", month: "*", week: "?", - year: "" - } + year: "", + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/Crontab/year.vue b/healthlink-his-ui/src/components/Crontab/year.vue index bda545f62..5e870acd5 100755 --- a/healthlink-his-ui/src/components/Crontab/year.vue +++ b/healthlink-his-ui/src/components/Crontab/year.vue @@ -2,7 +2,8 @@ 不填，允许的通配符[, - * /] @@ -10,7 +11,8 @@ 每年 @@ -18,7 +20,8 @@ 周期从 从 指定 ({ second: "*", min: "*", hour: "*", day: "*", month: "*", week: "?", - year: "" - } + year: "", + }) }, check: { type: Function, diff --git a/healthlink-his-ui/src/components/ExcelImportDialog/index.vue b/healthlink-his-ui/src/components/ExcelImportDialog/index.vue index 36da43e1f..386d114dd 100644 --- a/healthlink-his-ui/src/components/ExcelImportDialog/index.vue +++ b/healthlink-his-ui/src/components/ExcelImportDialog/index.vue @@ -1,22 +1,61 @@ @@ -223,8 +253,14 @@ -
- +
+
diff --git a/healthlink-his-ui/src/components/TableLayout/Filter.vue b/healthlink-his-ui/src/components/TableLayout/Filter.vue index c42fed9fa..f96e69b46 100755 --- a/healthlink-his-ui/src/components/TableLayout/Filter.vue +++ b/healthlink-his-ui/src/components/TableLayout/Filter.vue @@ -1,5 +1,8 @@