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 @@ - - - - 将文件拖到此处,或点击上传 + + + + + + + 将文件拖到此处,或点击上传 + - {{ updateSupportLabel }} + + {{ updateSupportLabel }} + 仅允许导入xls、xlsx格式文件。 - 下载模板 + + 下载模板 + diff --git a/healthlink-his-ui/src/components/FileUpload/index.vue b/healthlink-his-ui/src/components/FileUpload/index.vue index c77590ac3..e037bce55 100755 --- a/healthlink-his-ui/src/components/FileUpload/index.vue +++ b/healthlink-his-ui/src/components/FileUpload/index.vue @@ -1,8 +1,8 @@ - + - - + + - - - + + + - + - + {{ item.patientName || '-' }} @@ -57,7 +87,10 @@ - + - {{ item.houseName }} - {{ item.bedName || '未分床' }} + + {{ item.houseName }} + + + {{ item.bedName || '未分床' }} + @@ -83,7 +123,10 @@ - + - + {{ item.patientName || '-' }} @@ -118,12 +165,18 @@ - + 入院日期:{{ item.admissionDate }} - + 主管医生:{{ item.attendingDoctorName }} @@ -131,22 +184,28 @@ - + - + {{ item.bedName }} - + - + @@ -189,8 +252,15 @@ class="patientList-toggle-btn-wrap" :class="{ 'patientList-toggle-btn-wrap-unexpand': !currentExpand }" > - - + + diff --git a/healthlink-his-ui/src/components/PendingPatientList/index.vue b/healthlink-his-ui/src/components/PendingPatientList/index.vue index 6d14432b3..2f866a6e7 100755 --- a/healthlink-his-ui/src/components/PendingPatientList/index.vue +++ b/healthlink-his-ui/src/components/PendingPatientList/index.vue @@ -1,12 +1,15 @@ - + - + {{ item.bedName || '-' }} - + {{ item.contractName }} - + {{ item.patientName || '-' }} @@ -81,19 +97,21 @@ {{ item.genderEnum_enumText || '-' }} · {{ item.age }} - · {{ item.priorityEnum_enumText }} + · {{ item.priorityEnum_enumText }} - + - + diff --git a/healthlink-his-ui/src/components/TableLayout/EditableTable.vue b/healthlink-his-ui/src/components/TableLayout/EditableTable.vue index d0f513186..6dfa4bd75 100755 --- a/healthlink-his-ui/src/components/TableLayout/EditableTable.vue +++ b/healthlink-his-ui/src/components/TableLayout/EditableTable.vue @@ -1,11 +1,21 @@ - + - + 添加行 - + - + 删除选中({{ selectedRows.length }}) - + @@ -116,7 +137,12 @@ @input="col.onInput && col.onInput(row, rowIndex)" @change="col.onChange && col.onChange(row, rowIndex)" > - {{ col.suffix }} + + {{ col.suffix }} + @@ -209,7 +235,11 @@ :rules="col.rules" style="margin-bottom: 0" > - + @@ -223,8 +253,14 @@ -