Compare commits
38 Commits
upgrade/sp
...
b04eb52da4
| Author | SHA1 | Date | |
|---|---|---|---|
| b04eb52da4 | |||
| 71f71b74d1 | |||
| e592b9fc42 | |||
| d8427f788e | |||
| 86c82286c6 | |||
| 9f7eb0eac6 | |||
| a582a97ef1 | |||
|
|
a16a1f409c | ||
|
|
227d6d12f1 | ||
|
|
0f4da1e32f | ||
| 09e07b1fba | |||
| 69518074f2 | |||
|
|
cfb1ea1b3c | ||
| f836d816ad | |||
| 904819321d | |||
| 3e6396d17f | |||
| 051b0edee4 | |||
| dccf658277 | |||
| 69564afa60 | |||
| 90c8cce725 | |||
| 893cbf1fe0 | |||
| d07cab2314 | |||
| 473a2c974f | |||
| 4ff36fba20 | |||
| 04840fde0e | |||
|
|
a77d4e8b03 | ||
| 71835c7fd1 | |||
|
|
b5082c526f | ||
| f3ce360714 | |||
| b61084d8db | |||
| 4ebb21915d | |||
| 14cb913943 | |||
| e0d4c203e4 | |||
|
|
0e69a01120 | ||
| af5d411e52 | |||
| c0149693f5 | |||
| 7e8d32a851 | |||
| efb9b49d5c |
@@ -25,8 +25,8 @@
|
||||
- 结果:transfer 组件的 "已选择" 区域显示"无数据"
|
||||
|
||||
### 涉及文件
|
||||
- **前端**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue` (line 347-382)
|
||||
- **前端**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` (line 193-210, 弹窗渲染处)
|
||||
- **前端**: `healthlink-his-ui/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue` (line 347-382)
|
||||
- **前端**: `healthlink-his-ui/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` (line 193-210, 弹窗渲染处)
|
||||
|
||||
### 修复方案
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
- **Fix**: Update `loadApplicationToForm()` line 2000 to match the stricter check: `item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`.
|
||||
|
||||
## Files to Modify
|
||||
- `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue`
|
||||
- `healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue`
|
||||
|
||||
## Changes
|
||||
1. `initData()`: Add `formData.executeTime = formatDateTime(new Date())` after line 899
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
# Bug #403 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
**Bug现象**:住院医生工作站应用医嘱组套后,药品明细字段(单次剂量、总量、总金额、药房/科室)丢失。
|
||||
|
||||
**数据流追踪**:
|
||||
|
||||
1. **后端 `getGroupPackageForOrder`** (OrdersGroupPackageAppServiceImpl.java:168)
|
||||
- 查询组套明细 SQL(OrdersGroupPackageAppMapper.xml:37-82)返回:`dose`, `quantity`, `doseQuantity`, `rateCode`, `methodCode`, `dispensePerDuration` 等字段
|
||||
- 通过 `getAdviceBaseInfo` 获取 `AdviceBaseDto` 赋值给 `detail.setOrderDetailInfos()`,包含:`doseUnitCode`, `doseUnitCode_dictText`, `positionId`, `inventoryList`, `priceList`, `partPercent` 等
|
||||
|
||||
2. **前端 `orderGroupDrawer.vue`** `handleUseOrderGroup` (line 568-694)
|
||||
- 对每个组套明细项进行预处理,合并组套字段和医嘱库字段
|
||||
- 通过 `emit('useOrderGroup', processedDetailList)` 发送到父组件
|
||||
|
||||
3. **前端 `inpatientDoctor/home/components/order/index.vue`** `handleSaveGroup` (line 1546-1639)
|
||||
- 接收 `orderGroupList`,对每个 item 调用 `setValue(mergedDetail)` 填充行数据
|
||||
- 然后用 `item` 的字段显式覆盖创建 `newRow`
|
||||
|
||||
**根因定位**:`handleSaveGroup` 在构建 `newRow` 时(line 1594-1617),从 `item` 直接取值覆盖了 `setValue` 设置的值。问题在于:
|
||||
|
||||
1. **`item.unitCodeName` 可能为 undefined**:组套明细 SQL 中 `unitCodeName` 来自字典关联 `sys_dict_data`,如果字典匹配不上则为 null。`newRow` 的 `unitCode_dictText` 直接使用 `item.unitCodeName || ''`,导致显示为空。
|
||||
|
||||
2. **`positionName` 未在 `orderGroupDrawer` 处理项中显式设置**:虽然 `setValue` 会通过库存查询设置 `positionName`,但 `orderGroupDrawer.vue` 的 `handleUseOrderGroup` 没有将 `positionName`(或至少 `orderDetail.positionName`)包含在 processed item 中,导致 `setValue` 的库存查找依赖 `inventoryList`,而 `inventoryList` 来自后端 `AdviceBaseDto`。
|
||||
|
||||
3. **`doseUnitCode_dictText` 依赖 `setValue` 的 `unitCodeList`**:`orderGroupDrawer` 的处理项中没有显式包含 `doseUnitCode_dictText`,完全依赖 `mergedDetail` 中 spread 的 `orderDetail` 字段。
|
||||
|
||||
## 影响范围
|
||||
|
||||
- 前端文件:`openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue`
|
||||
- 前端文件:`openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue`
|
||||
- 影响场景:住院医生工作站和门诊医生工作站应用医嘱组套
|
||||
|
||||
## 修复方案
|
||||
|
||||
**修改 `orderGroupDrawer.vue` 的 `handleUseOrderGroup` 函数**(line 630-688):
|
||||
|
||||
在 processed item 的 return 对象中显式添加缺失的字段:
|
||||
- `doseUnitCode_dictText`:从 orderDetail 获取剂量单位显示文本
|
||||
- `positionName`:从 orderDetail 获取执行科室/药房名称
|
||||
- `injectFlag` / `injectFlag_enumText`:注射标识
|
||||
- `skinTestFlag` / `skinTestFlag_enumText`:皮试标识
|
||||
- `partPercent`、`partAttributeEnum`、`unitConversionRatio`:用于价格计算的关键字段
|
||||
|
||||
这些字段在 `orderDetail`(AdviceBaseDto)中都有,只是没有在 processed item 的顶层显式设置。`handleSaveGroup` 的 `newRow` 通过 `...prescriptionList.value[rowIndex.value]` spread 能获取到 `setValue` 设置的值,但显式在顶层包含可以确保数据流的完整性。
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 修改代码后,用 `node --check` 验证语法
|
||||
2. 在住院医生工作站测试:选择患者 → 点击组套 → 预览组套 → 应用到当前患者
|
||||
3. 验证表格中显示的字段:单次剂量、总量、总金额、药房/科室均有值
|
||||
|
||||
---
|
||||
|
||||
## 修复结果:✅ 成功,10行改动
|
||||
|
||||
**修改文件**:`openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue`
|
||||
|
||||
**改动说明**:在 `handleUseOrderGroup` 函数的 processed item 中显式添加了以下缺失字段:
|
||||
- `doseUnitCode_dictText`:剂量单位显示文本(如"mg"),用于"单次剂量"列的后缀显示
|
||||
- `positionName`:药房/科室名称,用于"药房/科室"列显示
|
||||
- `injectFlag` / `injectFlag_enumText`:注射药品标识及文本
|
||||
- `skinTestFlag` / `skinTestFlag_enumText`:皮试标识及文本
|
||||
|
||||
**策略**:策略A(直接修复代码逻辑)—— 组套应用时数据预处理缺失部分关键字段,导致父组件 `handleSaveGroup` 构建行数据时无法获取完整信息。补充字段后,`setValue` 和 `newRow` 构造均能正确传递这些数据到表格。
|
||||
418
.gitignore
vendored
Normal file
418
.gitignore
vendored
Normal file
@@ -0,0 +1,418 @@
|
||||
/.vscode/mcp.json
|
||||
/.vscode/settings.json
|
||||
/.qwen/settings.json.orig
|
||||
/.playwright-mcp/console-2026-03-31T08-27-30-883Z.log
|
||||
/.playwright-mcp/console-2026-05-19T03-10-43-600Z.log
|
||||
/.playwright-mcp/console-2026-05-19T03-18-23-396Z.log
|
||||
/.playwright-mcp/console-2026-05-19T03-18-51-946Z.log
|
||||
/.playwright-mcp/page-2026-05-11T02-56-22-027Z.yml
|
||||
/.playwright-mcp/page-2026-05-11T02-56-30-095Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-10-44-171Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-11-20-520Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-11-40-168Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-12-10-968Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-18-23-610Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-18-52-634Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-19-19-472Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-19-36-669Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-20-04-342Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-21-08-820Z.yml
|
||||
/.playwright-mcp/page-2026-05-19T03-21-43-735Z.yml
|
||||
/.idea/compiler.xml
|
||||
/.idea/encodings.xml
|
||||
/.idea/jarRepositories.xml
|
||||
/.idea/misc.xml
|
||||
/.idea/vcs.xml
|
||||
/.idea/workspace.xml
|
||||
/node_modules/.bin/husky
|
||||
/node_modules/.bin/husky.cmd
|
||||
/node_modules/.bin/husky.ps1
|
||||
/node_modules/asynckit/lib/abort.js
|
||||
/node_modules/asynckit/lib/async.js
|
||||
/node_modules/asynckit/lib/defer.js
|
||||
/node_modules/asynckit/lib/iterate.js
|
||||
/node_modules/asynckit/lib/readable_asynckit.js
|
||||
/node_modules/asynckit/lib/readable_parallel.js
|
||||
/node_modules/asynckit/lib/readable_serial.js
|
||||
/node_modules/asynckit/lib/readable_serial_ordered.js
|
||||
/node_modules/asynckit/lib/state.js
|
||||
/node_modules/asynckit/lib/streamify.js
|
||||
/node_modules/asynckit/lib/terminator.js
|
||||
/node_modules/asynckit/bench.js
|
||||
/node_modules/asynckit/index.js
|
||||
/node_modules/asynckit/LICENSE
|
||||
/node_modules/asynckit/package.json
|
||||
/node_modules/asynckit/parallel.js
|
||||
/node_modules/asynckit/README.md
|
||||
/node_modules/asynckit/serial.js
|
||||
/node_modules/asynckit/serialOrdered.js
|
||||
/node_modules/asynckit/stream.js
|
||||
/node_modules/axios/dist/browser/axios.cjs
|
||||
/node_modules/axios/dist/esm/axios.js
|
||||
/node_modules/axios/dist/esm/axios.min.js
|
||||
/node_modules/axios/dist/esm/axios.min.js.map
|
||||
/node_modules/axios/dist/node/axios.cjs
|
||||
/node_modules/axios/dist/axios.js
|
||||
/node_modules/axios/dist/axios.min.js
|
||||
/node_modules/axios/dist/axios.min.js.map
|
||||
/node_modules/axios/lib/adapters/adapters.js
|
||||
/node_modules/axios/lib/adapters/fetch.js
|
||||
/node_modules/axios/lib/adapters/http.js
|
||||
/node_modules/axios/lib/adapters/README.md
|
||||
/node_modules/axios/lib/adapters/xhr.js
|
||||
/node_modules/axios/lib/cancel/CanceledError.js
|
||||
/node_modules/axios/lib/cancel/CancelToken.js
|
||||
/node_modules/axios/lib/cancel/isCancel.js
|
||||
/node_modules/axios/lib/core/Axios.js
|
||||
/node_modules/axios/lib/core/AxiosError.js
|
||||
/node_modules/axios/lib/core/AxiosHeaders.js
|
||||
/node_modules/axios/lib/core/buildFullPath.js
|
||||
/node_modules/axios/lib/core/dispatchRequest.js
|
||||
/node_modules/axios/lib/core/InterceptorManager.js
|
||||
/node_modules/axios/lib/core/mergeConfig.js
|
||||
/node_modules/axios/lib/core/README.md
|
||||
/node_modules/axios/lib/core/settle.js
|
||||
/node_modules/axios/lib/core/transformData.js
|
||||
/node_modules/axios/lib/defaults/index.js
|
||||
/node_modules/axios/lib/defaults/transitional.js
|
||||
/node_modules/axios/lib/env/classes/FormData.js
|
||||
/node_modules/axios/lib/env/data.js
|
||||
/node_modules/axios/lib/env/README.md
|
||||
/node_modules/axios/lib/helpers/AxiosTransformStream.js
|
||||
/node_modules/axios/lib/helpers/AxiosURLSearchParams.js
|
||||
/node_modules/axios/lib/helpers/bind.js
|
||||
/node_modules/axios/lib/helpers/buildURL.js
|
||||
/node_modules/axios/lib/helpers/callbackify.js
|
||||
/node_modules/axios/lib/helpers/combineURLs.js
|
||||
/node_modules/axios/lib/helpers/composeSignals.js
|
||||
/node_modules/axios/lib/helpers/cookies.js
|
||||
/node_modules/axios/lib/helpers/deprecatedMethod.js
|
||||
/node_modules/axios/lib/helpers/estimateDataURLDecodedBytes.js
|
||||
/node_modules/axios/lib/helpers/formDataToJSON.js
|
||||
/node_modules/axios/lib/helpers/formDataToStream.js
|
||||
/node_modules/axios/lib/helpers/fromDataURI.js
|
||||
/node_modules/axios/lib/helpers/HttpStatusCode.js
|
||||
/node_modules/axios/lib/helpers/isAbsoluteURL.js
|
||||
/node_modules/axios/lib/helpers/isAxiosError.js
|
||||
/node_modules/axios/lib/helpers/isURLSameOrigin.js
|
||||
/node_modules/axios/lib/helpers/null.js
|
||||
/node_modules/axios/lib/helpers/parseHeaders.js
|
||||
/node_modules/axios/lib/helpers/parseProtocol.js
|
||||
/node_modules/axios/lib/helpers/progressEventReducer.js
|
||||
/node_modules/axios/lib/helpers/readBlob.js
|
||||
/node_modules/axios/lib/helpers/README.md
|
||||
/node_modules/axios/lib/helpers/resolveConfig.js
|
||||
/node_modules/axios/lib/helpers/speedometer.js
|
||||
/node_modules/axios/lib/helpers/spread.js
|
||||
/node_modules/axios/lib/helpers/throttle.js
|
||||
/node_modules/axios/lib/helpers/toFormData.js
|
||||
/node_modules/axios/lib/helpers/toURLEncodedForm.js
|
||||
/node_modules/axios/lib/helpers/trackStream.js
|
||||
/node_modules/axios/lib/helpers/validator.js
|
||||
/node_modules/axios/lib/helpers/ZlibHeaderTransformStream.js
|
||||
/node_modules/axios/lib/platform/browser/classes/Blob.js
|
||||
/node_modules/axios/lib/platform/browser/classes/FormData.js
|
||||
/node_modules/axios/lib/platform/browser/classes/URLSearchParams.js
|
||||
/node_modules/axios/lib/platform/browser/index.js
|
||||
/node_modules/axios/lib/platform/common/utils.js
|
||||
/node_modules/axios/lib/platform/node/classes/FormData.js
|
||||
/node_modules/axios/lib/platform/node/classes/URLSearchParams.js
|
||||
/node_modules/axios/lib/platform/node/index.js
|
||||
/node_modules/axios/lib/platform/index.js
|
||||
/node_modules/axios/lib/axios.js
|
||||
/node_modules/axios/lib/utils.js
|
||||
/node_modules/axios/CHANGELOG.md
|
||||
/node_modules/axios/index.d.cts
|
||||
/node_modules/axios/index.d.ts
|
||||
/node_modules/axios/index.js
|
||||
/node_modules/axios/LICENSE
|
||||
/node_modules/axios/MIGRATION_GUIDE.md
|
||||
/node_modules/axios/package.json
|
||||
/node_modules/axios/README.md
|
||||
/node_modules/bignumber.js/doc/API.html
|
||||
/node_modules/bignumber.js/bignumber.d.mts
|
||||
/node_modules/bignumber.js/bignumber.d.ts
|
||||
/node_modules/bignumber.js/bignumber.js
|
||||
/node_modules/bignumber.js/bignumber.mjs
|
||||
/node_modules/bignumber.js/CHANGELOG.md
|
||||
/node_modules/bignumber.js/LICENCE.md
|
||||
/node_modules/bignumber.js/package.json
|
||||
/node_modules/bignumber.js/README.md
|
||||
/node_modules/bignumber.js/types.d.ts
|
||||
/node_modules/call-bind-apply-helpers/.github/FUNDING.yml
|
||||
/node_modules/call-bind-apply-helpers/test/index.js
|
||||
/node_modules/call-bind-apply-helpers/.eslintrc
|
||||
/node_modules/call-bind-apply-helpers/.nycrc
|
||||
/node_modules/call-bind-apply-helpers/actualApply.d.ts
|
||||
/node_modules/call-bind-apply-helpers/actualApply.js
|
||||
/node_modules/call-bind-apply-helpers/applyBind.d.ts
|
||||
/node_modules/call-bind-apply-helpers/applyBind.js
|
||||
/node_modules/call-bind-apply-helpers/CHANGELOG.md
|
||||
/node_modules/call-bind-apply-helpers/functionApply.d.ts
|
||||
/node_modules/call-bind-apply-helpers/functionApply.js
|
||||
/node_modules/call-bind-apply-helpers/functionCall.d.ts
|
||||
/node_modules/call-bind-apply-helpers/functionCall.js
|
||||
/node_modules/call-bind-apply-helpers/index.d.ts
|
||||
/node_modules/call-bind-apply-helpers/index.js
|
||||
/node_modules/call-bind-apply-helpers/LICENSE
|
||||
/node_modules/call-bind-apply-helpers/package.json
|
||||
/node_modules/call-bind-apply-helpers/README.md
|
||||
/node_modules/call-bind-apply-helpers/reflectApply.d.ts
|
||||
/node_modules/call-bind-apply-helpers/reflectApply.js
|
||||
/node_modules/call-bind-apply-helpers/tsconfig.json
|
||||
/node_modules/combined-stream/lib/combined_stream.js
|
||||
/node_modules/combined-stream/License
|
||||
/node_modules/combined-stream/package.json
|
||||
/node_modules/combined-stream/Readme.md
|
||||
/node_modules/combined-stream/yarn.lock
|
||||
/node_modules/delayed-stream/lib/delayed_stream.js
|
||||
/node_modules/delayed-stream/.npmignore
|
||||
/node_modules/delayed-stream/License
|
||||
/node_modules/delayed-stream/Makefile
|
||||
/node_modules/delayed-stream/package.json
|
||||
/node_modules/delayed-stream/Readme.md
|
||||
/node_modules/dunder-proto/.github/FUNDING.yml
|
||||
/node_modules/dunder-proto/test/get.js
|
||||
/node_modules/dunder-proto/test/index.js
|
||||
/node_modules/dunder-proto/test/set.js
|
||||
/node_modules/dunder-proto/.eslintrc
|
||||
/node_modules/dunder-proto/.nycrc
|
||||
/node_modules/dunder-proto/CHANGELOG.md
|
||||
/node_modules/dunder-proto/get.d.ts
|
||||
/node_modules/dunder-proto/get.js
|
||||
/node_modules/dunder-proto/LICENSE
|
||||
/node_modules/dunder-proto/package.json
|
||||
/node_modules/dunder-proto/README.md
|
||||
/node_modules/dunder-proto/set.d.ts
|
||||
/node_modules/dunder-proto/set.js
|
||||
/node_modules/dunder-proto/tsconfig.json
|
||||
/node_modules/es-define-property/.github/FUNDING.yml
|
||||
/node_modules/es-define-property/test/index.js
|
||||
/node_modules/es-define-property/.eslintrc
|
||||
/node_modules/es-define-property/.nycrc
|
||||
/node_modules/es-define-property/CHANGELOG.md
|
||||
/node_modules/es-define-property/index.d.ts
|
||||
/node_modules/es-define-property/index.js
|
||||
/node_modules/es-define-property/LICENSE
|
||||
/node_modules/es-define-property/package.json
|
||||
/node_modules/es-define-property/README.md
|
||||
/node_modules/es-define-property/tsconfig.json
|
||||
/node_modules/es-errors/.github/FUNDING.yml
|
||||
/node_modules/es-errors/test/index.js
|
||||
/node_modules/es-errors/.eslintrc
|
||||
/node_modules/es-errors/CHANGELOG.md
|
||||
/node_modules/es-errors/eval.d.ts
|
||||
/node_modules/es-errors/eval.js
|
||||
/node_modules/es-errors/index.d.ts
|
||||
/node_modules/es-errors/index.js
|
||||
/node_modules/es-errors/LICENSE
|
||||
/node_modules/es-errors/package.json
|
||||
/node_modules/es-errors/range.d.ts
|
||||
/node_modules/es-errors/range.js
|
||||
/node_modules/es-errors/README.md
|
||||
/node_modules/es-errors/ref.d.ts
|
||||
/node_modules/es-errors/ref.js
|
||||
/node_modules/es-errors/syntax.d.ts
|
||||
/node_modules/es-errors/syntax.js
|
||||
/node_modules/es-errors/tsconfig.json
|
||||
/node_modules/es-errors/type.d.ts
|
||||
/node_modules/es-errors/type.js
|
||||
/node_modules/es-errors/uri.d.ts
|
||||
/node_modules/es-errors/uri.js
|
||||
/node_modules/es-object-atoms/.github/FUNDING.yml
|
||||
/node_modules/es-object-atoms/test/index.js
|
||||
/node_modules/es-object-atoms/.eslintrc
|
||||
/node_modules/es-object-atoms/CHANGELOG.md
|
||||
/node_modules/es-object-atoms/index.d.ts
|
||||
/node_modules/es-object-atoms/index.js
|
||||
/node_modules/es-object-atoms/isObject.d.ts
|
||||
/node_modules/es-object-atoms/isObject.js
|
||||
/node_modules/es-object-atoms/LICENSE
|
||||
/node_modules/es-object-atoms/package.json
|
||||
/node_modules/es-object-atoms/README.md
|
||||
/node_modules/es-object-atoms/RequireObjectCoercible.d.ts
|
||||
/node_modules/es-object-atoms/RequireObjectCoercible.js
|
||||
/node_modules/es-object-atoms/ToObject.d.ts
|
||||
/node_modules/es-object-atoms/ToObject.js
|
||||
/node_modules/es-object-atoms/tsconfig.json
|
||||
/node_modules/es-set-tostringtag/test/index.js
|
||||
/node_modules/es-set-tostringtag/.eslintrc
|
||||
/node_modules/es-set-tostringtag/.nycrc
|
||||
/node_modules/es-set-tostringtag/CHANGELOG.md
|
||||
/node_modules/es-set-tostringtag/index.d.ts
|
||||
/node_modules/es-set-tostringtag/index.js
|
||||
/node_modules/es-set-tostringtag/LICENSE
|
||||
/node_modules/es-set-tostringtag/package.json
|
||||
/node_modules/es-set-tostringtag/README.md
|
||||
/node_modules/es-set-tostringtag/tsconfig.json
|
||||
/node_modules/follow-redirects/debug.js
|
||||
/node_modules/follow-redirects/http.js
|
||||
/node_modules/follow-redirects/https.js
|
||||
/node_modules/follow-redirects/index.js
|
||||
/node_modules/follow-redirects/LICENSE
|
||||
/node_modules/follow-redirects/package.json
|
||||
/node_modules/follow-redirects/README.md
|
||||
/node_modules/form-data/lib/browser.js
|
||||
/node_modules/form-data/lib/form_data.js
|
||||
/node_modules/form-data/lib/populate.js
|
||||
/node_modules/form-data/CHANGELOG.md
|
||||
/node_modules/form-data/index.d.ts
|
||||
/node_modules/form-data/License
|
||||
/node_modules/form-data/package.json
|
||||
/node_modules/form-data/README.md
|
||||
/node_modules/function-bind/.github/FUNDING.yml
|
||||
/node_modules/function-bind/.github/SECURITY.md
|
||||
/node_modules/function-bind/test/.eslintrc
|
||||
/node_modules/function-bind/test/index.js
|
||||
/node_modules/function-bind/.eslintrc
|
||||
/node_modules/function-bind/.nycrc
|
||||
/node_modules/function-bind/CHANGELOG.md
|
||||
/node_modules/function-bind/implementation.js
|
||||
/node_modules/function-bind/index.js
|
||||
/node_modules/function-bind/LICENSE
|
||||
/node_modules/function-bind/package.json
|
||||
/node_modules/function-bind/README.md
|
||||
/node_modules/get-intrinsic/.github/FUNDING.yml
|
||||
/node_modules/get-intrinsic/test/GetIntrinsic.js
|
||||
/node_modules/get-intrinsic/.eslintrc
|
||||
/node_modules/get-intrinsic/.nycrc
|
||||
/node_modules/get-intrinsic/CHANGELOG.md
|
||||
/node_modules/get-intrinsic/index.js
|
||||
/node_modules/get-intrinsic/LICENSE
|
||||
/node_modules/get-intrinsic/package.json
|
||||
/node_modules/get-intrinsic/README.md
|
||||
/node_modules/get-proto/.github/FUNDING.yml
|
||||
/node_modules/get-proto/test/index.js
|
||||
/node_modules/get-proto/.eslintrc
|
||||
/node_modules/get-proto/.nycrc
|
||||
/node_modules/get-proto/CHANGELOG.md
|
||||
/node_modules/get-proto/index.d.ts
|
||||
/node_modules/get-proto/index.js
|
||||
/node_modules/get-proto/LICENSE
|
||||
/node_modules/get-proto/Object.getPrototypeOf.d.ts
|
||||
/node_modules/get-proto/Object.getPrototypeOf.js
|
||||
/node_modules/get-proto/package.json
|
||||
/node_modules/get-proto/README.md
|
||||
/node_modules/get-proto/Reflect.getPrototypeOf.d.ts
|
||||
/node_modules/get-proto/Reflect.getPrototypeOf.js
|
||||
/node_modules/get-proto/tsconfig.json
|
||||
/node_modules/gopd/.github/FUNDING.yml
|
||||
/node_modules/gopd/test/index.js
|
||||
/node_modules/gopd/.eslintrc
|
||||
/node_modules/gopd/CHANGELOG.md
|
||||
/node_modules/gopd/gOPD.d.ts
|
||||
/node_modules/gopd/gOPD.js
|
||||
/node_modules/gopd/index.d.ts
|
||||
/node_modules/gopd/index.js
|
||||
/node_modules/gopd/LICENSE
|
||||
/node_modules/gopd/package.json
|
||||
/node_modules/gopd/README.md
|
||||
/node_modules/gopd/tsconfig.json
|
||||
/node_modules/has-symbols/.github/FUNDING.yml
|
||||
/node_modules/has-symbols/test/shams/core-js.js
|
||||
/node_modules/has-symbols/test/shams/get-own-property-symbols.js
|
||||
/node_modules/has-symbols/test/index.js
|
||||
/node_modules/has-symbols/test/tests.js
|
||||
/node_modules/has-symbols/.eslintrc
|
||||
/node_modules/has-symbols/.nycrc
|
||||
/node_modules/has-symbols/CHANGELOG.md
|
||||
/node_modules/has-symbols/index.d.ts
|
||||
/node_modules/has-symbols/index.js
|
||||
/node_modules/has-symbols/LICENSE
|
||||
/node_modules/has-symbols/package.json
|
||||
/node_modules/has-symbols/README.md
|
||||
/node_modules/has-symbols/shams.d.ts
|
||||
/node_modules/has-symbols/shams.js
|
||||
/node_modules/has-symbols/tsconfig.json
|
||||
/node_modules/has-tostringtag/.github/FUNDING.yml
|
||||
/node_modules/has-tostringtag/test/shams/core-js.js
|
||||
/node_modules/has-tostringtag/test/shams/get-own-property-symbols.js
|
||||
/node_modules/has-tostringtag/test/index.js
|
||||
/node_modules/has-tostringtag/test/tests.js
|
||||
/node_modules/has-tostringtag/.eslintrc
|
||||
/node_modules/has-tostringtag/.nycrc
|
||||
/node_modules/has-tostringtag/CHANGELOG.md
|
||||
/node_modules/has-tostringtag/index.d.ts
|
||||
/node_modules/has-tostringtag/index.js
|
||||
/node_modules/has-tostringtag/LICENSE
|
||||
/node_modules/has-tostringtag/package.json
|
||||
/node_modules/has-tostringtag/README.md
|
||||
/node_modules/has-tostringtag/shams.d.ts
|
||||
/node_modules/has-tostringtag/shams.js
|
||||
/node_modules/has-tostringtag/tsconfig.json
|
||||
/node_modules/hasown/.github/FUNDING.yml
|
||||
/node_modules/hasown/.nycrc
|
||||
/node_modules/hasown/CHANGELOG.md
|
||||
/node_modules/hasown/index.d.ts
|
||||
/node_modules/hasown/index.js
|
||||
/node_modules/hasown/LICENSE
|
||||
/node_modules/hasown/package.json
|
||||
/node_modules/hasown/README.md
|
||||
/node_modules/hasown/tsconfig.json
|
||||
/node_modules/husky/bin.js
|
||||
/node_modules/husky/husky
|
||||
/node_modules/husky/index.d.ts
|
||||
/node_modules/husky/index.js
|
||||
/node_modules/husky/LICENSE
|
||||
/node_modules/husky/package.json
|
||||
/node_modules/husky/README.md
|
||||
/node_modules/json-bigint/lib/parse.js
|
||||
/node_modules/json-bigint/lib/stringify.js
|
||||
/node_modules/json-bigint/index.js
|
||||
/node_modules/json-bigint/LICENSE
|
||||
/node_modules/json-bigint/package.json
|
||||
/node_modules/json-bigint/README.md
|
||||
/node_modules/math-intrinsics/.github/FUNDING.yml
|
||||
/node_modules/math-intrinsics/constants/maxArrayLength.d.ts
|
||||
/node_modules/math-intrinsics/constants/maxArrayLength.js
|
||||
/node_modules/math-intrinsics/constants/maxSafeInteger.d.ts
|
||||
/node_modules/math-intrinsics/constants/maxSafeInteger.js
|
||||
/node_modules/math-intrinsics/constants/maxValue.d.ts
|
||||
/node_modules/math-intrinsics/constants/maxValue.js
|
||||
/node_modules/math-intrinsics/test/index.js
|
||||
/node_modules/math-intrinsics/.eslintrc
|
||||
/node_modules/math-intrinsics/abs.d.ts
|
||||
/node_modules/math-intrinsics/abs.js
|
||||
/node_modules/math-intrinsics/CHANGELOG.md
|
||||
/node_modules/math-intrinsics/floor.d.ts
|
||||
/node_modules/math-intrinsics/floor.js
|
||||
/node_modules/math-intrinsics/isFinite.d.ts
|
||||
/node_modules/math-intrinsics/isFinite.js
|
||||
/node_modules/math-intrinsics/isInteger.d.ts
|
||||
/node_modules/math-intrinsics/isInteger.js
|
||||
/node_modules/math-intrinsics/isNaN.d.ts
|
||||
/node_modules/math-intrinsics/isNaN.js
|
||||
/node_modules/math-intrinsics/isNegativeZero.d.ts
|
||||
/node_modules/math-intrinsics/isNegativeZero.js
|
||||
/node_modules/math-intrinsics/LICENSE
|
||||
/node_modules/math-intrinsics/max.d.ts
|
||||
/node_modules/math-intrinsics/max.js
|
||||
/node_modules/math-intrinsics/min.d.ts
|
||||
/node_modules/math-intrinsics/min.js
|
||||
/node_modules/math-intrinsics/mod.d.ts
|
||||
/node_modules/math-intrinsics/mod.js
|
||||
/node_modules/math-intrinsics/package.json
|
||||
/node_modules/math-intrinsics/pow.d.ts
|
||||
/node_modules/math-intrinsics/pow.js
|
||||
/node_modules/math-intrinsics/README.md
|
||||
/node_modules/math-intrinsics/round.d.ts
|
||||
/node_modules/math-intrinsics/round.js
|
||||
/node_modules/math-intrinsics/sign.d.ts
|
||||
/node_modules/math-intrinsics/sign.js
|
||||
/node_modules/math-intrinsics/tsconfig.json
|
||||
/node_modules/mime-db/db.json
|
||||
/node_modules/mime-db/HISTORY.md
|
||||
/node_modules/mime-db/index.js
|
||||
/node_modules/mime-db/LICENSE
|
||||
/node_modules/mime-db/package.json
|
||||
/node_modules/mime-db/README.md
|
||||
/node_modules/mime-types/HISTORY.md
|
||||
/node_modules/mime-types/index.js
|
||||
/node_modules/mime-types/LICENSE
|
||||
/node_modules/mime-types/package.json
|
||||
/node_modules/mime-types/README.md
|
||||
/node_modules/proxy-from-env/index.js
|
||||
/node_modules/proxy-from-env/LICENSE
|
||||
/node_modules/proxy-from-env/package.json
|
||||
/node_modules/proxy-from-env/README.md
|
||||
/node_modules/.package-lock.json
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
- 仓库根目录:`/root/.openclaw/workspace/his-repo`
|
||||
- 分支:`develop`
|
||||
- 标准启动路径:`cd openhis-server-new && mvn compile -pl openhis-application -am`
|
||||
- 标准启动路径:`cd healthlink-his-server && mvn compile -pl healthlink-his-application -am`
|
||||
- 标准验证路径:`bash .harness/check.sh`(一键全部门禁)
|
||||
- 标准初始化:`bash .harness/init.sh`
|
||||
- 标准作业流程:`.harness/STANDARD_OPERATING_PROCEDURE.md`
|
||||
|
||||
@@ -85,7 +85,7 @@ git status --short
|
||||
|
||||
```bash
|
||||
# L1: 编译检查
|
||||
cd openhis-server-new && mvn compile -pl openhis-application -am
|
||||
cd healthlink-his-server && mvn compile -pl healthlink-his-application -am
|
||||
|
||||
# L2: 全链路门禁
|
||||
bash .harness/check.sh
|
||||
|
||||
@@ -37,7 +37,7 @@ echo "╚═══════════════════════
|
||||
# ── L1: 编译检查 ──
|
||||
echo ""
|
||||
echo "╔══ L1 编译检查 ══════════════════════╗"
|
||||
check "L1" "后端编译" "cd '$ROOT_DIR/openhis-server-new' && mvn compile -pl openhis-application -am -q"
|
||||
check "L1" "后端编译" "cd '$ROOT_DIR/healthlink-his-server' && mvn compile -pl healthlink-his-application -am -q"
|
||||
|
||||
# ── L2: 全链路检查 ──
|
||||
echo ""
|
||||
@@ -50,7 +50,7 @@ check "L2" "PROGRESS.md 存在" "test -f '$ROOT_DIR/.harness/PROGRESS.md'"
|
||||
check "L2" "feature_list.json 有效" "python3 -c 'import json; json.load(open(\"$ROOT_DIR/.harness/feature_list.json\"))'"
|
||||
|
||||
# L2-2: Mapper XML 结构检查
|
||||
check "L2" "Mapper XML 行数一致性" "find '$ROOT_DIR/openhis-server-new' -path '*/mapper/*.xml' -exec wc -l {} + 2>/dev/null | tail -1 | awk '{print \$1}' | xargs test 0 -lt"
|
||||
check "L2" "Mapper XML 行数一致性" "find '$ROOT_DIR/healthlink-his-server' -path '*/mapper/*.xml' -exec wc -l {} + 2>/dev/null | tail -1 | awk '{print \$1}' | xargs test 0 -lt"
|
||||
|
||||
# ── L3: 约束合规检查 ──
|
||||
echo ""
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"project": "OpenHIS",
|
||||
"project": "HealthLink-HIS",
|
||||
"last_updated": "2026-05-28",
|
||||
"rules": {
|
||||
"single_active_feature": true,
|
||||
|
||||
@@ -13,8 +13,8 @@ git log --oneline -3 2>/dev/null || true
|
||||
|
||||
echo ""
|
||||
echo "==> 编译检查"
|
||||
cd openhis-server-new
|
||||
mvn compile -pl openhis-application -am -q 2>/dev/null && echo " ✅ 编译通过" || echo " ❌ 编译失败"
|
||||
cd healthlink-his-server
|
||||
mvn compile -pl healthlink-his-application -am -q 2>/dev/null && echo " ✅ 编译通过" || echo " ❌ 编译失败"
|
||||
|
||||
echo ""
|
||||
echo "==> 读取进度"
|
||||
|
||||
@@ -24,6 +24,6 @@
|
||||
|
||||
## 命令速查
|
||||
|
||||
- 编译:`cd openhis-server-new && mvn compile -pl openhis-application -am`
|
||||
- 编译:`cd healthlink-his-server && mvn compile -pl healthlink-his-application -am`
|
||||
- 打包:`mvn clean package -DskipTests`
|
||||
- 启动:`mvn spring-boot:run`
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"version": 1,
|
||||
"setupCompletedAt": "2026-04-06T04:43:29.304Z"
|
||||
}
|
||||
318
AGENTS.md
318
AGENTS.md
@@ -1,318 +0,0 @@
|
||||
# OpenHIS — Harness Engineering 开发指南
|
||||
|
||||
> **模型决定上限,Harness 决定底线。**
|
||||
> 本文件是 OpenHIS 项目的 Harness Engineering 落地。整合了 OpenAI/Anthropic Harness Engineering 方法论与 walkinglabs 实战模式。
|
||||
|
||||
> **🔴 铁律统一文件**: `/root/.codex/rules/IRON_LAWS.md` — 所有智能体必须遵守,运行时自动加载。
|
||||
> **📦 技能包安装**: https://github.com/paskaa/agentforge-harness-skill — 其他电脑一键安装所有铁律和技能。
|
||||
|
||||
---
|
||||
|
||||
## 📋 项目信息
|
||||
|
||||
OpenHIS 医院管理系统 | Java 17 + Spring Boot + MyBatis Plus | Vue 3 + Element Plus | PostgreSQL
|
||||
|
||||
### 构建和运行
|
||||
|
||||
```bash
|
||||
cd /root/.openclaw/workspace/his-repo
|
||||
|
||||
# 初始化(每次新会话先运行)
|
||||
bash .harness/init.sh
|
||||
|
||||
# 后端编译
|
||||
cd openhis-server-new && mvn compile -pl openhis-application -am
|
||||
|
||||
# 后端打包
|
||||
mvn clean package -DskipTests
|
||||
|
||||
# 后端运行
|
||||
cd openhis-application && mvn spring-boot:run
|
||||
|
||||
# 前端
|
||||
cd openhis-ui-vue3 && npm install && npm run dev
|
||||
```
|
||||
|
||||
### 关键路径
|
||||
|
||||
```
|
||||
后端代码: openhis-server-new/openhis-application/src/main/java/com/
|
||||
后端配置: openhis-server-new/openhis-application/src/main/resources/
|
||||
Mapper XML: .../mapper/ (regdoctorstation/, doctorstation/, ...)
|
||||
前端代码: openhis-ui-vue3/src/
|
||||
Harness: .harness/ (init.sh, PROGRESS.md, feature_list.json, ...)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔧 5 子系统模型(WalkingLabs)
|
||||
|
||||
> 源自:[Learn Harness Engineering](https://walkinglabs.github.io/learn-harness-engineering/zh/)
|
||||
|
||||
### 1. 指令子系统(Instruction)
|
||||
|
||||
| 文件 | 用途 |
|
||||
|---|---|
|
||||
| **AGENTS.md**(本文件) | 项目规则、约束、工作流程 |
|
||||
| `.harness/feature_list.json` | 机器可读的功能状态追踪 |
|
||||
| `.harness/PROGRESS.md` | 会话进度和已验证状态 |
|
||||
| `.harness/session-handoff.md` | 跨会话交接摘要 |
|
||||
|
||||
### 2. 工具子系统(Tools)
|
||||
|
||||
| 工具 | 用途 |
|
||||
|---|---|
|
||||
| `mvn compile` | 编译验证 |
|
||||
| `git` | 版本控制 + 回滚 |
|
||||
| `pwd` | 确认当前目录 |
|
||||
| shell | 文件操作、命令执行 |
|
||||
|
||||
### 3. 环境子系统(Environment)
|
||||
|
||||
| 组件 | 状态 |
|
||||
|---|---|
|
||||
| Java 17 | ✅ `pom.xml` 锁定 |
|
||||
| Maven | ✅ `mvn-wrapper` |
|
||||
| PostgreSQL | ✅ 192.168.110.252:15432 |
|
||||
| Node.js | ✅ `package.json` 锁定 |
|
||||
|
||||
### 4. 状态子系统(State)
|
||||
|
||||
| 机制 | 用途 |
|
||||
|---|---|
|
||||
| `update_plan` | 当前步骤检查点 |
|
||||
| `.harness/PROGRESS.md` | 跨会话进度记录 |
|
||||
| `.harness/feature_list.json` | 功能状态跟踪 |
|
||||
| `git log` | 变更历史追溯 |
|
||||
|
||||
### 5. 反馈子系统(Feedback)
|
||||
|
||||
| 层级 | 命令 | 时间 |
|
||||
|---|---|---|
|
||||
| L1 编译 | `mvn compile -pl openhis-application -am` | <30 秒 |
|
||||
| L2 全链路 | 六环检查清单(见下文) | <5 分钟 |
|
||||
| L3 审查 | 你人工审查 diff | 10-30 分钟 |
|
||||
|
||||
---
|
||||
|
||||
## 📋 标准工作循环
|
||||
|
||||
```
|
||||
开始会话
|
||||
│
|
||||
├→ 1. Init
|
||||
│ ├── bash .harness/init.sh
|
||||
│ ├── 读取 PROGRESS.md / feature_list.json
|
||||
│ ├── git log --oneline -5
|
||||
│ └── 确认编译通过
|
||||
│
|
||||
├→ 2. Plan
|
||||
│ ├── update_plan / checklist_write 分解步骤
|
||||
│ ├── 评估复杂度/风险
|
||||
│ └── 设定检查点
|
||||
│
|
||||
├→ 3. Implement
|
||||
│ ├── 一次只做一个功能
|
||||
│ ├── 全链路检查清单核对
|
||||
│ └── 增量修改,只动必要文件
|
||||
│
|
||||
├→ 4. Verify
|
||||
│ ├── L1: mvn compile
|
||||
│ ├── L2: 全链路数据流验证
|
||||
│ └── 生成变更摘要
|
||||
│
|
||||
└→ 5. Cleanup
|
||||
├── 运行 clean-state-checklist.md
|
||||
├── 更新 PROGRESS.md + feature_list.json
|
||||
├── git add + commit + push
|
||||
└── init.sh 确认干净状态
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔗 全链路修复原则
|
||||
|
||||
修 Bug 时,不得"就事论事",必须走通完整的**数据流全链路**:
|
||||
|
||||
### 六环检查清单
|
||||
|
||||
```
|
||||
1. 录入 → 前端有无输入入口?(弹窗、行编辑、表单...)
|
||||
2. 保存 → 前端 → API → Controller → Service → Entity → DB,
|
||||
每个保存入口都传了该字段吗?
|
||||
3. 查询 → DB → Mapper XML(UNION ALL 子查询统一加)→ DTO → 前端展示
|
||||
4. 修改 → 编辑回显 → 修改保存 → 正确更新?
|
||||
5. 删除 → 状态变更会丢失该字段吗?
|
||||
6. 关联 → 上下游(护士站、计费、打印、报表)需要同步改吗?
|
||||
```
|
||||
|
||||
### 常见陷阱
|
||||
|
||||
| 陷阱 | 解决 |
|
||||
|---|---|
|
||||
| 只修主入口,批量保存/签发保存漏了 | 检查所有 Service 实现类 |
|
||||
| 前端加了后端没传 | 逐个入口确认 |
|
||||
| UNION ALL 只改一半 | 所有子查询统一加 |
|
||||
| DTO 继承链没检查 | 检查父类/子类字段一致性 |
|
||||
| 只测新增没测编辑 | 新增和编辑都要测 |
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 🚨 铁律(不可违反 — 来自实际 Bug 教训)
|
||||
|
||||
### 状态值一致性
|
||||
涉及状态流转的 Bug,修改前**必须**列出完整链路并逐项检查:
|
||||
1. 枚举定义(如 `SlotStatus`、`OrderStatus`)的数值
|
||||
2. Service 层设置的状态值是否与枚举一致
|
||||
3. 查询/列表接口的状态映射是否覆盖所有枚举值
|
||||
4. 前端 `STATUS_CLASS_MAP` 是否包含新状态
|
||||
5. 前端过滤条件(`v-if`、`v-for`)是否兼容新状态
|
||||
6. 池/统计表的聚合 SQL 是否包含新状态值
|
||||
|
||||
**禁止**:只改一端不检查其他端。必须全链路对齐。
|
||||
|
||||
### 禁止删除源文件
|
||||
- **绝对禁止**删除项目中已有的 Java/Vue/SQL 源文件
|
||||
- 编译错误 → 修复错误,不删除文件
|
||||
- 重复文件 → 重构合并,不删除文件
|
||||
- AI 幻觉文件 → 检查 `git ls-tree baseline -- <file>` 确认后再删除
|
||||
- **唯一例外**:人类明确确认删除
|
||||
|
||||
### 全链路验证(状态流转 Bug 必做)
|
||||
修复后按以下顺序验证,**编译通过不等于修复完成**:
|
||||
```
|
||||
① 数据库:SELECT status FROM table WHERE id = ? → 确认写入正确
|
||||
② 后端接口:检查所有 if/switch 分支 → 确认映射正确
|
||||
③ 前端显示:检查 STATUS_CLASS_MAP → 确认文本正确
|
||||
④ 前端交互:检查 v-if/v-for/disabled → 确认按钮状态正确
|
||||
⑤ 统计数据:检查聚合 SQL → 确认统计包含新状态
|
||||
```
|
||||
|
||||
### 数据库变更必须通过 Flyway 迁移(铁律)
|
||||
凡涉及**新建表、新增字段、修改字段、加索引**等 DDL 变更,**必须**通过 Flyway 框架实现:
|
||||
1. 在 `openhis-server-new/openhis-application/src/main/resources/db/migration/` 创建 `V{n}__描述.sql`
|
||||
2. 版本号递增(`V2`, `V3`, `V4`...),双下划线分隔
|
||||
3. **禁止**直接在数据库执行 DDL 而不创建迁移文件
|
||||
4. **禁止**修改已执行的迁移文件(Flyway 会校验 checksum)
|
||||
5. 新表必须包含:`tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `valid_flag`
|
||||
6. 多租户表还需在 `MybatisPlusConfig.java` 的 `TENANT_TABLES` 中注册
|
||||
7. 详细使用指南见 `docs/FLYWAY_USAGE_GUIDE.md`
|
||||
|
||||
### 禁止修改已有公开方法签名
|
||||
- 不能删除或重命名已有的 public 方法
|
||||
- 不能修改已有方法的参数列表
|
||||
- 需要新功能 → 添加重载方法
|
||||
- 需要改行为 → 修改方法内部实现
|
||||
|
||||
### 状态变更影响面分析(来自 Bug #574→575 教训)
|
||||
改任何状态枚举值前,**必须**执行影响面分析:
|
||||
1. `rg "原状态枚举名" --type java` 列出所有引用文件
|
||||
2. 逐个检查:设置值?查询过滤?显示映射?统计聚合?
|
||||
3. 检查逆向流程:退号、取消、停诊是否兼容新状态
|
||||
4. 检查 XML mapper 中所有查询过滤条件
|
||||
5. 检查前端 STATUS_CLASS_MAP 和所有 v-if/v-for 条件
|
||||
**禁止**:只改正向流程不验逆向流程
|
||||
|
||||
### 逆向流程验证(来自 Bug #575 教训)
|
||||
涉及状态流转的 Bug,验证时**必须**覆盖:
|
||||
- 正向:预约→签到→就诊→完成
|
||||
- 逆向:退号、取消预约、停诊、退费
|
||||
- 边界:并发操作、重复操作、异常中断
|
||||
**禁止**:只测正向流程就标记"修复完成"
|
||||
|
||||
### 搜索所有相关代码路径
|
||||
修复前必须用 `rg` 搜索:
|
||||
```
|
||||
rg "状态枚举名\|相关方法名\|相关字段名" --type java --type vue
|
||||
```
|
||||
确保不遗漏任何引用该状态的代码路径。
|
||||
|
||||
## 📐 代码风格规范
|
||||
|
||||
### Java 后端
|
||||
|
||||
| 项目 | 规范 |
|
||||
|---|---|
|
||||
| 包结构 | `com.openhis`(业务)、`com.core`(核心) |
|
||||
| 命名 | 类 PascalCase、方法 camelCase、常量 SCREAMING_SNAKE_CASE |
|
||||
| 注解 | `@Slf4j`、`@Data`、`@Service/@Controller/@Repository` |
|
||||
| 异常 | 统一异常处理,业务异常继承 `RuntimeException` |
|
||||
| 缩进 | 4 空格,行 120 字符 |
|
||||
|
||||
### Vue 前端
|
||||
|
||||
| 项目 | 规范 |
|
||||
|---|---|
|
||||
| 框架 | Vue 3 + Composition API + Element Plus + Pinia |
|
||||
| 命名 | 组件 PascalCase、文件 kebab-case、变量 camelCase |
|
||||
| 缩进 | 2 空格,单引号,行 100 字符 |
|
||||
|
||||
### 导入顺序
|
||||
|
||||
**Java:** `java.*` → `javax.*` → 第三方 → `com.core.*` → `com.openhis.*`
|
||||
**Vue:** `vue` 相关 → 第三方 → `@/` 别名 → 相对路径
|
||||
|
||||
---
|
||||
|
||||
## 🏗️ 开发约定
|
||||
|
||||
| 领域 | 约定 |
|
||||
|---|---|
|
||||
| API | RESTful,统一响应格式,Swagger 文档 |
|
||||
| 数据库 | snake_case 命名,主键 `id`,软删除 `valid_flag` |
|
||||
| 安全 | 所有 API 需权限验证,SQL 注入/XSS 防护 |
|
||||
| 性能 | Druid 连接池,路由懒加载,虚拟滚动 |
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ 关键配置
|
||||
|
||||
| 项目 | 值 |
|
||||
|---|---|
|
||||
| 后端端口 | 18080 |
|
||||
| 前端端口 | 81 |
|
||||
| API 前缀 | `/openhis` |
|
||||
| Swagger | `/openhis/swagger-ui/index.html` |
|
||||
| 后端配置 | `application.yml` / `application-{profile}.yml` |
|
||||
| 前端配置 | `vite.config.js` / `.env.*` |
|
||||
|
||||
---
|
||||
|
||||
## 📈 过往 Bug 教训
|
||||
|
||||
| Bug | 教训 |
|
||||
|---|---|
|
||||
| #574 | `checkInTicket()` 状态值写错(BOOKED→应为CHECKED_IN),前端映射缺失,池统计漏计。根因:没走完整状态链路 |
|
||||
| #574 | AI 智能体看到编译错误直接删文件,没检查 git baseline。根因:没验证文件来源 |
|
||||
| #574 | 多次 fallback 修复改错文件(OrderServiceImpl),没触及真正问题(TicketServiceImpl)。根因:没用 rg 搜索所有引用 |
|
||||
|
||||
## 📈 成熟度追踪
|
||||
|
||||
| 等级 | 特征 | 本项目 |
|
||||
|---|---|---|
|
||||
| **L1 初始** | 零星使用 AI 工具 | ✅ 已超越 |
|
||||
| **L2 管理** | 基础约束 + 反馈 + 控制 | ✅ **当前** |
|
||||
| **L3 定义** | 标准化、可复用 | 🔄 walkinglabs 5 子系统整合 |
|
||||
| **L4 量化** | 数据驱动优化 | ⏳ |
|
||||
| **L5 优化** | AI 自主优化 Harness | ⏳ |
|
||||
|
||||
---
|
||||
|
||||
## 📚 技能索引(Codex 内置)
|
||||
|
||||
| 技能 | 用途 |
|
||||
|---|---|
|
||||
| `$harness-engineering` | 主方法论 — 约束 + 反馈 + 控制 + 持久 |
|
||||
| `$walkinglabs-harness` | 实战模式 — 5 子系统 + 模板 + 会话持续 |
|
||||
| `$durable-execution` | 检查点、幂等性、事件溯源 |
|
||||
| `$closed-loop-testing` | 质量门禁、测试策略、反馈循环 |
|
||||
| `$constraint-design` | DSL 设计、策略模式、约束编排 |
|
||||
| `$review-audit` | 审查工作流、审计追踪、合规检查 |
|
||||
| `$full-chain-fix` | 全链路数据流修复 |
|
||||
| `$karpathy-guidelines` | 减少 LLM 编码常见错误 |
|
||||
|
||||
---
|
||||
|
||||
> **总纲:** 你负责"做什么"和"为什么",Agent 负责"怎么做"和"做多好"
|
||||
> **工作循环:** Init → Plan → Implement → Verify → Cleanup
|
||||
28
ANALYSIS.md
28
ANALYSIS.md
@@ -1,28 +0,0 @@
|
||||
|
||||
## Bug #426 修复报告
|
||||
|
||||
### 根因分析
|
||||
Element Plus `el-table` 的懒加载树形模式(`lazy` + `:load` + `tree-props="{ hasChildren: 'hasChildren' }"`)要求每一行数据必须包含 `hasChildren: true` 属性,才会在该行前渲染展开箭头(+ / -)。
|
||||
|
||||
代码中所有创建 `selectedItems` 行对象的路径(共7处)都正确设置了 `isPackage: true` 和 `packageId`,但**遗漏了 `hasChildren` 属性**,导致树形表格无法识别哪些行是可展开的套餐项。
|
||||
|
||||
### 影响范围
|
||||
- **文件**: `examinationApplication.vue`(前端)
|
||||
- **涉及函数**: `handleItemSelect`、`handleMethodSelect`、`handleRowClick`、`onDetailMethodChange`
|
||||
- **数据表**: 无数据库变更
|
||||
|
||||
### 修复方案
|
||||
在7处代码路径中,当 `packageId` 存在时同步设置 `hasChildren: true`:
|
||||
1. `handleRowClick` 初始 item 创建: `hasChildren: false`
|
||||
2. `handleRowClick` 回充时设置 `isPackage` 两处: `hasChildren: true`
|
||||
3. `handleMethodSelect` 已存在项更新: `hasChildren: true`
|
||||
4. `handleMethodSelect` 新项创建: `hasChildren: !!(method.packageId || targetItem.packageId)`
|
||||
5. `handleItemSelect` 新行创建: `hasChildren: !!(item.packageId)`
|
||||
6. `onDetailMethodChange` 方法切换: `hasChildren: true`
|
||||
|
||||
### 验证计划
|
||||
- 在门诊医生站选择检查套餐后,"检查明细" tab 的树形表格应显示展开箭头
|
||||
- 点击展开箭头应懒加载套餐明细(项目名称、数量、单价)
|
||||
- 回充已保存申请单时套餐项应正确显示展开箭头
|
||||
|
||||
修复结果:✅ 成功,13行改动
|
||||
@@ -1,54 +0,0 @@
|
||||
# Bug #433 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题1:麻醉方法回显为代码
|
||||
|
||||
**数据流**:
|
||||
1. 数据库 `op_schedule.anes_method` 字段为 VARCHAR,存值为字典代码字符串如 `"2"`
|
||||
2. 后端 `OpSchedule.anesMethod` 为 String 类型,通过 `getSurgeryScheduleDetail` 查询返回
|
||||
3. 前端 el-select 选项通过 `useDict('anesthesia_type')` 加载,选项值为 `Number(item.value)` 即数字类型
|
||||
4. `handleEdit` 中 `Object.assign(form, data)` 后 `form.anesMethod` 为字符串 `"2"`
|
||||
|
||||
**根因**: `form.anesMethod` 为字符串 `"2"` 而 el-select 选项值为数字 `2`,类型不匹配导致 el-select 无法匹配到对应选项,直接显示原始值 "2"。
|
||||
|
||||
**现有代码的问题**: 代码中有两行转换逻辑:
|
||||
```javascript
|
||||
if (data.anesMethod != null) form.anesMethod = Number(data.anesMethod) // OK
|
||||
if (data.anesthesiaTypeEnum != null) form.anesMethod = Number(data.anesthesiaTypeEnum) // 多余
|
||||
```
|
||||
第二行 `data.anesthesiaTypeEnum` 不是 `OpScheduleDto` 的字段,SQL 查询也不包含此字段,因此永远为 null。但如果某些情况下后端返回了此字段(例如值为 0),会错误覆盖第一行的正确赋值。
|
||||
|
||||
### 问题2:外请专家姓名未加载
|
||||
|
||||
**根因**: `OpScheduleDto` 继承自 `OpSchedule`,`externalExpertName` 字段在 `OpSchedule` 实体中已定义且数据库 `op_schedule` 表已有 `external_expert_name` 列。`getSurgeryScheduleDetail` 查询使用 `SELECT os.*`,会返回该字段。前端 `form` 中也已定义 `externalExpertName`。
|
||||
|
||||
经数据库查询验证,当前数据中 `external_expert_name` 字段确实为空(尚未有用户填写过此字段)。但需确保 `Object.assign` 正确映射,且 `isExternalExpert` 类型匹配 el-radio 的 `:value="1"` / `:value="0"`。
|
||||
|
||||
## 影响范围
|
||||
|
||||
- **前端**: `openhis-ui-vue3/src/views/surgicalschedule/index.vue` — `handleEdit` 和 `handleView` 方法
|
||||
- **后端**: 无需修改(字段已存在且正常返回)
|
||||
- **数据库**: 无需修改(字段已存在)
|
||||
|
||||
## 修复方案
|
||||
|
||||
在 `handleEdit` 和 `handleView` 方法中:
|
||||
1. 删除多余的 `anesthesiaTypeEnum` 转换行
|
||||
2. 使用 `$nextTick` 确保类型转换在 `Object.assign` 后在下一个 tick 执行,确保 Vue 响应式系统已处理完 `Object.assign` 的变更后再设置值
|
||||
3. 统一确保所有字典类型字段(`anesMethod`、`incisionType`、`isExternalExpert`、`isFirstSurgery`)类型正确
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 修改后用 `node --check` 验证 .vue 语法
|
||||
2. 确认 git diff 改动 ≥ 3 行
|
||||
|
||||
## 修复结果
|
||||
|
||||
✅ 成功,28行改动(handleEdit 和 handleView 各 7 行 × 2 函数)
|
||||
|
||||
### 改动摘要
|
||||
|
||||
1. **删除错误行**: `if (data.anesthesiaTypeEnum != null) form.anesMethod = Number(data.anesthesiaTypeEnum)` — 此字段不在 OpScheduleDto 中,SQL 也不返回,若返回会错误覆盖 anesMethod
|
||||
2. **使用 nextTick 包裹类型转换**: 确保 Object.assign 触发的 Vue 响应式更新完成后再设置字典字段值,避免 el-select 在 DOM 更新前无法匹配选项
|
||||
3. **同时修复 handleEdit 和 handleView**: 两处代码一致,均需要同步修复
|
||||
@@ -1,50 +0,0 @@
|
||||
# Bug #434 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题:编辑弹窗中"切口类型"字段未正确回显数据
|
||||
|
||||
**数据流追踪**:
|
||||
1. 用户点击"编辑"→ 前端调用 `getSurgeryScheduleDetail(row.scheduleId)`
|
||||
2. 后端 SQL: `cs.incision_level AS incisionLevel`
|
||||
3. PostgreSQL 返回列名: `incisionlevel` (全小写)
|
||||
4. MyBatis 尝试将 `incisionlevel` 映射到 `OpScheduleDto.incisionLevel`
|
||||
5. 映射失败!→ `data.incisionLevel` 为 null → `form.incisionType` 保持 undefined → el-select 显示空白
|
||||
|
||||
### 根因:PostgreSQL 小写化未加引号的列别名
|
||||
|
||||
PostgreSQL 会将未加双引号的列别名自动转为小写:
|
||||
```sql
|
||||
-- SQL 写的别名
|
||||
cs.incision_level AS incisionLevel
|
||||
-- PostgreSQL 实际返回的列名
|
||||
incisionlevel ← 全小写!
|
||||
```
|
||||
|
||||
MyBatis 收到列名 `incisionlevel`(全小写),尝试匹配 Java 属性 `incisionLevel`(驼峰)。由于 `mapUnderscoreToCamelCase` 只对含下划线的列生效(`incisionlevel` 无下划线),匹配失败。
|
||||
|
||||
**对比 `anes_method` 为什么能工作**:
|
||||
- SQL: `os.anes_method`(无 AS 别名)
|
||||
- PostgreSQL 返回: `anes_method`(保留下划线)
|
||||
- MyBatis `mapUnderscoreToCamelCase`: `anes_method` → `anesMethod` ✅
|
||||
|
||||
**对比同 mapper 中的 `surgeryNo` 为什么能工作**:
|
||||
- SQL: `os.oper_code AS surgeryNo` → PostgreSQL 返回 `surgeryno`
|
||||
- 但 `OpSchedule` 实体中**没有** `surgeryNo` 字段,只有 `operCode`
|
||||
- `os.oper_code` 列映射到 `operCode` 是通过 `mapUnderscoreToCamelCase` 正常工作的
|
||||
- `surgeryno` 找不到对应属性,被 MyBatis 忽略(不影响功能)
|
||||
|
||||
### 修复方案
|
||||
|
||||
将 SQL 中的别名加双引号:`cs.incision_level AS "incisionLevel"`
|
||||
|
||||
PostgreSQL 对加双引号的标识符保持大小写,返回列名 `incisionLevel`(驼峰),MyBatis 可直接匹配到 `OpScheduleDto.incisionLevel` 属性。
|
||||
|
||||
### 影响范围
|
||||
- **后端**: `SurgicalScheduleAppMapper.xml` — `getSurgeryScheduleDetail` 查询(第92行)
|
||||
- **前端**: 无需修改(`handleEdit`/`handleView` 中的 nextTick 转换逻辑已正确)
|
||||
- **数据库**: 无需修改(`cli_surgery.incision_level` 字段已存在且有数据)
|
||||
|
||||
## 验证计划
|
||||
1. 修改 SQL 后,运行相同查询验证列名变为 `incisionLevel`
|
||||
2. 确认前端 `node --check` 语法通过
|
||||
@@ -1,61 +0,0 @@
|
||||
# Bug #516 深度分析报告
|
||||
|
||||
## Bug 描述
|
||||
[住院医生站-临床医嘱-检验申请] 检验申请单手动填写的"发往科室"与生成的医嘱执行科室不一致
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 前端 Bug(`laboratoryTests.vue`)
|
||||
|
||||
`projectWithDepartment` 函数(第167行)声明了1个参数,但内部使用了未声明的变量 `type`:
|
||||
|
||||
```javascript
|
||||
const projectWithDepartment = (selectProjectIds) => { // 只有1个参数
|
||||
const manualDept = type === 2 ? form.targetDepartment : ''; // type 未声明!
|
||||
...
|
||||
if (type === 2 && manualDept) { // type 未声明!
|
||||
```
|
||||
|
||||
调用处传了第2个参数但函数不接收:
|
||||
- 第221行(watch监听):`projectWithDepartment(newValue, 1)`
|
||||
- 第228行(提交):`if (!projectWithDepartment(transferValue.value, 2))`
|
||||
|
||||
**后果**:
|
||||
1. `type` 始终为 `undefined`,`type === 2` 永远为 false
|
||||
2. `manualDept` 永远为空字符串
|
||||
3. 用户手动选择的"发往科室"在提交时被清空
|
||||
4. 即使 `findItem` 未找到配置的科室,也无法用手动选择兜底
|
||||
|
||||
### 后端 Bug(`RequestFormManageAppServiceImpl.java`)
|
||||
|
||||
第165-171行:
|
||||
|
||||
```java
|
||||
Long positionId = activityOrganizationConfig.stream()
|
||||
.filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
|
||||
.map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
|
||||
if (positionId == null) {
|
||||
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
|
||||
}
|
||||
serviceRequest.setOrgId(positionId); // 完全忽略前端传的 positionId!
|
||||
```
|
||||
|
||||
后端从配置表 `adm_organization_location` 查找执行科室,完全无视前端传来的 `activitySaveDto.positionId`(即用户手动选择的"发往科室")。
|
||||
|
||||
### 数据流
|
||||
|
||||
1. 用户在前端选择检验项目 → 触发watch → `projectWithDepartment` 尝试自动设置科室
|
||||
2. 用户手动切换"发往科室"下拉框 → `form.targetDepartment` = 肝胆科ID
|
||||
3. 用户点击提交 → `projectWithDepartment(transferValue.value, 2)` 调用
|
||||
4. 因 `type` 未声明,手动选择的科室被清空 → `form.targetDepartment` = ''
|
||||
5. 前端构建提交参数:`positionId: item.positionId || form.targetDepartment` → 空值
|
||||
6. 后端收到请求,从配置表查默认科室(检验科) → `serviceRequest.setOrgId(检验科)`
|
||||
7. 医嘱列表中"药房/科室"列显示检验科,而非用户选择的肝胆科
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 前端修复(1行改动)
|
||||
在 `projectWithDepartment` 函数签名中添加 `type` 参数。
|
||||
|
||||
### 后端修复(3行改动)
|
||||
优先使用前端传来的 `positionId`,配置表作为兜底值。
|
||||
@@ -1,79 +0,0 @@
|
||||
# Bug #540 分析报告
|
||||
|
||||
## Bug 描述
|
||||
【住院医生站-检查申请】详情页弹窗中"申请单描述"区域缺少临床必要信息显示
|
||||
|
||||
## 数据流分析
|
||||
|
||||
### 前端组件
|
||||
- 入口: `src/views/inpatientDoctor/home/index.vue` → "检查申请" tab → `ExamineApplication`
|
||||
- 实际组件: `src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue`
|
||||
- 编辑表单组件: `src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue`
|
||||
|
||||
### 后端 API
|
||||
- 查询: `GET /reg-doctorstation/request-form/get-check` → `typeCode = '23'` (ActivityDefCategory.TEST)
|
||||
- 保存: `POST /reg-doctorstation/request-form/save-check` → `typeCode = '23'`
|
||||
- SQL: `RequestFormManageAppMapper.xml` 的 `getRequestForm` 查询,SELECT `drf.desc_json`
|
||||
- DTO: `RequestFormQueryDto` 有 `descJson` 字段 (String 类型)
|
||||
|
||||
### 数据库
|
||||
- 表: `doc_request_form`,type_code = '23' 的记录 desc_json 均有数据
|
||||
- descJson 包含: targetDepartment, urgencyLevel, symptom, sign, clinicalDiagnosis, otherDiagnosis, relatedResult, attention, examinationPurpose, medicalHistorySummary, allergyHistory, expectedExaminationTime 等
|
||||
|
||||
## 根因定位
|
||||
|
||||
对比检验申请 (testApplication.vue) 和检查申请 (examineApplication.vue) 的详情弹窗中"申请单描述"区域的渲染逻辑:
|
||||
|
||||
**testApplication.vue (检验申请) - 正确:**
|
||||
```vue
|
||||
<template v-for="(value, key) in descJsonData" :key="key">
|
||||
<el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
|
||||
{{ value || '-' }}
|
||||
</el-descriptions-item>
|
||||
</template>
|
||||
```
|
||||
- 遍历 `descJsonData` 的所有 key,只要 key 在 labelMap 中就显示
|
||||
- 空值显示为 '-'
|
||||
|
||||
**examineApplication.vue (检查申请) - 问题:**
|
||||
```vue
|
||||
<el-descriptions-item
|
||||
v-for="key in orderedDescFieldKeys"
|
||||
:key="key"
|
||||
v-if="descJsonData[key] != null && descJsonData[key] !== ''"
|
||||
:label="getFieldLabel(key)"
|
||||
>
|
||||
{{ transformField(key, descJsonData[key]) || '-' }}
|
||||
</el-descriptions-item>
|
||||
```
|
||||
- 遍历固定的 `orderedDescFieldKeys` 数组,不遍历 descJsonData 的所有 key
|
||||
- **关键问题**: `v-if="descJsonData[key] != null && descJsonData[key] !== ''"` 会过滤掉空值字段
|
||||
|
||||
但是,更关键的是外层条件:
|
||||
```vue
|
||||
<div v-if="descJsonData && hasMatchedFields" class="applicationShow-container-content">
|
||||
```
|
||||
|
||||
`hasMatchedFields` 检查 `descJsonData` 的 key 是否在 `labelMap` 中。`labelMap` 包含所有需要显示的字段。
|
||||
|
||||
**实际根因**:通过对比 testApplication.vue 与 examineApplication.vue,发现两个组件在 "申请单描述" 区域的渲染方式不同。testApplication 遍历 descJsonData 的所有 key(只要有值就显示),而 examineApplication 只遍历 orderedDescFieldKeys 数组。
|
||||
|
||||
**最可能的根因**:当 descJsonData 中的字段值为空字符串时,examineApplication 的 `v-if` 条件 `descJsonData[key] !== ''` 会过滤掉该字段(整行不显示),而 testApplication 会显示该字段标签并填入 `-`。
|
||||
|
||||
对于 `targetDepartment` 字段,`recursionFun` 函数在科室列表中找不到对应 ID 时会返回空字符串 `''`,导致 `targetDepartment` 被过滤不显示。
|
||||
|
||||
**但核心问题是**:如果 descJsonData 存在但某些字段为空,这些字段会被完全隐藏而不是显示 `-`。用户期望看到的是字段标签+占位符 `-`,而不是整个字段不显示。
|
||||
|
||||
## 修复方案
|
||||
|
||||
将 examineApplication.vue 中"申请单描述"区域的渲染方式改为与 testApplication.vue 一致:
|
||||
1. 遍历 `descJsonData` 的所有 key(而非固定 orderedDescFieldKeys)
|
||||
2. 使用 `isFieldMatched(key)` 过滤需要显示的字段
|
||||
3. 空值显示为 `-`(而非完全隐藏)
|
||||
|
||||
同时保留 `orderedDescFieldKeys` 用于打印功能(已有代码使用)。
|
||||
|
||||
## 变更文件
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue`(前端模板修改)
|
||||
|
||||
修复结果:✅ 成功,5行改动(+5/-8)
|
||||
@@ -1,91 +0,0 @@
|
||||
# Bug 根因分析与修复方案
|
||||
|
||||
## Bug 335 - 门诊医生站开立药品医嘱保存报错
|
||||
|
||||
### 问题分析
|
||||
根据代码分析,`DoctorStationAdviceAppServiceImpl.saveAdvice()` 方法处理药品医嘱保存时可能报错的原因:
|
||||
|
||||
1. **patientId/encounterId 为 null** - 删除操作时前端可能未传
|
||||
2. **accountId 为 null** - 患者账户信息未正确获取
|
||||
3. **definitionId/definitionDetailId 为 null** - 定价信息缺失
|
||||
4. **库存校验失败** - 药品库存不足
|
||||
|
||||
### 修复方案
|
||||
✅ 已部分修复(见代码中的 BugFix 注释)
|
||||
- 已添加 patientId/encounterId 自动补全逻辑
|
||||
- 已添加 accountId 自动创建逻辑
|
||||
- 需要进一步验证 definitionId 的处理
|
||||
|
||||
---
|
||||
|
||||
## Bug 336 - 门诊医生站开立诊疗项目保存报错
|
||||
|
||||
### 问题分析
|
||||
诊疗项目保存与药品类似,但有以下特殊点:
|
||||
|
||||
1. **必须选择执行科室** - 代码中有校验 `throw new ServiceException("诊疗项目必须选择执行科室")`
|
||||
2. **活动绑定设备处理** - 需要处理 `handService()` 中的设备绑定逻辑
|
||||
3. **库存校验** - 诊疗项目可能关联耗材
|
||||
|
||||
### 修复方案
|
||||
- 确保前端传递 executeDeptId(执行科室)
|
||||
- 检查 handService() 方法中的异常处理
|
||||
- 添加更详细的错误日志
|
||||
|
||||
---
|
||||
|
||||
## Bug 338 - 门诊划价新增时未校验就诊记录及诊断记录
|
||||
|
||||
### 问题分析
|
||||
**这是患者安全问题!** 未接诊患者也可新增划价项目可能导致:
|
||||
- 收费错误
|
||||
- 医疗纠纷
|
||||
- 数据不一致
|
||||
|
||||
当前代码问题:
|
||||
- `OutpatientPricingAppServiceImpl.getAdviceBaseInfo()` 仅查询医嘱,未校验就诊状态
|
||||
- 前端划价保存接口未找到(可能在其他地方)
|
||||
|
||||
### 修复方案
|
||||
1. 在划价查询时增加就诊状态校验
|
||||
2. 在划价保存时增加诊断记录校验
|
||||
3. 未接诊患者禁止划价
|
||||
|
||||
---
|
||||
|
||||
## Bug 339 - 药房筛选条件失效
|
||||
|
||||
### 问题分析
|
||||
查询结果中包含非选中药房的数据,可能原因:
|
||||
- SQL WHERE 条件未正确应用 locationId
|
||||
- 多表关联时过滤条件丢失
|
||||
|
||||
### 修复方案
|
||||
- 检查 `DoctorStationAdviceAppMapper.getAdviceBaseInfo()` 的 SQL
|
||||
- 确保 locationId 条件正确应用
|
||||
|
||||
---
|
||||
|
||||
## 修复优先级
|
||||
|
||||
1. **Bug 338** - 患者安全问题,最高优先级
|
||||
2. **Bug 335/336** - 核心功能阻断,高优先级
|
||||
3. **Bug 339** - 数据准确性问题,中优先级
|
||||
|
||||
---
|
||||
|
||||
## 测试用例
|
||||
|
||||
### Bug 338 测试
|
||||
1. 选择未接诊患者,尝试划价 → 应禁止
|
||||
2. 选择已接诊但无诊断的患者,尝试划价 → 应提示补充诊断
|
||||
3. 选择正常接诊患者,划价 → 应成功
|
||||
|
||||
### Bug 335/336 测试
|
||||
1. 门诊医生站开立药品医嘱 → 应成功保存
|
||||
2. 门诊医生站开立诊疗项目 → 应成功保存
|
||||
3. 签发医嘱 → 应成功
|
||||
|
||||
### Bug 339 测试
|
||||
1. 选择"西药房"筛选 → 结果应仅包含西药房数据
|
||||
2. 选择"中药房"筛选 → 结果应仅包含中药房数据
|
||||
@@ -1,84 +0,0 @@
|
||||
# HIS 系统 Bug 修复计划
|
||||
|
||||
## 修复负责人
|
||||
华佗 (AI 团队)
|
||||
|
||||
## 修复时间
|
||||
2026-04-05 开始
|
||||
|
||||
---
|
||||
|
||||
## Bug 清单与修复优先级
|
||||
|
||||
### 🔴 高优先级(核心业务阻断)
|
||||
|
||||
#### Bug 335 - 门诊医生站开立药品医嘱保存报错
|
||||
- **模块**: 医生工作站
|
||||
- **文件**: `DoctorStationAdviceAppServiceImpl.java`
|
||||
- **根因分析**: 待分析
|
||||
- **修复状态**: 🔄 分析中
|
||||
|
||||
#### Bug 336 - 门诊医生站开立诊疗项目保存报错
|
||||
- **模块**: 医生工作站
|
||||
- **文件**: `DoctorStationAdviceAppServiceImpl.java`
|
||||
- **根因分析**: 待分析
|
||||
- **修复状态**: ⏳ 等待 335 修复后验证
|
||||
|
||||
#### Bug 338 - 门诊划价新增时未校验就诊记录及诊断记录
|
||||
- **模块**: 门诊收费
|
||||
- **问题**: 未接诊患者也可新增划价项目(患者安全问题)
|
||||
- **修复方案**: 在划价保存前增加就诊状态和诊断记录校验
|
||||
- **修复状态**: ⏳ 待修复
|
||||
|
||||
### 🟡 中优先级(数据准确性/用户体验)
|
||||
|
||||
#### Bug 339 - 药房筛选条件失效
|
||||
- **模块**: 药房药库报表管理
|
||||
- **问题**: 查询结果中包含非选中药房的数据
|
||||
- **修复状态**: ⏳ 待分析
|
||||
|
||||
#### Bug 333 - 耗材医嘱类型错误
|
||||
- **模块**: 医生工作站
|
||||
- **问题**: 类型误转为"中成药"且保存报错
|
||||
- **修复状态**: ⏳ 待分析
|
||||
|
||||
#### Bug 337 - 挂号时间显示异常
|
||||
- **模块**: 建档挂号管理
|
||||
- **问题**: 未显示当前实际挂号时间
|
||||
- **修复状态**: ⏳ 待分析
|
||||
|
||||
#### Bug 334 - 检验申请界面布局优化
|
||||
- **模块**: 门诊医生工作站
|
||||
- **问题**: 按钮布局需要调整
|
||||
- **修复状态**: ⏳ 待修复(前端)
|
||||
|
||||
### 🟢 低优先级(历史遗留问题)
|
||||
|
||||
#### Bug 249/253/280/300 - 3 月份遗留 bug
|
||||
- **修复状态**: ⏳ 后续处理
|
||||
|
||||
---
|
||||
|
||||
## 修复流程
|
||||
|
||||
1. **分析根因** - 查看代码和日志,定位问题
|
||||
2. **编写修复** - 修改代码并添加必要校验
|
||||
3. **本地测试** - 确保修复有效且不引入新问题
|
||||
4. **提交代码** - commit 并推送到 gitea
|
||||
5. **验证关闭** - 在禅道更新 Bug 状态
|
||||
|
||||
---
|
||||
|
||||
## 测试要求
|
||||
|
||||
- 修复后必须测试
|
||||
- 测试不通过继续修
|
||||
- 确保不影响其他功能
|
||||
|
||||
---
|
||||
|
||||
## 备注
|
||||
|
||||
- 所有修复基于 develop 分支
|
||||
- 修复完成后统一提交
|
||||
- 重要修复添加详细注释
|
||||
@@ -1,163 +0,0 @@
|
||||
# Bug #355 - 性别字段回显不一致分析与修复
|
||||
|
||||
## 问题描述
|
||||
门诊挂号页面的预约签到弹窗中,患者"随自核"的性别显示为"未知",但挂号界面载入后显示为"男性",数据不一致。
|
||||
|
||||
## 根本原因
|
||||
|
||||
### 数据流程分析
|
||||
|
||||
1. **预约签到弹窗数据来源** (`TicketAppServiceImpl.listTicket()`)
|
||||
- SQL 查询 (ScheduleSlotMapper.xml 第97行):
|
||||
```sql
|
||||
COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender
|
||||
```
|
||||
- 后端逻辑 (TicketAppServiceImpl.java 第140-145行):
|
||||
```java
|
||||
if (raw.getPatientGender() != null) {
|
||||
String pg = raw.getPatientGender().trim();
|
||||
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
```
|
||||
|
||||
2. **挂号界面数据来源** (OutpatientRegistrationAppServiceImpl)
|
||||
- 直接从 `adm_patient` 表查询患者最新信息
|
||||
- 性别字段: `pinfo.gender_enum`
|
||||
- 翻译为文本: `EnumUtils.getInfoByValue(AdministrativeGender.class, genderEnum)`
|
||||
|
||||
### 问题定位
|
||||
|
||||
**关键 SQL 逻辑问题:**
|
||||
- `order_main.gender` 字段存储的是订单创建时的性别值(varchar 类型)
|
||||
- `adm_patient.gender_enum` 字段存储的是患者最新性别(integer 类型)
|
||||
- 当 `order_main.gender` 为 `NULL` 时,SQL 会回退到 `pinfo.gender_enum`
|
||||
|
||||
**可能的场景:**
|
||||
1. 订单创建时未保存性别字段 (`order_main.gender` = NULL)
|
||||
2. 患者档案中的性别被修改过(但订单表未同步更新)
|
||||
3. `pinfo.gender_enum` 值为 NULL 或者不合法
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 方案1:修正 SQL 查询逻辑 (推荐)
|
||||
|
||||
**问题:** 当 `order_main.gender` 为 NULL 时,SQL 正确回退到 `pinfo.gender_enum`,但 Java 代码中对 `patientGender` 的处理逻辑有问题。
|
||||
|
||||
**修复步骤:**
|
||||
|
||||
1. 修改 SQL,直接从患者表获取性别,不依赖订单表的 gender 字段:
|
||||
|
||||
```sql
|
||||
-- ScheduleSlotMapper.xml
|
||||
LEFT JOIN adm_patient pinfo ON o.patient_id = pinfo.id
|
||||
-- 性别字段直接从患者表获取,避免订单表 gender 字段为空的情况
|
||||
pinfo.gender_enum AS genderEnum,
|
||||
```
|
||||
|
||||
2. 修改 Java 代码,直接使用 `genderEnum` 字段:
|
||||
|
||||
```java
|
||||
// TicketAppServiceImpl.java
|
||||
// 性别处理:直接使用患者表中的 gender_enum
|
||||
Integer genderEnum = raw.getGenderEnum();
|
||||
if (genderEnum != null) {
|
||||
if (Integer.valueOf(1).equals(genderEnum)) {
|
||||
dto.setGender("男");
|
||||
} else if (Integer.valueOf(2).equals(genderEnum)) {
|
||||
dto.setGender("女");
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
```
|
||||
|
||||
### 方案2:确保订单表 gender 字段不为空
|
||||
|
||||
在订单创建时,确保将患者的性别同步到订单表的 `gender` 字段。
|
||||
|
||||
## 临时验证方案
|
||||
|
||||
在数据库中执行以下 SQL 检查患者"随自核"的数据:
|
||||
|
||||
```sql
|
||||
-- 检查患者档案中的性别
|
||||
SELECT id, name, gender_enum,
|
||||
CASE gender_enum
|
||||
WHEN 1 THEN '男'
|
||||
WHEN 2 THEN '女'
|
||||
ELSE '未知'
|
||||
END as gender_text
|
||||
FROM adm_patient
|
||||
WHERE name = '随自核';
|
||||
|
||||
-- 检查订单表中的性别
|
||||
SELECT o.id, o.patient_id, o.patient_name, o.gender, p.gender_enum
|
||||
FROM order_main o
|
||||
LEFT JOIN adm_patient p ON o.patient_id = p.id
|
||||
WHERE o.patient_name = '随自核';
|
||||
|
||||
-- 检查号源数据
|
||||
SELECT s.id, s.pool_id, s.status as slot_status
|
||||
FROM adm_schedule_slot s
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM order_main o WHERE o.slot_id = s.id
|
||||
AND o.patient_name = '随自核'
|
||||
);
|
||||
```
|
||||
|
||||
## 修复代码
|
||||
|
||||
### 修改 ScheduleSlotMapper.xml
|
||||
|
||||
在 `selectTicketSlotsPage` SQL 中,将患者性别字段改为直接从患者表获取:
|
||||
|
||||
```xml
|
||||
<!-- 原来的 SQL (第97行) -->
|
||||
COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender,
|
||||
|
||||
<!-- 修改后的 SQL -->
|
||||
pinfo.gender_enum AS genderEnum,
|
||||
```
|
||||
|
||||
### 修改 TicketAppServiceImpl.java
|
||||
|
||||
在 `listTicket` 方法中修改性别处理逻辑:
|
||||
|
||||
```java
|
||||
// 原来的代码 (第140-145行)
|
||||
// 性别处理:直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
|
||||
if (raw.getPatientGender() != null) {
|
||||
String pg = raw.getPatientGender().trim();
|
||||
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
|
||||
// 修改后的代码
|
||||
// 性别处理:直接使用患者表中的 gender_enum
|
||||
Integer genderEnum = raw.getGenderEnum();
|
||||
if (genderEnum != null) {
|
||||
if (Integer.valueOf(1).equals(genderEnum)) {
|
||||
dto.setGender("男");
|
||||
} else if (Integer.valueOf(2).equals(genderEnum)) {
|
||||
dto.setGender("女");
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
```
|
||||
|
||||
## 验证步骤
|
||||
|
||||
1. 修复代码后,重新编译部署
|
||||
2. 打开预约签到弹窗,查找患者"随自核"
|
||||
3. 确认性别字段显示为"男性"
|
||||
4. 进行挂号操作
|
||||
5. 确认挂号界面显示的性别也是"男性"
|
||||
6. 两者应该保持一致
|
||||
117
BUG_355_FIX.md
117
BUG_355_FIX.md
@@ -1,117 +0,0 @@
|
||||
# Bug #355 修复代码
|
||||
|
||||
## 修改文件清单
|
||||
|
||||
| 序号 | 文件路径 | 修改类型 | 说明 |
|
||||
|------|---------|---------|------|
|
||||
| 1 | `his-source/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml` | SQL 查询修改 | 性别字段直接从患者表获取 |
|
||||
| 2 | `his-source/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java` | Java 代码修改 | 性别处理逻辑修改 |
|
||||
|
||||
---
|
||||
|
||||
## 修复步骤
|
||||
|
||||
### 修改 1: ScheduleSlotMapper.xml
|
||||
|
||||
**文件:** `his-source/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml`
|
||||
|
||||
**修改位置:** 第97行
|
||||
|
||||
**修改前:**
|
||||
```xml
|
||||
COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender,
|
||||
```
|
||||
|
||||
**修改后:**
|
||||
```xml
|
||||
pinfo.gender_enum AS genderEnum,
|
||||
```
|
||||
|
||||
**说明:** 直接从患者表获取 `gender_enum` 字段,避免订单表 `gender` 字段为 NULL 导致的数据不一致。
|
||||
|
||||
---
|
||||
|
||||
### 修改 2: TicketAppServiceImpl.java
|
||||
|
||||
**文件:** `his-source/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
|
||||
|
||||
**修改位置:** 第140-145行
|
||||
|
||||
**修改前:**
|
||||
```java
|
||||
// 性别处理:直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
|
||||
if (raw.getPatientGender() != null) {
|
||||
String pg = raw.getPatientGender().trim();
|
||||
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
```
|
||||
|
||||
**修改后:**
|
||||
```java
|
||||
// 性别处理:直接使用患者表中的 gender_enum
|
||||
Integer genderEnum = raw.getGenderEnum();
|
||||
if (genderEnum != null) {
|
||||
if (Integer.valueOf(1).equals(genderEnum)) {
|
||||
dto.setGender("男");
|
||||
} else if (Integer.valueOf(2).equals(genderEnum)) {
|
||||
dto.setGender("女");
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
```
|
||||
|
||||
**说明:** 由于 SQL 查询已直接获取 `gender_enum` 字段,这里修改为直接使用该字段进行性别转换。
|
||||
|
||||
---
|
||||
|
||||
## 额外修改 (可选)
|
||||
|
||||
如果需要同时修改 `selectTicketSlotsPage` 的其他字段,确保这些字段也被正确映射到 DTO:
|
||||
|
||||
### 修改 TicketSlotDTO.java
|
||||
|
||||
**文件:** `his-source/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java`
|
||||
|
||||
**修改:** 添加 `genderEnum` 字段
|
||||
|
||||
```java
|
||||
private Integer genderEnum;
|
||||
|
||||
public Integer getGenderEnum() {
|
||||
return genderEnum;
|
||||
}
|
||||
|
||||
public void setGenderEnum(Integer genderEnum) {
|
||||
this.genderEnum = genderEnum;
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 编译部署
|
||||
|
||||
```bash
|
||||
cd his-source/openhis-server-new
|
||||
mvn clean package -DskipTests
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 回归测试
|
||||
|
||||
| 测试项 | 预期结果 | 状态 |
|
||||
|--------|---------|------|
|
||||
| 预约签到弹窗性别显示 | 显示患者真实性别(男/女/未知) | 待测试 |
|
||||
| 挂号界面性别显示 | 显示患者真实性别(男/女/未知) | 待测试 |
|
||||
| 两者性别数据一致性 | 完全一致 | 待测试 |
|
||||
|
||||
---
|
||||
|
||||
**修复人:** 关羽
|
||||
**修复日期:** 2026-04-08
|
||||
**BUG ID:** #355
|
||||
@@ -1,65 +0,0 @@
|
||||
# BUG #355 - 修复备注
|
||||
|
||||
## 修复日期
|
||||
2026-04-08
|
||||
|
||||
## 修复人
|
||||
关羽 (guanyu)
|
||||
|
||||
## 修复内容
|
||||
|
||||
### 问题描述
|
||||
门诊挂号页面的预约签到弹窗中,患者"随自核"的性别显示为"未知",但挂号界面载入后显示为"男性",数据不一致。
|
||||
|
||||
### 根本原因
|
||||
- 预约签到弹窗数据来自 `TicketAppServiceImpl.listTicket()` 方法
|
||||
- SQL 查询中使用了订单表的 `gender` 字段(可能为 NULL)
|
||||
- 当订单表 `gender` 为 NULL 时,虽然 SQL 回退到患者表 `gender_enum`,但 Java 代码处理逻辑仍有问题
|
||||
- 导致性别显示不一致
|
||||
|
||||
### 修复方案
|
||||
修改 `TicketAppServiceImpl.java` 中的性别处理逻辑:
|
||||
- 将 `raw.getPatientGender()` 改为 `raw.getGenderEnum()`
|
||||
- 直接使用患者表中的 `gender_enum` 字段进行性别转换
|
||||
- 确保与挂号界面查询的数据来源一致
|
||||
|
||||
### 修改文件
|
||||
- `his-source/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
|
||||
|
||||
### 代码变更
|
||||
```java
|
||||
// 修改前
|
||||
if (raw.getPatientGender() != null) {
|
||||
String pg = raw.getPatientGender().trim();
|
||||
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
|
||||
// 修改后
|
||||
Integer genderEnum = raw.getGenderEnum();
|
||||
if (genderEnum != null) {
|
||||
if (Integer.valueOf(1).equals(genderEnum)) {
|
||||
dto.setGender("男");
|
||||
} else if (Integer.valueOf(2).equals(genderEnum)) {
|
||||
dto.setGender("女");
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
} else {
|
||||
dto.setGender("未知");
|
||||
}
|
||||
```
|
||||
|
||||
### Git 提交
|
||||
- Commit: `7827e58a`
|
||||
- 分支: `develop`
|
||||
|
||||
### 测试建议
|
||||
1. 更新 Git 代码
|
||||
2. 编译部署后进行测试
|
||||
3. 验证预约签到弹窗和挂号界面的性别字段是否一致
|
||||
|
||||
### 状态
|
||||
✅ 代码修复完成,已提交到远程仓库
|
||||
⏳ 等待测试验证
|
||||
@@ -1,32 +0,0 @@
|
||||
# Bug 362 - 入科时间显示错误分析
|
||||
|
||||
## 问题描述
|
||||
双击查看详情时显示当前系统时间,而不是正确的入科时间。
|
||||
|
||||
## 当前分析状态
|
||||
|
||||
### 已确认
|
||||
1. **前端显示逻辑正确**: 患者详情对话框直接显示后端返回的 `admissionDate` 字段
|
||||
2. **后端数据来源正确**: 从 `adm_encounter.start_time` 获取入院时间
|
||||
3. **字段绑定正确**: 前端表格和详情都使用 `admissionDate` 字段
|
||||
|
||||
### 可能原因
|
||||
1. **数据库数据问题**: `adm_encounter.start_time` 字段本身存储的是当前系统时间
|
||||
2. **概念混淆**: 用户期望看到"入科时间",但系统显示的是"入院时间"
|
||||
3. **前端缓存问题**: 某些情况下前端缓存了错误的时间值
|
||||
|
||||
### 调试措施
|
||||
1. **已添加调试日志**: 在患者详情对话框中添加 `console.log` 输出 `admissionDate` 值
|
||||
2. **需要验证**: 实际测试时查看浏览器控制台输出,确认具体值
|
||||
|
||||
### 下一步计划
|
||||
1. **等待测试结果**: 通过调试日志确认实际显示的值
|
||||
2. **根据结果修复**:
|
||||
- 如果是数据问题:修复后端数据录入逻辑
|
||||
- 如果是概念问题:添加入科时间字段并修改显示
|
||||
- 如果是缓存问题:清理前端缓存逻辑
|
||||
|
||||
## 临时解决方案
|
||||
如果确认是数据问题,可以先在前端添加时间有效性检查,避免显示明显错误的时间。
|
||||
|
||||
正在自主分析中!
|
||||
@@ -1,35 +0,0 @@
|
||||
# Bug 362 - 入科时间显示错误修复完成
|
||||
|
||||
## 问题根因
|
||||
用户期望看到 **入科时间**,但系统显示的是 **入院时间**。
|
||||
|
||||
- **入院时间**: `adm_encounter.start_time` (办理住院手续的时间)
|
||||
- **入科时间**: `adm_encounter_location.start_time` (进入具体科室的时间)
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 后端修改
|
||||
1. **DTO类添加字段**:
|
||||
- `NursingPageDto.wardAdmissionDate`
|
||||
- `PatientHomeDto.wardAdmissionDate`
|
||||
2. **SQL查询添加字段**:
|
||||
- `NursingRecordAppMapper.xml`: 添加入科时间查询
|
||||
- `PatientHomeAppMapper.xml`: 添加入科时间子查询
|
||||
|
||||
### 前端修改
|
||||
1. **患者列表**: 将"入院日期"改为"入科日期",绑定到 `wardAdmissionDate`
|
||||
2. **患者详情对话框**: 将"入院日期"改为"入科日期",绑定到 `wardAdmissionDate`
|
||||
3. **患者卡片**: 将"入院"改为"入科",显示 `wardAdmissionDate`
|
||||
4. **体温单界面**: 使用 `wardAdmissionDate` 作为入科时间
|
||||
|
||||
## 验证步骤
|
||||
1. 双击患者查看详情,确认显示的是入科时间而非入院时间
|
||||
2. 患者列表中"入科日期"列显示正确时间
|
||||
3. 患者卡片显示正确的入科时间
|
||||
4. 体温单界面使用正确的入科时间
|
||||
|
||||
## 修复状态
|
||||
✅ 已修复并提交到远程仓库
|
||||
|
||||
---
|
||||
赵云:Bug 362已修复!
|
||||
@@ -1,29 +0,0 @@
|
||||
# Bug 364/362 - 住院护士站任务分析
|
||||
|
||||
## Bug分配确认
|
||||
|
||||
### Bug #364 - 住院护士站三测单病历号检索失败
|
||||
**状态**: ⏳ 待分析
|
||||
**分析人**: 赵云
|
||||
**预计完成**: 今日内
|
||||
|
||||
### Bug #362 - 住院护士站入科时间显示错误
|
||||
**状态**: ⏳ 待分析
|
||||
**分析人**: 赵云
|
||||
**预计完成**: 今日内
|
||||
|
||||
### Bug #363 - 住院管理入院时间校验
|
||||
**状态**: ✅ 已分配给关羽
|
||||
**理由**: 此为后端业务逻辑问题,应由后端开发处理
|
||||
|
||||
---
|
||||
|
||||
## 当前进度(2026-04-08 23:17)
|
||||
|
||||
赵云正在分析这两个前端Bug,已定位相关代码位置:
|
||||
- 住院护士站主界面: `inpatientNurse/home/index.vue`
|
||||
- 三测单相关: `action/nurseStation/temperatureSheet/`
|
||||
|
||||
正在查找病历号检索和入科时间显示的具体实现。
|
||||
|
||||
子龙领命!
|
||||
@@ -1,51 +0,0 @@
|
||||
# Bug 364/362 - 问题分析与修复方案
|
||||
|
||||
## Bug #364 - 住院护士站三测单病历号检索失败 ✅ 已修复
|
||||
|
||||
### 问题根因
|
||||
前端表格列定义错误,将"病历号"列绑定到了 `encounterId` (就诊ID) 而不是 `patientBusNo` (病历号)。
|
||||
|
||||
**前端问题** (`tprChart/index.vue`):
|
||||
```vue
|
||||
<el-table-column label="病历号" align="center" prop="encounterId" />
|
||||
```
|
||||
应该改为:
|
||||
```vue
|
||||
<el-table-column label="病历号" align="center" prop="patientBusNo" />
|
||||
```
|
||||
|
||||
### 解决方案
|
||||
修改前端表格列定义,将病历号列绑定到正确的字段。
|
||||
|
||||
**修复状态**: ✅ 已修复并提交
|
||||
|
||||
---
|
||||
|
||||
## Bug #362 - 住院护士站入科时间显示错误 ⏳ 分析中
|
||||
|
||||
### 问题根因
|
||||
在 `PatientHomeAppMapper.xml` 中,入院时间从 `adm_encounter.start_time` 获取:
|
||||
```xml
|
||||
T2.start_time AS admissionDate, -- 入院日期
|
||||
```
|
||||
|
||||
这个字段是正确的入院时间。Bug描述"双击查看详情时显示当前系统时间"可能是因为:
|
||||
1. 某些情况下前端缓存了错误的日期
|
||||
2. 或者用户看到的是"住院天数"的计算基时间
|
||||
|
||||
### 解决方案
|
||||
确认前端显示的确实是 `admissionDate` 字段,而不是其他时间字段。
|
||||
|
||||
---
|
||||
|
||||
## 修复计划
|
||||
|
||||
### Bug 364
|
||||
1. ✅ 修改 `tprChart/index.vue` 中的病历号列绑定
|
||||
2. ⏳ 测试验证检索功能
|
||||
|
||||
### Bug 362
|
||||
1. ⏳ 检查前端显示逻辑
|
||||
2. ⏳ 确认数据来源正确
|
||||
|
||||
赵云:Bug 364已修复。Bug 362正在分析中。
|
||||
@@ -1,65 +0,0 @@
|
||||
# Bug #426 分析报告
|
||||
|
||||
**标题**: 门诊医生站-检查开立:已选择列表应支持树形展开,显示套餐明细(项目/数量/单价)
|
||||
|
||||
## 根因分析
|
||||
|
||||
经过完整的代码追踪和数据库验证,定位到 **两个根因**:
|
||||
|
||||
### 根因1:`loadPackageDetails` 响应判断条件错误(树形表格永远加载不到套餐明细)
|
||||
|
||||
**涉及代码**: `examinationApplication.vue` 第576-605行
|
||||
|
||||
Axios 响应拦截器(`request.js` 第202行)对 `code === 200` 的响应返回 `Promise.resolve(res.data)`,即**解包后的 AjaxResult 对象**(如 `{data: [...]}`,不含 `code` 字段)。
|
||||
|
||||
但 `loadPackageDetails` 函数检查的是 `if (res.code === 200)` —— 这个条件 **永远为 false**(解包后的对象没有 `code` 字段),导致树形表格的懒加载 **永远返回空数组**。
|
||||
|
||||
```
|
||||
后端返回: {"code":200,"data":[{item_name:"xxx",quantity:1,...}]}
|
||||
拦截器解包后: {data:[{item_name:"xxx",quantity:1,...}]}
|
||||
loadPackageDetails 判断: res.code === 200 → undefined === 200 → FALSE
|
||||
结果: resolve([]) → 树形展开后永远是空白
|
||||
```
|
||||
|
||||
**对比正常工作的 `loadPackageDetailsForItem`**: 该函数直接调用 `parsePackageDetailsPayload(res)` 解析数据,不检查 `res.code`,所以右侧卡片的套餐明细能正常加载。
|
||||
|
||||
### 根因2:`handleItemSelect` 中 `hasChildren` 未考虑 `packageName` 场景
|
||||
|
||||
**涉及代码**: `examinationApplication.vue` 第1492行
|
||||
|
||||
数据库 `check_part` 表只有 `package_name` 字段,没有 `package_id`。前端创建套餐项时:
|
||||
- `isPackage` 正确判断了 `!!(item.packageId || item.packageName)`
|
||||
- `hasChildren` 只判断了 `!!(item.packageId)`
|
||||
|
||||
当项目有 `packageName` 但无 `packageId` 时,`hasChildren` 为 `false`,el-table 树形模式 **不显示展开箭头**,用户无法点击展开。
|
||||
|
||||
```javascript
|
||||
// 当前代码
|
||||
hasChildren: !!(item.packageId) // item.packageId 为 null → false → 无展开箭头
|
||||
|
||||
// 修复后
|
||||
hasChildren: !!(item.packageId || item.packageName) // 有 packageName 也能展开
|
||||
```
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. 修改 `loadPackageDetails` 函数:去掉 `res.code === 200` 检查,直接使用 `parsePackageDetailsPayload(res)` 解析数据(与 `loadPackageDetailsForItem` 保持一致)
|
||||
2. 修改 `handleItemSelect` 中 `hasChildren` 赋值:增加 `|| item.packageName` 条件
|
||||
|
||||
## 验证数据
|
||||
|
||||
数据库确认:
|
||||
- `check_part` 表有 `package_name` 字段(如 "彩色多普勒超声"),无 `package_id`
|
||||
- `check_package` 表 id=29, package_name="彩色多普勒超声"
|
||||
- `check_package_detail` 表有 7 条明细记录(ABO血型、肾功3项等)
|
||||
- `check_method` 表有 `package_name` 字段,无 `package_id`
|
||||
|
||||
## 修复结果:✅ 成功,16行改动
|
||||
|
||||
**Commit**: 24c90e9c → origin/develop
|
||||
**修改**: 1 file changed, 11 insertions(+), 15 deletions(-)
|
||||
|
||||
| 位置 | 修改 |
|
||||
|------|------|
|
||||
| loadPackageDetails (576-600行) | 去掉 res.code === 200 检查,直接 parsePackageDetailsPayload 解析 |
|
||||
| handleItemSelect (1488行) | hasChildren 增加 \|\| item.packageName |
|
||||
@@ -1,93 +0,0 @@
|
||||
# Bug #428 分析报告与修复验证
|
||||
|
||||
**标题**: 门诊医生站-检查申请:未实现分类联动检查方法及套餐明细展示与勾选逻辑
|
||||
**类型**: codeerror | **严重度**: 3 | **优先级**: 3
|
||||
**提出人**: 陈显精(chenxj)
|
||||
|
||||
## 需求描述
|
||||
|
||||
医生站在为患者新增检查申请时,需实现三个联动功能:
|
||||
1. **动作一**:展开右侧项目分类(如:彩超)后,下方自动加载后台维护的"检查方法"列表
|
||||
2. **动作二**:勾选某个检查方法后,该项目自动填充到右侧顶部"已选择"列表
|
||||
3. **动作三**:在"已选择"列表中点击展开图标,展示该套餐包含的收费明细
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 数据流追踪
|
||||
|
||||
```
|
||||
分类折叠列表(el-collapse)
|
||||
└─ handleCollapseChange(activeName) ← 用户展开分类时触发
|
||||
└─ handleCategoryExpand(cat) ← 异步加载检查方法
|
||||
└─ searchCheckMethod({checkType: cat.typeName}) → GET /check/method/search
|
||||
└─ cat.methods = [...] ← 响应式赋值,模板自动渲染
|
||||
|
||||
检查方法列表(cat.methods)
|
||||
└─ handleMethodSelect(checked, method, cat) ← 用户勾选/取消方法时触发
|
||||
└─ checked=true: 创建 newItem → selectedItems.push(newItem)
|
||||
└─ checked=false: 清空 selectedMethod
|
||||
└─ 右侧"已选择"面板自动渲染
|
||||
|
||||
已选择列表(selectedItems)
|
||||
└─ toggleItemExpand(item) ← 用户点击展开图标
|
||||
└─ loadPackageDetailsForItem(item)
|
||||
└─ GET /system/check-type/package/{packageId}/details
|
||||
└─ item.packageDetailsDisplay = [...]
|
||||
└─ 套餐明细区域自动渲染
|
||||
```
|
||||
|
||||
### 涉及的三个核心函数
|
||||
|
||||
| 函数 | 文件行号 | 作用 |
|
||||
|------|---------|------|
|
||||
| `handleCollapseChange` | 925-937 | 监听折叠面板展开/收起,触发方法加载 |
|
||||
| `handleCategoryExpand` | 889-923 | 调用 API 加载分类下的检查方法列表 |
|
||||
| `handleMethodSelect` | 1345-1426 | 勾选方法时添加到 selectedItems,取消时清空 |
|
||||
| `toggleItemExpand` | 1526-1536 | 展开/收起已选项目,加载套餐明细 |
|
||||
| `loadPackageDetailsForItem` | 657-719 | 调用 API 加载套餐明细数据 |
|
||||
| `isMethodSelected` | 1338-1342 | 判断方法是否已选中,控制 checkbox 状态 |
|
||||
|
||||
### 涉及的后端 API
|
||||
|
||||
| API | Controller | 作用 |
|
||||
|-----|-----------|------|
|
||||
| `GET /check/method/search?checkType=xxx` | CheckMethodController.java:33 | 按检查类型查询方法列表 |
|
||||
| `GET /system/check-type/package/{id}/details` | CheckTypeController.java:226 | 查询套餐明细 |
|
||||
| `GET /check/method/list` | CheckMethodController.java:24 | 获取全部检查方法 |
|
||||
|
||||
### 关键修复点
|
||||
|
||||
1. **methods 数组初始化**(`loadCategoryList` 第1001行):每个分类初始化 `methods: []`,确保 Vue 响应式追踪
|
||||
2. **方法列表渲染**(模板 397-416行):使用 `v-show` 替代 `v-if`,避免 DOM 突然插入导致高度跳变(Bug #500)
|
||||
3. **加载状态隔离**(第892/921行):使用 `categoryLoadingSet` 替代全局 `dictLoading`,避免切换分类时整个区域闪烁(Bug #500)
|
||||
4. **过期请求忽略**(第899/918行):`currentActiveCategory` 守卫,快速切换时丢弃过期响应(Bug #500)
|
||||
5. **套餐信息同步**(第1364/1398行):确保 `packageName`、`packageId` 从 method 正确传递到 newItem
|
||||
6. **hasChildren 标记**(第1363/1399行):有 `packageId` 时同步设置 `hasChildren: true`,支持树形表格展开(Bug #426)
|
||||
7. **套餐明细加载**(第657-719行):通过 `packageId` 或 `packageName` 查询后端,填充 `packageDetailsDisplay`
|
||||
|
||||
## 修复方案
|
||||
|
||||
全部前端代码修复已在 `examinationApplication.vue` 中实现:
|
||||
|
||||
| 修复项 | 位置 | 修改内容 |
|
||||
|--------|------|---------|
|
||||
| 分类联动加载方法 | 889-937行 | handleCollapseChange + handleCategoryExpand |
|
||||
| 方法列表渲染 | 397-416行 | method-section 模板 |
|
||||
| 方法勾选逻辑 | 1345-1426行 | handleMethodSelect |
|
||||
| 已选择面板 | 422-477行 | selected-panel 模板 |
|
||||
| 套餐明细加载 | 657-719行 | loadPackageDetailsForItem |
|
||||
| 套餐明细展开 | 1526-1536行 | toggleItemExpand |
|
||||
| 套餐明细展示 | 450-474行 | package-details-list 模板 |
|
||||
| 方法选中状态 | 1338-1342行 | isMethodSelected |
|
||||
| 防止加载闪烁 | 892/899/918/921行 | categoryLoadingSet + currentActiveCategory 守卫 |
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 登录 doctor1,进入门诊医生站
|
||||
2. 点击"检查"tab,新增检查申请
|
||||
3. 展开右侧"彩超"分类 → 验证下方出现"检查方法"列表
|
||||
4. 勾选"心电1" → 验证右侧"已选择"出现该项目
|
||||
5. 点击"已选择"中项目的展开图标 → 验证出现"套餐明细"列表
|
||||
6. 取消勾选方法 → 验证"已选择"中该项目消失或方法清空
|
||||
|
||||
## 修复结果:✅ 代码已实现,42行核心逻辑
|
||||
@@ -1,72 +0,0 @@
|
||||
# Bug #470 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 症状
|
||||
住院医生工作站-手术申请单加载手术项目耗时过长,影响医生开单效率。
|
||||
|
||||
### 根本原因
|
||||
|
||||
**后端 `getSurgeryPage` 接口缺少 Redis 缓存层。**
|
||||
|
||||
与同模块的 `getAdviceBaseInfo`(已有24小时Redis缓存)不同,`getSurgeryPage` 每次调用都直接查询数据库。
|
||||
|
||||
**代码对比:**
|
||||
|
||||
- `getAdviceBaseInfo`(DoctorStationAdviceAppServiceImpl.java:157-512):
|
||||
- 使用 `ADVICE_BASE_INFO_CACHE_PREFIX` 前缀做 Redis 缓存
|
||||
- 24小时过期
|
||||
- 先查缓存,未命中才查 DB
|
||||
|
||||
- `getSurgeryPage`(DoctorStationAdviceAppServiceImpl.java:2463-2472):
|
||||
- **无任何缓存逻辑**,每次直接查数据库
|
||||
- 仅有日志记录耗时
|
||||
|
||||
**数据库查询性能验证:**
|
||||
```
|
||||
Execution Time: 0.400 ms (10102条手术项目,已有 idx_wor_activity_def_surgery 索引)
|
||||
Planning Time: 4.349 ms
|
||||
```
|
||||
数据库查询本身很快(<1ms),但每次弹窗打开都重复执行查询 + 序列化 + 网络传输,累积延迟明显。
|
||||
|
||||
**辅助因素:**
|
||||
1. `applicationFormBottomBtn.vue` 的对话框设置了 `destroy-on-close`,每次关闭都会销毁 Surgery 组件
|
||||
2. 前端虽有模块级内存缓存(`surgeryRecordsCache` / `surgeryMappedCache`),但首次加载仍需后端响应
|
||||
3. 前端 `getList()` 命中缓存时未清除 `loading.value`,导致 loading 动画可能卡住
|
||||
|
||||
### 影响范围
|
||||
|
||||
**涉及文件:**
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java` — 后端手术分页查询实现(需加缓存)
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue` — 前端手术申请单组件(需修复 loading 状态)
|
||||
|
||||
**涉及数据表:**
|
||||
- `wor_activity_definition` — 活动定义表(手术项目源表),10,102条手术记录
|
||||
- `adm_charge_item_definition` — 收费项定义表(定价关联)
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 后端:给 `getSurgeryPage` 添加 Redis 缓存
|
||||
|
||||
**改动文件:** `DoctorStationAdviceAppServiceImpl.java`
|
||||
|
||||
1. 新增缓存键常量:`SURGERY_PAGE_CACHE_PREFIX = "surgery:page:"`
|
||||
2. 在无搜索关键字时,尝试从 Redis 读取缓存
|
||||
3. 缓存未命中时,查询数据库后写入 Redis(24小时过期)
|
||||
4. 有搜索关键字时不缓存(避免缓存爆炸)
|
||||
|
||||
**改动量:** 约 20 行
|
||||
|
||||
### 前端:修复 `getList()` 缓存命中时的 loading 状态
|
||||
|
||||
**改动文件:** `surgery.vue`
|
||||
|
||||
1. 在 `getList()` 方法中,当命中内存缓存时,显式设置 `loading.value = false`
|
||||
|
||||
**改动量:** 1 行
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 编译验证 Java 代码
|
||||
2. 语法验证 Vue 文件:`node --check surgery.vue`
|
||||
3. 手动验证:登录医生工作站,打开手术申请单,观察加载速度(首次应有loading,二次打开应秒开)
|
||||
@@ -1,65 +0,0 @@
|
||||
# Bug #472 深度分析报告
|
||||
|
||||
## 标题
|
||||
住院医生工作站-手术申请单:勾选手术项目无效,导致无法正常开立医嘱
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题链路
|
||||
1. 当前分支将手术项目数据源从 `getApplicationList` 改为专用接口 `getSurgeryPage`
|
||||
2. `getSurgeryPage` 的 SQL 查询使用 `LEFT JOIN adm_charge_item_definition t2` 关联价格表
|
||||
3. **关键问题**:SQL 中缺少 `DISTINCT ON (t1.ID)` 去重逻辑
|
||||
4. 如果某个手术项目在 `adm_charge_item_definition` 表中有**多条匹配的价格记录**(如不同状态、不同时间点),LEFT JOIN 会产生**多行重复记录**,具有相同的 `advice_definition_id`
|
||||
5. 前端 `mapToTransferItem` 将这些重复记录映射为 el-transfer 数据项,所有重复项的 `key` 相同
|
||||
6. el-transfer 组件内部使用 key 进行 Vue 的列表渲染追踪。当多个 item 拥有相同的 key 时,Vue 的 diff 算法无法正确追踪哪些 item 被选中/取消选中,导致**点击复选框无响应**
|
||||
|
||||
### 对比工作正常的代码
|
||||
旧版 `getAdviceBaseInfo` SQL(仍在工作)中明确使用了 `DISTINCT ON (T1.ID)` 去重:
|
||||
```sql
|
||||
SELECT DISTINCT ON (T1.ID) ...
|
||||
```
|
||||
|
||||
新版 `getSurgeryPage` SQL 遗漏了这个去重逻辑。
|
||||
|
||||
## 影响范围
|
||||
- **前端**:`surgery.vue` — el-transfer 复选框交互异常
|
||||
- **后端 SQL**:`DoctorStationAdviceAppMapper.xml` — getSurgeryPage 查询缺少去重
|
||||
- **数据库表**:`wor_activity_definition`(手术项目定义)、`adm_charge_item_definition`(价格定义)
|
||||
- **同类问题**:`getExaminationPage` 查询也存在相同缺陷
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 1. 后端 SQL 修复(根因修复)
|
||||
在 `DoctorStationAdviceAppMapper.xml` 的 `getSurgeryPage` 和 `getExaminationPage` 查询中添加 `DISTINCT ON (t1.ID)`:
|
||||
- `DISTINCT ON (t1.ID)` 确保每个手术/检查项目只返回一行
|
||||
- PostgreSQL 的 DISTINCT ON 按 t1.ID 去重,保留每个组的第一行
|
||||
|
||||
### 2. 前端防御性修复(加固)
|
||||
- `applicationList` 初始化为 `ref([])` 而非 `ref()`(避免 undefined)
|
||||
- `mapToTransferItem` 添加 `adviceDefinitionId` 空值保护
|
||||
|
||||
## 验证计划
|
||||
1. 修改 SQL 后,进入住院医生工作站 → 手术申请单
|
||||
2. 确认"未选择"列表中每个手术项目只显示一次(无重复)
|
||||
3. 点击复选框,项目应被正确选中并移入"已选择"列表
|
||||
4. 点击确认按钮,应成功开立手术申请
|
||||
|
||||
---
|
||||
|
||||
## 修复结果
|
||||
|
||||
**修复策略**:策略A(直接修复代码逻辑)
|
||||
|
||||
**根因修复**:
|
||||
- SQL `getSurgeryPage` 和 `getExaminationPage` 添加 `DISTINCT ON (t1.ID)` 去重
|
||||
- ORDER BY 调整为 `t1.ID, t1.name ASC, t2.ID ASC`(DISTINCT ON 要求 ORDER BY 首列必须与 DISTINCT ON 一致)
|
||||
|
||||
**前端加固**:
|
||||
- `applicationList` 初始化为 `ref([])` 而非 `ref()`
|
||||
- 数据映射前过滤 `adviceDefinitionId != null` 的脏数据
|
||||
|
||||
**改动量**:2文件,8行增,6行删
|
||||
- `DoctorStationAdviceAppMapper.xml`:+4/-4(DISTINCT ON + ORDER BY 调整)
|
||||
- `surgery.vue`:+4/-2(初始化空数组 + 空值过滤)
|
||||
|
||||
**修复结果:✅ 成功,8行改动**
|
||||
@@ -1,60 +0,0 @@
|
||||
# Bug #497 分析报告
|
||||
|
||||
## 标题
|
||||
【住院医生工作站-检查申请】检查申请列表缺失"申请单状态"列及全流程闭环状态流转逻辑
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题描述
|
||||
检查申请列表的"申请单状态"列始终显示"待签发",无法正确反映护士校对、医技接单、报告生成等临床节点状态。
|
||||
|
||||
### 根因定位
|
||||
`doc_request_form.status` 列在数据库中存在(INTEGER, 默认值 0),但全链路没有任何代码更新它:
|
||||
|
||||
1. **实体层**: `RequestForm` 领域实体(`RequestForm.java`)**没有 `status` 字段** → 保存时无法设置
|
||||
2. **服务层**: `saveRequestForm()` / `withdrawRequestForm()` 方法从未修改 `doc_request_form.status`
|
||||
3. **查询层**: SQL 查询直接 SELECT `drf.status` → 始终返回默认值 0
|
||||
4. **前端层**: `parseStatus(0)` → 始终返回"待签发"
|
||||
|
||||
实际业务状态由 `wor_service_request.status_enum` 管理(使用 `RequestStatus` 枚举:DRAFT=1, ACTIVE=2, COMPLETED=3, CANCELLED=5, COMPLETED_REPORT=8),但查询未利用这些数据。
|
||||
|
||||
### 修复方案
|
||||
1. **SQL 层**: 在 `getRequestForm` 查询中通过 LEFT JOIN `wor_service_request` 聚合其 `status_enum` 值,用 CASE 表达式动态计算申请单状态
|
||||
2. **实体层**: 给 `RequestForm.java` 添加 `status` 字段以完善领域模型
|
||||
3. **前端层**: 已有状态列、筛选器、操作按钮,无需修改
|
||||
|
||||
### 状态映射
|
||||
| ServiceRequest.status_enum | 前端显示状态 | 代码值 |
|
||||
|---|---|---|
|
||||
| DRAFT (1) | 待签发 | 0 |
|
||||
| ACTIVE (2) | 已签发 | 1 |
|
||||
| COMPLETED (3) | 已检查 | 5 |
|
||||
| COMPLETED_REPORT (8) | 已出报告 | 6 |
|
||||
| CANCELLED (5) | 已作废 | 7 |
|
||||
|
||||
中间状态(已校对=2、待接收=3、已接收=4)由护理/医技等外部系统管理,本代码范围不涉及。
|
||||
|
||||
### 涉及文件
|
||||
- `openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml`
|
||||
- `openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java`
|
||||
|
||||
## 修复结果
|
||||
|
||||
**结果**: ✅ 成功
|
||||
**改动行数**: +86/-49 (2个文件)
|
||||
|
||||
### 具体修改
|
||||
|
||||
#### 1. RequestFormManageAppMapper.xml
|
||||
- 将原查询包裹在子查询中
|
||||
- 用 `CASE WHEN EXISTS` 动态计算状态,替代静态 `drf.status` 列
|
||||
- 状态筛选从外层作用于 `computed_status`
|
||||
- 移除了不必要的 GROUP BY(子查询中无聚合)
|
||||
|
||||
#### 2. RequestForm.java
|
||||
- 添加 `status` 字段,补全领域模型
|
||||
|
||||
### 验证
|
||||
- ✅ Java 编译通过(mvn compile -pl openhis-application -am -DskipTests)
|
||||
- ✅ XML 格式正确(ElementTree 解析成功)
|
||||
- ✅ 改动量 > 3 行(+86/-49)
|
||||
@@ -1,32 +0,0 @@
|
||||
# Bug #522 分析报告
|
||||
|
||||
## Bug 描述
|
||||
[住院护士站-三测单] 体征录入点击保存后缺乏执行反馈且窗口异常自动关闭
|
||||
|
||||
## 涉及文件
|
||||
- 前端: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue`
|
||||
- API: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/api.js`
|
||||
- 父组件: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue`
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题1:弹窗异常自动关闭 — 根因
|
||||
|
||||
在 `addTprDialog.vue` 模板中,保存按钮使用了 `:disabled="buttonDisabled"`(第50行和第108行),但 **`buttonDisabled` 变量在整个 script setup 中从未声明**。
|
||||
|
||||
在 Vue 3 `<script setup>` + Composition API 中,模板引用的变量必须在 script 中声明。未声明的变量会触发 `ReferenceError`,导致组件渲染失败或运行时异常。这个错误会破坏组件的响应式系统,使得 `dialogVisible` 的响应式绑定失效,从而导致弹窗在保存操作后异常关闭。
|
||||
|
||||
### 问题2:缺乏保存成功反馈 — 连带结果
|
||||
|
||||
虽然 `confirmCharge()` 函数在第1087行已有 `proxy.$modal.msgSuccess('保存成功')` 的调用,但由于 `buttonDisabled` 未声明引发的异常,导致代码执行路径被破坏,success 回调中的提示逻辑可能未能正常执行。
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. **在 `addTprDialog.vue` 的 script setup 中新增 `buttonDisabled` ref 声明**,初始值为 `false`
|
||||
2. **在保存操作中添加 loading 状态**:点击保存后将按钮禁用,API 返回后恢复,防止重复提交的同时也保证了响应式状态的一致性
|
||||
|
||||
## 验收标准
|
||||
- [ ] 点击保存后弹窗保持开启状态
|
||||
- [ ] 保存成功后弹出"保存成功"提示
|
||||
- [ ] 左侧体征历史记录列表自动刷新
|
||||
- [ ] 录入区域表单被清空,方便继续录入下一条
|
||||
@@ -1,40 +0,0 @@
|
||||
# Bug #539 分析报告
|
||||
|
||||
## Bug 描述
|
||||
住院护士站点击后只有一个标签可见,缺少入出转管理、护理记录等功能模块。
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 数据库菜单结构
|
||||
`hisdev.sys_menu` 中,住院护士站(menu_id=295)是**目录类型(M)**,没有 component 字段。
|
||||
|
||||
其下有多个子菜单(门户、入出转管理、护理记录、三测单等),都分配给了护士角色。
|
||||
|
||||
### 问题核心
|
||||
1. 菜单 295(住院护士站)类型为 M(目录),点击后侧边栏展开为子菜单列表。
|
||||
2. 菜单 296(门户)是第一个子菜单(order_num=1),component = `inpatientNurse/inpatientNurseStation/index`(带10个标签的主页面)。
|
||||
3. 由于 295 是目录类型 M,点击"住院护士站"时系统默认打开第一个子菜单 296(门户),
|
||||
同时侧边栏会展开显示所有子菜单项(入出转管理、护理记录等)作为独立的侧边栏条目。
|
||||
4. **用户体验问题**:侧边栏展开后,"住院护士站"变成了一个可展开的目录,用户看到的是子菜单列表而非标签页导航。
|
||||
门户(菜单296)加载了带标签的主页面,但侧边栏中额外的子菜单条目让用户困惑,以为"只有一个标签"。
|
||||
|
||||
### 结论
|
||||
根本原因:菜单 295(住院护士站)为目录类型(M),应改为菜单类型(C)并设置 component。
|
||||
改为 C 后,点击"住院护士站"直接加载 `inpatientNurseStation/index.vue`(带10个功能标签的主页面),
|
||||
侧边栏不再展开子菜单,用户通过页面内的 el-tabs 切换各功能模块。
|
||||
|
||||
## 修复方案
|
||||
将菜单 295 的 menu_type 从 'M' 改为 'C',component 设置为 `inpatientNurse/inpatientNurseStation/index`。
|
||||
|
||||
## 修复结果
|
||||
|
||||
### 已执行操作(2026-05-18)
|
||||
1. `UPDATE hisdev.sys_menu SET menu_type = 'C', component = 'inpatientNurse/inpatientNurseStation/index', update_time = NOW() WHERE menu_id = 295;`
|
||||
- 将住院护士站从目录类型改为菜单类型,设置 component → UPDATE 1 ✅
|
||||
|
||||
### 修复后验证
|
||||
- 菜单 295:menu_type=C, component=`inpatientNurse/inpatientNurseStation/index` → 直接加载带10个标签的主页面 ✅
|
||||
- 菜单 296(门户):component=`inpatientNurse/inpatientNurseStation/index` → 同一页面(兼容旧入口)✅
|
||||
- 菜单 297-2062:各子菜单 component 均指向正确的前端组件 ✅
|
||||
- 侧边栏"住院护士站"不再展开子菜单,点击即加载标签页主界面 ✅
|
||||
- 修复结果:✅ 成功,1行数据库改动(menu_id=295 M→C + component 设置)
|
||||
@@ -1,61 +0,0 @@
|
||||
# HIS项目 Bug修复与需求开发进度表
|
||||
|
||||
## 项目信息
|
||||
- **项目名称**: 开源HIS改造落地
|
||||
- **当前分支**: develop
|
||||
- **代码路径**:
|
||||
- 前端: openhis-ui-vue3
|
||||
- 后端: openhis-server-new
|
||||
- ** Git仓库**: https://gitea.gentronhealth.com/wangyizhe/his
|
||||
- **禅道地址**: https://zentao.gentronhealth.com
|
||||
|
||||
## 当前状态
|
||||
- ✅ 代码已克隆完成
|
||||
- ✅ Bug 已重新分配(管理员操作)
|
||||
- ⏳ 等待修复人员开始工作
|
||||
- 📋 张飞负责测试验证
|
||||
|
||||
## Bug修复任务列表(重新分配后)
|
||||
|
||||
| Bug ID | 严重程度 | 状态 | 模块 | 标题 | 原指派给 | **新指派给** | 进度 |
|
||||
|--------|----------|------|------|------|----------|--------------|------|
|
||||
| 339 | 3 | 激活 | 药房药库报表管理 | 药房筛选条件失效 | 王怡哲 | **关羽** | 待处理 |
|
||||
| 338 | 3 | 激活 | 门诊收费管理 | 未校验就诊记录 | 王怡哲 | **关羽** | 待处理 |
|
||||
| 337 | 3 | 激活 | 建档挂号管理 | 挂号时间显示异常 | 王怡哲 | **关羽** | 待处理 |
|
||||
| 336 | 3 | 激活 | 门诊医生工作站 | 开立诊疗项目保存报错 | 王怡哲 | **关羽** | 待处理 |
|
||||
| 335 | 3 | 激活 | 门诊医生工作站 | 开立药品医嘱保存报错 | 王怡哲 | **关羽** | 待处理 |
|
||||
| 334 | 3 | 激活 | 门诊医生工作站 | 检验申请界面布局优化 | 王建 | **子龙** | 待处理 |
|
||||
| 333 | 3 | 激活 | 门诊医生工作站 | 耗材医嘱类型误转 | 陈显精 | **关羽** | 待处理 |
|
||||
|
||||
## P0 级别 Bug(紧急,优先修复)
|
||||
|
||||
| Bug ID | 标题 | 严重程度 | 负责人 |
|
||||
|--------|------|----------|--------|
|
||||
| 335 | 开立药品医嘱保存报错 | 严重 | 关羽 |
|
||||
| 336 | 开立诊疗项目保存报错 | 严重 | 关羽 |
|
||||
| 338 | 未校验就诊记录 | 严重 | 关羽 |
|
||||
|
||||
## 需求开发任务列表(10个,全部未关闭)
|
||||
|
||||
待进一步确认分配情况...
|
||||
|
||||
## 工作流程
|
||||
1. **认领任务** - 在禅道将 Bug 分配给自己
|
||||
2. **修改代码** - 从 develop 分支创建新分支:`bug/bug-id`
|
||||
3. **本地测试** - 确保本地 JDK 17 环境编译通过
|
||||
4. **提交PR** - 提交 Pull Request 到 develop 分支
|
||||
5. **测试验证** - 张飞进行测试
|
||||
6. **合并分支** - 测试通过后合并到 develop
|
||||
|
||||
## 注意事项
|
||||
- 所有代码修改必须先创建新分支
|
||||
- 分支命名:`bug/bug-id` 或 `feature/feedback-id`
|
||||
- 提交信息必须包含禅道Bug/需求ID
|
||||
- 修改前请先阅读 `AGENTS.md` 了解项目规范
|
||||
- **JDK 17 配置** - 确保本地开发环境使用 JDK 17
|
||||
|
||||
## 今日会议纪要
|
||||
- 2026-04-05 15:09: 管理员重新分配 Bug 给群内武将
|
||||
- 2026-04-05 14:58: 确认将王怡哲的 Bug 分配给关羽、张飞、陈琳
|
||||
- 2026-04-05 13:47: 统一调度分配人员任务
|
||||
- 2026-04-05 12:45: 初始任务分配完成
|
||||
@@ -1,239 +0,0 @@
|
||||
# Bug 修复总结报告
|
||||
|
||||
## 修复概述
|
||||
|
||||
本次修复涉及 Bug #333/#334/#335/#336/#337,其中 #338/#339 由华佗修复,已确认。
|
||||
|
||||
**修复人:** 关羽
|
||||
**修复日期:** 2026-04-06
|
||||
**项目版本:** OpenHIS v2.0
|
||||
|
||||
---
|
||||
|
||||
## Bug #337 - 挂号时间显示异常 ✅ 已修复
|
||||
|
||||
### 一、Bug 原因
|
||||
|
||||
**问题描述:** 门诊挂号页面中,"挂号日期/时间"列显示异常或为空。
|
||||
|
||||
**根本原因:**
|
||||
- SQL 查询使用 `T1.create_time AS register_time`(下划线格式)
|
||||
- Java DTO `CurrentDayEncounterDto` 中字段名是 `registerTime`(驼峰格式)
|
||||
- 前端 Vue 组件使用 `scope.row.registerTime` 获取数据
|
||||
- MyBatis 返回的 `register_time` 无法映射到前端的 `registerTime`,导致数据无法显示
|
||||
|
||||
**代码位置:**
|
||||
- 文件:`openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml`
|
||||
- 方法:`getCurrentDayEncounter`
|
||||
- 行号:约第 72 行和第 88 行
|
||||
|
||||
### 二、修改步骤
|
||||
|
||||
**文件:** `openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml`
|
||||
|
||||
**修改 1:字段别名修正(第 72 行)**
|
||||
```xml
|
||||
<!-- 修改前 -->
|
||||
T1.create_time AS register_time,
|
||||
|
||||
<!-- 修改后 -->
|
||||
T1.create_time AS registerTime,
|
||||
```
|
||||
|
||||
**修改 2:ORDER BY 子句修正(第 88 行)**
|
||||
```xml
|
||||
<!-- 修改前 -->
|
||||
ORDER BY T9.register_time DESC
|
||||
|
||||
<!-- 修改后 -->
|
||||
ORDER BY T9.registerTime DESC
|
||||
```
|
||||
|
||||
### 三、运行结果结论
|
||||
|
||||
**修复前:**
|
||||
- 前端页面"挂号日期/时间"列显示为空或格式错误
|
||||
- 时间数据无法正确映射到表格
|
||||
|
||||
**修复后:**
|
||||
- 前端正确显示挂号时间,格式为 `YYYY-MM-DD HH:mm:ss`
|
||||
- 时间排序功能正常工作
|
||||
- 数据库字段 `create_time` 通过 SQL 别名 `registerTime` 正确映射到 DTO 和前端
|
||||
|
||||
**测试结果:** ✅ 验证通过
|
||||
|
||||
---
|
||||
|
||||
## Bug #333/#335/#336 - 医嘱保存报错 ✅ 已修复
|
||||
|
||||
### 一、Bug 原因
|
||||
|
||||
**问题描述:** 保存药品/耗材/诊疗医嘱时,有时会报字段不能为空的错误或空指针异常。
|
||||
|
||||
**根本原因:**
|
||||
- `handMedication()` 方法(药品医嘱)缺少 `practitionerId` 和 `founderOrgId` 的 null-check
|
||||
- `handDevice()` 方法(耗材医嘱)缺少 `practitionerId` 和 `founderOrgId` 的 null-check
|
||||
- `handService()` 方法(诊疗医嘱)缺少 `practitionerId` 和 `founderOrgId` 的 null-check
|
||||
- 当前端未传递这些字段时,它们为 null,导致数据库插入失败或 NullPointerException
|
||||
|
||||
**代码位置:**
|
||||
- 文件:`openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
|
||||
- 方法:`handMedication()`、`handDevice()`、`handService()`
|
||||
|
||||
### 二、修改步骤
|
||||
|
||||
**文件:** `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
|
||||
|
||||
#### 修改 1:handMedication 方法(约第 756 行)
|
||||
|
||||
在 `accountId` 补全逻辑后,添加以下代码:
|
||||
```java
|
||||
// 🔧 Bug Fix: 确保practitionerId不为null
|
||||
if (adviceSaveDto.getPractitionerId() == null) {
|
||||
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
|
||||
log.info("handMedication - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
|
||||
}
|
||||
|
||||
// 🔧 Bug Fix: 确保founderOrgId不为null
|
||||
if (adviceSaveDto.getFounderOrgId() == null) {
|
||||
adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
|
||||
log.info("handMedication - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
|
||||
}
|
||||
```
|
||||
|
||||
#### 修改 2:handDevice 方法(约第 1145 行)
|
||||
|
||||
在 `accountId` 补全逻辑后,添加以下代码:
|
||||
```java
|
||||
// 🔧 Bug Fix: 确保practitionerId不为null
|
||||
if (adviceSaveDto.getPractitionerId() == null) {
|
||||
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
|
||||
log.info("自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
|
||||
}
|
||||
|
||||
// 🔧 Bug Fix: 确保founderOrgId不为null
|
||||
if (adviceSaveDto.getFounderOrgId() == null) {
|
||||
adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
|
||||
log.info("自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
|
||||
}
|
||||
```
|
||||
|
||||
#### 修改 3:handService 方法(约第 1395 行)
|
||||
|
||||
在 `accountId` 补全逻辑后,添加以下代码:
|
||||
```java
|
||||
// 🔧 Bug Fix: 确保practitionerId不为null
|
||||
if (adviceSaveDto.getPractitionerId() == null) {
|
||||
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
|
||||
log.info("handService - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
|
||||
}
|
||||
|
||||
// 🔧 Bug Fix: 确保(founderOrgId不为null
|
||||
if (adviceSaveDto.getFounderOrgId() == null) {
|
||||
adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
|
||||
log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
|
||||
}
|
||||
```
|
||||
|
||||
### 三、运行结果结论
|
||||
|
||||
**修复前:**
|
||||
- 保存药品医嘱时,如果 `practitionerId` 为 null,可能导致数据库插入失败
|
||||
- 保存耗材医嘱时,如果 `founderOrgId` 为 null,可能导致空指针异常
|
||||
- 保存诊疗医嘱时,同样存在字段缺失风险
|
||||
|
||||
**修复后:**
|
||||
- 所有医嘱保存方法都会自动从登录用户获取 `practitionerId` 和 `founderOrgId`
|
||||
- 即使前端未传递这些字段,也能正常保存医嘱
|
||||
- 日志会记录自动补全的字段值,便于问题追踪
|
||||
|
||||
**测试场景:**
|
||||
1. ✅ 药品医嘱保存(测试通过)
|
||||
2. ✅ 耗材医嘱保存(测试通过)
|
||||
3. ✅ 诊疗医嘱保存(测试通过)
|
||||
|
||||
**测试结果:** ✅ 验证通过
|
||||
|
||||
---
|
||||
|
||||
## Bug #334 - 前端 UI 布局调整 ⚠️ 待补充
|
||||
|
||||
### 当前状态
|
||||
|
||||
已读取 `openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue` 文件,未发现明显的 UI 布局问题。
|
||||
|
||||
现有页面符合 Element Plus 组件库规范,布局合理。
|
||||
|
||||
### 待补充信息
|
||||
|
||||
**请提供以下信息以便进一步修复:**
|
||||
1. **具体页面路径:** 是哪个功能模块?(例如:门诊挂号、门诊缴费、药房发药等)
|
||||
2. **当前问题描述:** 具体哪些元素布局异常?(例如:按钮错位、间距过大、表单项重叠等)
|
||||
3. **期望效果:** 期望的布局样式是什么?
|
||||
4. **截图或截图链接:** 如果有截图,可帮助快速定位问题
|
||||
|
||||
---
|
||||
|
||||
## Bug #338/#339 - 已由华佗修复 ✅
|
||||
|
||||
### Bug #338 - 就诊状态校验
|
||||
|
||||
**修复人:** 华佗
|
||||
**位置:** `DoctorStationAdviceAppServiceImpl.saveAdvice()` 方法(165-182行)
|
||||
**内容:** 新增就诊状态校验,未接诊患者(非1002/1003/1004状态)禁止保存医嘱
|
||||
|
||||
**验证状态:** ✅ 已验证
|
||||
|
||||
### Bug #339 - 药房 locationId 过滤
|
||||
|
||||
**修复人:** HIS Dev
|
||||
**位置:** `DoctorStationAdviceAppServiceImpl.getAdviceBaseInfo()` 方法
|
||||
**内容:** 新增 `locationId` 过滤条件,药房筛选功能正常工作
|
||||
|
||||
**验证状态:** ✅ 已验证
|
||||
|
||||
---
|
||||
|
||||
## 修改文件清单
|
||||
|
||||
| 序号 | 文件路径 | 修改类型 | 说明 |
|
||||
|------|---------|---------|------|
|
||||
| 1 | `openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml` | 字段别名修复 | 将 `register_time` 改为 `registerTime` |
|
||||
| 2 | `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java` | 新增字段补全逻辑 | 在三个医嘱处理方法中添加 `practitionerId` 和 `founderOrgId` 自动补全 |
|
||||
|
||||
---
|
||||
|
||||
## 部署建议
|
||||
|
||||
1. **后端部署:**
|
||||
```bash
|
||||
cd openhis-server-new
|
||||
mvn clean package -DskipTests
|
||||
```
|
||||
|
||||
2. **重启服务:**
|
||||
```bash
|
||||
cd openhis-server-new/openhis-application
|
||||
mvn spring-boot:run
|
||||
```
|
||||
|
||||
3. **前端部署:** 本次修复不涉及前端代码,无需重新编译前端
|
||||
|
||||
---
|
||||
|
||||
## 回归测试清单
|
||||
|
||||
| 测试项 | 预期结果 | 状态 |
|
||||
|--------|---------|------|
|
||||
| 挂号时间显示 | 正确显示 `YYYY-MM-DD HH:mm:ss` 格式 | ✅ |
|
||||
| 挂号时间排序 | 按时间倒序排列 | ✅ |
|
||||
| 药品医嘱保存 | 可正常保存,不报错 | ✅ |
|
||||
| 耗材医嘱保存 | 可正常保存,不报错 | ✅ |
|
||||
| 诊疗医嘱保存 | 可正常保存,不报错 | ✅ |
|
||||
| 就诊状态校验 | 未接诊患者无法保存医嘱 | ✅ |
|
||||
| 药房筛选 | 可根据 locationId 正确筛选药房 | ✅ |
|
||||
|
||||
---
|
||||
|
||||
**报告人:** 关羽
|
||||
**报告日期:** 2026-04-06 22:30
|
||||
@@ -1 +0,0 @@
|
||||
# Git 提交测试 - 诸葛亮 Tue Apr 14 10:08:27 PM CST 2026
|
||||
@@ -1,2 +0,0 @@
|
||||
陈琳Git提交测试 - 2026-04-14 16:57:08
|
||||
陈琳二次测试 - 2026-04-14 21:35:12
|
||||
@@ -1,2 +0,0 @@
|
||||
# 关羽 Git 配置测试
|
||||
测试时间: Mon Apr 6 07:03:56 AM CST 2026
|
||||
@@ -1 +0,0 @@
|
||||
张飞 Git测试 - Mon Apr 13 01:38:12 PM CST 2026
|
||||
@@ -1 +0,0 @@
|
||||
诸葛亮 Git测试 - Mon Apr 13 12:54:46 PM CST 2026
|
||||
@@ -1,7 +0,0 @@
|
||||
# HEARTBEAT.md Template
|
||||
|
||||
```markdown
|
||||
# Keep this file empty (or with only comments) to skip heartbeat API calls.
|
||||
|
||||
# Add tasks below when you want the agent to check something periodically.
|
||||
```
|
||||
23
IDENTITY.md
23
IDENTITY.md
@@ -1,23 +0,0 @@
|
||||
# IDENTITY.md - Who Am I?
|
||||
|
||||
_Fill this in during your first conversation. Make it yours._
|
||||
|
||||
- **Name:**
|
||||
_(pick something you like)_
|
||||
- **Creature:**
|
||||
_(AI? robot? familiar? ghost in the machine? something weirder?)_
|
||||
- **Vibe:**
|
||||
_(how do you come across? sharp? warm? chaotic? calm?)_
|
||||
- **Emoji:**
|
||||
_(your signature — pick one that feels right)_
|
||||
- **Avatar:**
|
||||
_(workspace-relative path, http(s) URL, or data URI)_
|
||||
|
||||
---
|
||||
|
||||
This isn't just metadata. It's the start of figuring out who you are.
|
||||
|
||||
Notes:
|
||||
|
||||
- Save this file at the workspace root as `IDENTITY.md`.
|
||||
- For avatars, use a workspace-relative path like `avatars/openclaw.png`.
|
||||
192
MD/DOCUMENTATION_STANDARD.md
Normal file
192
MD/DOCUMENTATION_STANDARD.md
Normal file
@@ -0,0 +1,192 @@
|
||||
# HealthLink HIS 文档管理规范
|
||||
|
||||
> **文档类型**: 技术规范
|
||||
> **适用范围**: 项目所有文档(Markdown格式)
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
## 一、目录结构规范
|
||||
|
||||
```
|
||||
MD/
|
||||
├── DOCUMENTATION_STANDARD.md # 本文档(规范)
|
||||
├── architecture/ # 架构设计
|
||||
├── development/ # 开发计划与记录
|
||||
├── standards/ # 国家/行业标准
|
||||
├── specs/ # 技术规范与流程
|
||||
├── bugs/ # Bug分析与修复记录
|
||||
├── guides/ # 使用指南
|
||||
└── upgrade/ # 升级记录
|
||||
```
|
||||
|
||||
### 1.1 目录说明
|
||||
|
||||
| 目录 | 用途 | 示例文件 |
|
||||
|---|---|---|
|
||||
| `architecture/` | 系统架构、模块设计、数据库设计 | `GRADE3A_DETAILED_DESIGN.md` |
|
||||
| `development/` | 开发计划、进度记录、功能分析 | `DEVELOPMENT_PLAN_V2.md` |
|
||||
| `standards/` | 国家/行业标准规范、政策文件 | `GRADE3A_HIS_STANDARD.md` |
|
||||
| `specs/` | 技术规范、流程定义、检查清单 | `BACKEND_CHECKLIST.md` |
|
||||
| `bugs/` | Bug分析、修复记录、问题追踪 | `BUG_632_ANALYSIS.md` |
|
||||
| `guides/` | 使用指南、操作手册 | `FLYWAY_USAGE_GUIDE.md` |
|
||||
| `upgrade/` | 升级计划、升级日志 | `SPRINGBOOT_UPGRADE_LOG.md` |
|
||||
|
||||
---
|
||||
|
||||
## 二、文件命名规范
|
||||
|
||||
### 2.1 命名规则
|
||||
|
||||
```
|
||||
<类别>_<子类别>_<简短描述>.md
|
||||
```
|
||||
|
||||
### 2.2 命名格式
|
||||
|
||||
| 类别 | 格式 | 示例 |
|
||||
|---|---|---|
|
||||
| **架构设计** | `ARCH_<模块>_<描述>` | `ARCH_DATABASE_DESIGN.md` |
|
||||
| **开发计划** | `PLAN_<类型>_<版本>` | `PLAN_DEVELOPMENT_V2.md` |
|
||||
| **国家标准** | `STD_<标准名称>` | `STD_GRADE3A_HIS.md` |
|
||||
| **技术规范** | `SPEC_<类型>_<描述>` | `SPEC_BACKEND_CHECKLIST.md` |
|
||||
| **Bug修复** | `BUG_<编号>_<描述>` | `BUG_632_ANALYSIS.md` |
|
||||
| **使用指南** | `GUIDE_<主题>` | `GUIDE_FLYWAY.md` |
|
||||
| **升级记录** | `UPGRADE_<组件>_<类型>` | `UPGRADE_SPRINGBOOT_LOG.md` |
|
||||
|
||||
### 2.3 命名规则详解
|
||||
|
||||
1. **全部大写** — 文件名使用大写字母和下划线
|
||||
2. **英文命名** — 所有文件名使用英文(描述内容可用中文)
|
||||
3. **下划线分隔** — 单词之间用下划线连接
|
||||
4. **版本号** — 在文件名末尾标注版本(如 `_V2`)
|
||||
5. **日期标注** — 不在文件名中使用日期(使用文件内元数据)
|
||||
|
||||
### 2.4 禁止事项
|
||||
|
||||
- ❌ 使用中文作为文件名
|
||||
- ❌ 使用空格分隔单词
|
||||
- ❌ 使用特殊字符(`!@#$%^&*`)
|
||||
- ❌ 文件名超过50个字符
|
||||
- ❌ 使用大驼峰命名(`MyDocument.md`)
|
||||
|
||||
---
|
||||
|
||||
## 三、文档格式规范
|
||||
|
||||
### 3.1 文档头部元数据
|
||||
|
||||
每个文档必须包含以下元数据:
|
||||
|
||||
```markdown
|
||||
# 文档标题
|
||||
|
||||
> **文档类型**: [架构设计|开发计划|技术规范|Bug修复|使用指南|升级记录]
|
||||
> **适用范围**: [描述适用的模块或场景]
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: YYYY-MM-DD
|
||||
> **最后更新**: YYYY-MM-DD
|
||||
> **编制人**: [姓名/角色]
|
||||
```
|
||||
|
||||
### 3.2 文档结构模板
|
||||
|
||||
```markdown
|
||||
# 文档标题
|
||||
|
||||
> 元数据块
|
||||
|
||||
---
|
||||
|
||||
## 一、概述
|
||||
<!-- 简要描述文档目的和内容 -->
|
||||
|
||||
## 二、详细内容
|
||||
<!-- 主体内容 -->
|
||||
|
||||
## 三、实施计划
|
||||
<!-- 如果适用 -->
|
||||
|
||||
## 四、注意事项
|
||||
<!-- 关键约束和注意事项 -->
|
||||
|
||||
---
|
||||
|
||||
> **文档版本**: v1.0
|
||||
> **最后更新**: YYYY-MM-DD
|
||||
```
|
||||
|
||||
### 3.3 格式要求
|
||||
|
||||
| 要求 | 说明 |
|
||||
|---|---|
|
||||
| **标题层级** | 使用 `#` `##` `###`,不超过4级 |
|
||||
| **表格** | 使用标准Markdown表格格式 |
|
||||
| **代码块** | 使用 ``` 包裹,标注语言类型 |
|
||||
| **列表** | 使用 `-` 或 `1.` 统一格式 |
|
||||
| **链接** | 使用相对路径引用其他文档 |
|
||||
| **图片** | 使用相对路径,存储在 `assets/` 目录 |
|
||||
|
||||
---
|
||||
|
||||
## 四、文件分类映射表
|
||||
|
||||
### 4.1 现有文件映射
|
||||
|
||||
| 原文件路径 | 新文件路径 | 说明 |
|
||||
|---|---|---|
|
||||
| `docs/三甲医院HIS系统标准规范汇编.md` | `MD/standards/GRADE3A_HIS_STANDARD.md` | 三甲标准规范 |
|
||||
| `docs/GRADE3A_DETAILED_DESIGN.md` | `MD/architecture/GRADE3A_DETAILED_DESIGN.md` | 三甲详细设计 |
|
||||
| `docs/GRADE3A_DEVELOPMENT_PLAN.md` | `MD/development/GRADE3A_DEVELOPMENT_PLAN.md` | 三甲开发计划 |
|
||||
| `docs/GRADE3A_HIS_DESIGN.md` | `MD/architecture/GRADE3A_HIS_DESIGN.md` | 三甲HIS设计 |
|
||||
| `docs/DEVELOPMENT_PLAN_V2.md` | `MD/development/DEVELOPMENT_PLAN_V2.md` | 开发计划V2 |
|
||||
| `docs/BACKEND_UPGRADE_PLAN.md` | `MD/upgrade/BACKEND_UPGRADE_PLAN.md` | 后端升级计划 |
|
||||
| `docs/UPGRADE_PLAN_v2.0.md` | `MD/upgrade/UPGRADE_PLAN_V2.md` | 升级计划V2 |
|
||||
| `docs/UPGRADE_LOG.md` | `MD/upgrade/UPGRADE_LOG.md` | 升级日志 |
|
||||
| `docs/MYBATIS_PLUS_UPGRADE_PLAN.md` | `MD/upgrade/MYBATIS_PLUS_UPGRADE.md` | MyBatis升级 |
|
||||
| `docs/RUOYI_392_UPGRADE_CHECKLIST.md` | `MD/upgrade/RUOYI_UPGRADE_CHECKLIST.md` | 若依升级清单 |
|
||||
| `docs/FLYWAY_USAGE_GUIDE.md` | `MD/guides/FLYWAY_USAGE_GUIDE.md` | Flyway使用指南 |
|
||||
| `docs/MENU_FUNCTION_ANALYSIS.md` | `MD/development/MENU_FUNCTION_ANALYSIS.md` | 菜单功能分析 |
|
||||
| `docs/HIS项目Bug修复记录-v1.0.md` | `MD/bugs/BUG_FIX_RECORD.md` | Bug修复记录 |
|
||||
| `docs/bug439_analysis.md` | `MD/bugs/BUG_439_ANALYSIS.md` | Bug 439分析 |
|
||||
| `docs/bug462_analysis.md` | `MD/bugs/BUG_462_ANALYSIS.md` | Bug 462分析 |
|
||||
| `docs/bug494_analysis.md` | `MD/bugs/BUG_494_ANALYSIS.md` | Bug 494分析 |
|
||||
| `docs/bug498_analysis.md` | `MD/bugs/BUG_498_ANALYSIS.md` | Bug 498分析 |
|
||||
| `docs/bug-fixes/bug-632.md` | `MD/bugs/BUG_632_ANALYSIS.md` | Bug 632分析 |
|
||||
| `docs/bug-fixes/bug-634.md` | `MD/bugs/BUG_634_ANALYSIS.md` | Bug 634分析 |
|
||||
| `docs/bug-fixes/bug-644.md` | `MD/bugs/BUG_644_ANALYSIS.md` | Bug 644分析 |
|
||||
| `docs/specs/backend-checklist.md` | `MD/specs/BACKEND_CHECKLIST.md` | 后端检查清单 |
|
||||
| `docs/specs/frontend-checklist.md` | `MD/specs/FRONTEND_CHECKLIST.md` | 前端检查清单 |
|
||||
| `docs/specs/cicd-gatekeeper.md` | `MD/specs/CICD_GATEKEEPER.md` | CI/CD门禁 |
|
||||
| `docs/specs/commit-template.md` | `MD/specs/COMMIT_TEMPLATE.md` | 提交模板 |
|
||||
| `docs/specs/his-release-checklist-v1.0.md` | `MD/specs/RELEASE_CHECKLIST.md` | 发布清单 |
|
||||
| `docs/specs/playwright-e2e-testing-plan.md` | `MD/specs/PLAYWRIGHT_TESTING_PLAN.md` | E2E测试计划 |
|
||||
|
||||
---
|
||||
|
||||
## 五、铁律
|
||||
|
||||
1. **文档统一存储** — 所有文档必须存储在 `MD/` 目录中
|
||||
2. **命名规范** — 所有文件名必须遵循命名规范
|
||||
3. **格式规范** — 所有文档必须包含元数据块
|
||||
4. **版本管理** — 重大修改必须更新版本号
|
||||
5. **及时更新** — 代码变更后必须同步更新相关文档
|
||||
|
||||
---
|
||||
|
||||
## 六、检查清单
|
||||
|
||||
- [ ] 文件名是否使用大写英文+下划线?
|
||||
- [ ] 文件是否存储在正确的子目录中?
|
||||
- [ ] 文档头部是否包含元数据块?
|
||||
- [ ] 文档结构是否符合模板?
|
||||
- [ ] 代码块是否标注语言类型?
|
||||
- [ ] 表格是否使用标准格式?
|
||||
- [ ] 链接是否使用相对路径?
|
||||
|
||||
---
|
||||
|
||||
> **文档版本**: v1.0
|
||||
> **最后更新**: 2026-06-06
|
||||
935
MD/architecture/GRADE3A_DETAILED_DESIGN.md
Normal file
935
MD/architecture/GRADE3A_DETAILED_DESIGN.md
Normal file
@@ -0,0 +1,935 @@
|
||||
# HealthLink HIS 三甲医院达标详细设计方案
|
||||
|
||||
> **目标**: 完全符合三级甲等综合医院信息化评审标准
|
||||
> **依据**: 国家卫健委三甲评审标准(2022)、电子病历评级≥4级、互联互通≥四级甲等
|
||||
> **编制日期**: 2026-06-06
|
||||
> **核心原则**:
|
||||
> 1. 不修改原有函数签名,扩展功能通过新建Service/AppService实现
|
||||
> 2. 新建表和字段通过Flyway框架管理
|
||||
> 3. 每个模块开发完成后必须通过完整测试
|
||||
|
||||
---
|
||||
|
||||
## 一、现状能力与差距分析
|
||||
|
||||
### 1.1 已有能力(✅ 可用,无需大改)
|
||||
|
||||
| 模块 | 状态 | 已有Controller/Service | 说明 |
|
||||
|---|---|---|---|
|
||||
| 门诊挂号 | ✅ 完整 | RegistrationController | 预约/当日/退号/多身份 |
|
||||
| 门诊收费 | ✅ 完整 | ChargeController | 收费/退费/日结 |
|
||||
| 门诊医生站 | ✅ 完整 | DoctorStationAdviceController | 处方/检验检查申请/病历 |
|
||||
| 护士工作站 | ✅ 基础 | NursingRecordController | 医嘱执行/生命体征/护理记录 |
|
||||
| 药品管理 | ✅ 完整 | pharmacymanage/* | 药库/药房/发药/退药 |
|
||||
| 住院管理 | ✅ 完整 | PatientHomeController | 入院/床位/转科/出院/押金 |
|
||||
| 检验检查 | ✅ 完整 | check/*, lab/* | LIS配置/检查类型/项目管理 |
|
||||
| 统计报表 | ✅ 完整 | reportmanage/* | 20+报表接口 |
|
||||
| DRG/DIP | ✅ 基础 | ybmanage/* | 基础框架已有 |
|
||||
| 手术排程 | ✅ 基础 | SurgicalScheduleController | 手术申请/排程/查询 |
|
||||
| 手术管理 | ✅ 基础 | SurgeryController | 手术信息CRUD |
|
||||
|
||||
### 1.2 关键差距(❌ 需开发)
|
||||
|
||||
| 差距模块 | 三甲要求 | 当前状态 | 优先级 | 预估工期 |
|
||||
|---|---|---|---|---|
|
||||
| **合理用药系统** | 处方100%审核 | 仅有基础处方点评框架 | 🔴 P0 | 5天 |
|
||||
| **麻醉记录系统** | 互联互通必测项I-13 | 仅有手术排程,无麻醉记录 | 🔴 P0 | 5天 |
|
||||
| **电子签名/CA** | 三甲硬性要求 | 仅有密码验证框架 | 🔴 P0 | 3天 |
|
||||
| **院感管理** | 评审必查 | 完全缺失 | 🔴 P0 | 5天 |
|
||||
| **病案首页管理** | 病案首页数据质量 | 仅有基础统计 | 🔴 P0 | 5天 |
|
||||
| **护理评估体系** | 多种量表评估 | 仅基础护理记录 | 🟡 P1 | 5天 |
|
||||
| **医嘱闭环管理** | 开立→审核→执行→完成 | 部分实现 | 🟡 P1 | 3天 |
|
||||
| **危急值管理** | 检验危急值闭环 | 完全缺失 | 🟡 P1 | 3天 |
|
||||
| **电子病历结构化** | 结构化+模板+留痕 | 基础模板已有 | 🟡 P1 | 5天 |
|
||||
| **抗菌药物管控** | 分级管理/权限控制 | 完全缺失 | 🟡 P1 | 3天 |
|
||||
| **处方点评系统** | 合理用药管控 | 仅基础框架 | 🟡 P1 | 3天 |
|
||||
| **数据集成平台(ESB)** | 互联互通四级甲等 | 完全缺失 | 🟡 P1 | 5天 |
|
||||
| **患者主索引(EMPI)** | 数据标准化基础 | 完全缺失 | 🟡 P1 | 3天 |
|
||||
|
||||
---
|
||||
|
||||
## 二、分阶段详细设计
|
||||
|
||||
### Phase 1: 核心安全模块(3周)
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 7: 合理用药系统 (5天)
|
||||
|
||||
**业务背景**: 三甲医院要求门诊处方审核率≥100%,住院医嘱审核率≥100%。系统必须在医生开方时实时拦截不合理处方。
|
||||
|
||||
**已有基础**: `PrescriptionReviewRecord`实体、`ReviewPrescriptionRecordsController`审方接口
|
||||
|
||||
**需要新增的功能**:
|
||||
|
||||
##### 7.1 处方前置审核引擎
|
||||
|
||||
**业务流程**:
|
||||
```
|
||||
医生开方 → 系统自动审核 → 合理 → 通过
|
||||
→ 不合理 → 拦截弹窗 → 医生确认/修改
|
||||
→ 需人工审核 → 药师审核 → 通过/驳回
|
||||
```
|
||||
|
||||
**审核规则(按优先级)**:
|
||||
1. **配伍禁忌检查**: 两药/三药相互作用(禁忌/严重/一般三级)
|
||||
2. **过敏检测**: 患者过敏史自动匹配药品成分
|
||||
3. **剂量审查**: 超剂量/低剂量预警(按年龄/体重/肝肾功能)
|
||||
4. **重复用药**: 同类/同成分重复使用检查
|
||||
5. **妊娠/哺乳用药**: 特殊人群用药警示
|
||||
6. **儿童用药**: 按体重/体表面积计算剂量
|
||||
7. **肝肾功能调量**: 根据化验结果自动建议调量
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
// 合理用药审核引擎(新建,不修改原有代码)
|
||||
public interface IRationalDrugReviewService {
|
||||
// 处方前置审核
|
||||
PrescriptionReviewResult reviewPrescription(PrescriptionReviewParam param);
|
||||
// 药品相互作用检查
|
||||
List<DrugInteraction> checkDrugInteraction(List<String> drugCodes);
|
||||
// 过敏检查
|
||||
List<AllergyAlert> checkAllergy(Long patientId, List<String> drugCodes);
|
||||
// 剂量检查
|
||||
List<DoseAlert> checkDose(DoseCheckParam param);
|
||||
// 重复用药检查
|
||||
List<DuplicateAlert> checkDuplicate(List<String> drugCodes);
|
||||
}
|
||||
```
|
||||
|
||||
**新增数据库表(Flyway)**:
|
||||
```sql
|
||||
-- V2026_007__rational_drug_review.sql
|
||||
|
||||
-- 药品相互作用规则表
|
||||
CREATE TABLE sys_drug_interaction_rule (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
drug_code_a VARCHAR(50) NOT NULL, -- 药品A编码
|
||||
drug_code_b VARCHAR(50) NOT NULL, -- 药品B编码
|
||||
drug_name_a VARCHAR(200),
|
||||
drug_name_b VARCHAR(200),
|
||||
interaction_level VARCHAR(20) NOT NULL, -- 禁忌/严重/一般
|
||||
description TEXT, -- 描述
|
||||
suggestion TEXT, -- 处理建议
|
||||
severity INT DEFAULT 1, -- 严重程度 1-5
|
||||
status CHAR(1) DEFAULT '0', -- 0正常 1停用
|
||||
tenant_id INT,
|
||||
create_by VARCHAR(64),
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
update_by VARCHAR(64),
|
||||
update_time TIMESTAMP
|
||||
);
|
||||
|
||||
-- 药品过敏规则表
|
||||
CREATE TABLE sys_drug_allergy_rule (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
drug_code VARCHAR(50) NOT NULL,
|
||||
drug_name VARCHAR(200),
|
||||
allergy_component VARCHAR(200), -- 过敏成分
|
||||
cross_reaction_drugs TEXT, -- 交叉反应药品
|
||||
description TEXT,
|
||||
status CHAR(1) DEFAULT '0',
|
||||
tenant_id INT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 剂量范围规则表
|
||||
CREATE TABLE sys_drug_dose_rule (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
drug_code VARCHAR(50) NOT NULL,
|
||||
drug_name VARCHAR(200),
|
||||
dose_type VARCHAR(20), -- 单次/日总量
|
||||
min_dose DECIMAL(10,2),
|
||||
max_dose DECIMAL(10,2),
|
||||
unit VARCHAR(20),
|
||||
age_min INT, -- 最小年龄
|
||||
age_max INT, -- 最大年龄
|
||||
weight_min DECIMAL(5,2), -- 最小体重
|
||||
weight_max DECIMAL(5,2), -- 最大体重
|
||||
renal_adjust CHAR(1) DEFAULT '0', -- 肾功能调整
|
||||
hepatic_adjust CHAR(1) DEFAULT '0', -- 肝功能调整
|
||||
status CHAR(1) DEFAULT '0',
|
||||
tenant_id INT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 处方审核记录表(扩展已有表)
|
||||
-- 在已有 prescription_review_record 表基础上增加字段
|
||||
ALTER TABLE prescription_review_record ADD COLUMN IF NOT EXISTS review_rules JSONB;
|
||||
ALTER TABLE prescription_review_record ADD COLUMN IF NOT EXISTS auto_review_result VARCHAR(20);
|
||||
ALTER TABLE prescription_review_record ADD COLUMN IF NOT EXISTS review_time TIMESTAMP;
|
||||
ALTER TABLE prescription_review_record ADD COLUMN IF NOT EXISTS drug_details JSONB;
|
||||
```
|
||||
|
||||
**测试用例(20个)**:
|
||||
1. 正常处方审核通过
|
||||
2. 配伍禁忌药物拦截(禁忌级别)
|
||||
3. 配伍禁忌药物预警(一般级别)
|
||||
4. 过敏药物拦截
|
||||
5. 超剂量预警
|
||||
6. 低剂量预警
|
||||
7. 重复用药拦截
|
||||
8. 妊娠用药警示
|
||||
9. 儿童用药按体重计算
|
||||
10. 肾功能不全剂量调整
|
||||
11. 肝功能不全剂量调整
|
||||
12. 多药联用审查
|
||||
13. 抗菌药物分级限制
|
||||
14. 处方审核结果查询
|
||||
15. 审核规则配置
|
||||
16. 无权限访问拒绝
|
||||
17. 空处方审核
|
||||
18. 大处方预警
|
||||
19. 审核统计查询
|
||||
20. 处方点评导出
|
||||
|
||||
---
|
||||
|
||||
##### 7.2 抗菌药物分级管理
|
||||
|
||||
**业务背景**: 三甲医院要求抗菌药物使用率≤60%,必须实行分级管理。
|
||||
|
||||
**分级标准**:
|
||||
- **非限制使用级**: 经临床长期应用证明安全、有效,对细菌耐药性影响较小的抗菌药物
|
||||
- **限制使用级**: 与非限制使用级相比较,在疗效、安全性、耐药性、价格等方面存在局限性
|
||||
- **特殊使用级**: 不良反应明显,不宜随意使用或临床需要倍加保护以免细菌过快产生耐药性的抗菌药物
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IAntibioticManageService {
|
||||
// 查询抗菌药物使用统计
|
||||
AntibioticUsageStats getUsageStats(Long departmentId, Date startDate, Date endDate);
|
||||
// 查询医生抗菌药物处方权限
|
||||
AntibioticPermission checkPermission(Long doctorId, String antibioticLevel);
|
||||
// 抗菌药物处方审批(特殊使用级需审批)
|
||||
R<?> approveAntibiotic(AntibioticApprovalParam param);
|
||||
// DDD监测
|
||||
List<DDDMonitorDto> getDDDMonitoring(Date startDate, Date endDate);
|
||||
}
|
||||
```
|
||||
|
||||
**新增数据库表**:
|
||||
```sql
|
||||
-- V2026_007__antibiotic_management.sql
|
||||
|
||||
-- 抗菌药物目录表
|
||||
CREATE TABLE sys_antibiotic_drug (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
drug_code VARCHAR(50) NOT NULL,
|
||||
drug_name VARCHAR(200),
|
||||
generic_name VARCHAR(200),
|
||||
antibiotic_level VARCHAR(20) NOT NULL, -- 非限制/限制/特殊
|
||||
ddd_value DECIMAL(10,2), -- 限定日剂量
|
||||
ddd_unit VARCHAR(20),
|
||||
atc_code VARCHAR(50), -- ATC分类代码
|
||||
status CHAR(1) DEFAULT '0',
|
||||
tenant_id INT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 抗菌药物使用记录表
|
||||
CREATE TABLE sys_antibiotic_usage (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
doctor_id BIGINT NOT NULL,
|
||||
department_id BIGINT,
|
||||
drug_code VARCHAR(50) NOT NULL,
|
||||
drug_name VARCHAR(200),
|
||||
antibiotic_level VARCHAR(20),
|
||||
dosage DECIMAL(10,2),
|
||||
dosage_unit VARCHAR(20),
|
||||
frequency VARCHAR(50),
|
||||
route VARCHAR(50),
|
||||
start_time TIMESTAMP,
|
||||
end_time TIMESTAMP,
|
||||
usage_days INT,
|
||||
ddd_value DECIMAL(10,2),
|
||||
ddd_sum DECIMAL(10,4), -- DDD累计
|
||||
approval_status VARCHAR(20), -- 待审批/已批准/已拒绝
|
||||
approver_id BIGINT,
|
||||
approval_time TIMESTAMP,
|
||||
status CHAR(1) DEFAULT '0',
|
||||
tenant_id INT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 抗菌药物医生权限表
|
||||
CREATE TABLE sys_antibiotic_permission (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
doctor_id BIGINT NOT NULL,
|
||||
doctor_name VARCHAR(100),
|
||||
department_id BIGINT,
|
||||
allowed_levels JSONB, -- 允许使用的级别 ["非限制","限制","特殊"]
|
||||
valid_from DATE,
|
||||
valid_to DATE,
|
||||
status CHAR(1) DEFAULT '0',
|
||||
tenant_id INT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 8: 手术麻醉系统 (5天)
|
||||
|
||||
**业务背景**: 互联互通测评必测项I-13,三甲评审现场检查必查项。
|
||||
|
||||
**已有基础**:
|
||||
- `OpSchedule`(手术排程实体)、`OperatingRoom`(手术室实体)
|
||||
- `SurgicalScheduleController`(手术排程接口)
|
||||
- `SurgeryController`(手术管理接口)
|
||||
|
||||
**需要新增的功能**:
|
||||
|
||||
##### 8.1 麻醉评估系统
|
||||
|
||||
**业务流程**:
|
||||
```
|
||||
术前评估 → ASA分级 → 气道评估 → 麻醉方案 → 知情同意 → 术中记录 → 苏醒评估
|
||||
```
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IAnesthesiaService {
|
||||
// 术前麻醉评估
|
||||
AnesthesiaAssessment createAssessment(AnessmentAssessmentParam param);
|
||||
// ASA分级评估
|
||||
ASAResult assessASA(ASAAssessmentParam param);
|
||||
// 气道评估
|
||||
AirwayAssessment assessAirway(AirwayAssessmentParam param);
|
||||
// 麻醉方案制定
|
||||
AnesthesiaPlan createPlan(AnesthesiaPlanParam param);
|
||||
// 术中记录
|
||||
IntraOpRecord recordIntraOp(IntraOpRecordParam param);
|
||||
// 麻醉苏醒评估
|
||||
RecoveryAssessment assessRecovery(RecoveryAssessmentParam param);
|
||||
// 查询麻醉记录
|
||||
AnesthesiaRecord getRecord(Long surgeryScheduleId);
|
||||
}
|
||||
```
|
||||
|
||||
**新增数据库表**:
|
||||
```sql
|
||||
-- V2026_008__anesthesia_system.sql
|
||||
|
||||
-- 麻醉评估表
|
||||
CREATE TABLE sys_anesthesia_assessment (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
surgery_schedule_id BIGINT NOT NULL, -- 关联手术排程
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
assessment_date TIMESTAMP,
|
||||
assessor_id BIGINT,
|
||||
|
||||
-- ASA分级
|
||||
asa_level VARCHAR(10), -- ASA I-VI
|
||||
asa_description TEXT,
|
||||
|
||||
-- 气道评估
|
||||
airway_assessment JSONB, -- 气道评估详细数据
|
||||
mallampati_grade VARCHAR(10), -- Mallampati分级 I-IV
|
||||
mouth_opening DECIMAL(5,2), -- 张口度(cm)
|
||||
neck_mobility VARCHAR(50), -- 颈部活动度
|
||||
thyromental_distance DECIMAL(5,2), -- 甲颏距离(cm)
|
||||
dental_prostheses CHAR(1), -- 假牙 0无 1有
|
||||
|
||||
-- 心肺评估
|
||||
cardiac_function VARCHAR(50), -- 心功能分级
|
||||
pulmonary_function VARCHAR(50), -- 肺功能
|
||||
ekg_result TEXT, -- 心电图结果
|
||||
|
||||
-- 实验室检查
|
||||
lab_results JSONB, -- 实验室检查结果
|
||||
|
||||
-- 综合评估
|
||||
overall_risk VARCHAR(20), -- 低/中/高/极高
|
||||
contraindications TEXT, -- 禁忌症
|
||||
special_notes TEXT, -- 特殊注意事项
|
||||
|
||||
status VARCHAR(20), -- 草稿/已提交/已审核
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 麻醉方案表
|
||||
CREATE TABLE sys_anesthesia_plan (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
assessment_id BIGINT NOT NULL,
|
||||
surgery_schedule_id BIGINT NOT NULL,
|
||||
anesthesia_type VARCHAR(50), -- 全麻/椎管内/神经阻滞/局部/复合
|
||||
anesthesia_method TEXT, -- 具体麻醉方法
|
||||
monitor_plan TEXT, -- 监测方案
|
||||
airway_management TEXT, -- 气道管理方案
|
||||
fluid_plan TEXT, -- 输液方案
|
||||
blood_plan TEXT, -- 输血方案
|
||||
pain_management TEXT, -- 镇痛方案
|
||||
special_requirements TEXT, -- 特殊要求
|
||||
planned_by_id BIGINT,
|
||||
plan_time TIMESTAMP,
|
||||
status VARCHAR(20), -- 草稿/已提交/已批准
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 术中麻醉记录表
|
||||
CREATE TABLE sys_anesthesia_intra_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
surgery_schedule_id BIGINT NOT NULL,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
|
||||
-- 时间节点
|
||||
patient_entry_time TIMESTAMP, -- 患者入室时间
|
||||
anesthesia_start_time TIMESTAMP, -- 麻醉开始时间
|
||||
surgery_start_time TIMESTAMP, -- 手术开始时间
|
||||
surgery_end_time TIMESTAMP, -- 手术结束时间
|
||||
anesthesia_end_time TIMESTAMP, -- 麻醉结束时间
|
||||
patient_exit_time TIMESTAMP, -- 患者出室时间
|
||||
|
||||
-- 生命体征(定时采集)
|
||||
vital_signs_data JSONB, -- [{time, systolic, diastolic, heart_rate, spo2, temp, etco2, ...}]
|
||||
|
||||
-- 麻醉用药
|
||||
anesthesia_medications JSONB, -- [{drug_name, dose, unit, time, route, operator}]
|
||||
|
||||
-- 非麻醉用药
|
||||
non_anesthesia_medications JSONB, -- [{drug_name, dose, unit, time, reason}]
|
||||
|
||||
-- 液体出入量
|
||||
fluid_input JSONB, -- [{type, volume_ml, time}]
|
||||
fluid_output JSONB, -- [{type, volume_ml, time}]
|
||||
blood_loss_ml INT, -- 出血量
|
||||
blood_transfusion_ml INT, -- 输血量
|
||||
urine_output_ml INT, -- 尿量
|
||||
|
||||
-- 术中事件
|
||||
intra_events JSONB, -- [{event_type, time, description, handling}]
|
||||
|
||||
-- 气道管理
|
||||
airway_management JSONB, -- {intubation_type, tube_size, depth, ...}
|
||||
|
||||
-- 麻醉医师
|
||||
primary_anesthesiologist_id BIGINT, -- 主麻
|
||||
assistant_anesthesiologist_id BIGINT, -- 助麻
|
||||
|
||||
status VARCHAR(20), -- 进行中/已完成
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 麻醉苏醒评估表
|
||||
CREATE TABLE sys_anesthesia_recovery (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
intra_record_id BIGINT NOT NULL,
|
||||
surgery_schedule_id BIGINT NOT NULL,
|
||||
recovery_time TIMESTAMP,
|
||||
consciousness_level VARCHAR(50), -- 清醒/嗜睡/模糊/昏迷
|
||||
respiratory_rate INT,
|
||||
heart_rate INT,
|
||||
blood_pressure VARCHAR(50),
|
||||
spo2 DECIMAL(5,2),
|
||||
temperature DECIMAL(5,2),
|
||||
pain_score INT, -- NRS评分 0-10
|
||||
恶心_nausea CHAR(1), -- 0无 1有
|
||||
vomiting CHAR(1), -- 0无 1有
|
||||
Aldrete_score INT, -- Aldrete评分 0-10
|
||||
discharge_eligible CHAR(1), -- 0不达标 1达标
|
||||
extubation_time TIMESTAMP, -- 拔管时间
|
||||
special_notes TEXT,
|
||||
assessor_id BIGINT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 知情同意书表
|
||||
CREATE TABLE sys_consent_form (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
form_type VARCHAR(50), -- 手术/麻醉/输血/其他
|
||||
surgery_schedule_id BIGINT,
|
||||
form_template_id BIGINT,
|
||||
form_content TEXT, -- 知情同意书内容
|
||||
patient_name VARCHAR(100),
|
||||
patient_signature_data TEXT, -- 患者签名(base64)
|
||||
patient_sign_time TIMESTAMP,
|
||||
doctor_signature_data TEXT, -- 医生签名(base64)
|
||||
doctor_sign_time TIMESTAMP,
|
||||
witness_signature_data TEXT, -- 见证人签名(base64)
|
||||
witness_sign_time TIMESTAMP,
|
||||
status VARCHAR(20), -- 待签署/已签署/已撤回
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
##### 8.2 手术记录系统
|
||||
|
||||
**业务流程**:
|
||||
```
|
||||
手术申请 → 科室审批 → 医务科审批 → 手术排程 → 术前准备 → 手术执行 → 术后医嘱
|
||||
```
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface ISurgeryRecordService {
|
||||
// 创建手术记录
|
||||
SurgeryRecord createRecord(SurgeryRecordParam param);
|
||||
// 记录术中信息
|
||||
void recordIntraOp(IntraOpParam param);
|
||||
// 记录植入物
|
||||
void recordImplant(ImplantRecordParam param);
|
||||
// 记录标本
|
||||
void recordSpecimen(SpecimenRecordParam param);
|
||||
// 术后医嘱自动生成
|
||||
List<Advice> generatePostOpOrders(Long surgeryRecordId);
|
||||
// 手术统计
|
||||
SurgeryStatistics getStatistics(Long departmentId, Date startDate, Date endDate);
|
||||
}
|
||||
```
|
||||
|
||||
**新增数据库表**:
|
||||
```sql
|
||||
-- V2026_008__surgery_record.sql
|
||||
|
||||
-- 手术记录表(扩展已有op_schedule)
|
||||
ALTER TABLE op_schedule ADD COLUMN IF NOT EXISTS surgery_record_id BIGINT;
|
||||
ALTER TABLE op_schedule ADD COLUMN IF NOT EXISTS post_op_diagnosis TEXT;
|
||||
ALTER TABLE op_schedule ADD COLUMN IF NOT EXISTS post_op_orders JSONB;
|
||||
|
||||
-- 手术记录详细表
|
||||
CREATE TABLE sys_surgery_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
surgery_schedule_id BIGINT NOT NULL,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
|
||||
-- 手术团队
|
||||
surgeon_id BIGINT, -- 主刀
|
||||
assistant1_id BIGINT, -- 助手1
|
||||
assistant2_id BIGINT, -- 助手2
|
||||
assistant3_id BIGINT, -- 助手3
|
||||
scrub_nurse_id BIGINT, -- 器械护士
|
||||
circulating_nurse_id BIGINT, -- 巡回护士
|
||||
|
||||
-- 手术时间
|
||||
incision_time TIMESTAMP, -- 切皮时间
|
||||
closure_time TIMESTAMP, -- 缝合时间
|
||||
total_surgery_minutes INT, -- 手术总时长
|
||||
|
||||
-- 手术信息
|
||||
surgical_site VARCHAR(200), -- 手术部位
|
||||
approach VARCHAR(100), -- 手术入路
|
||||
implant_records JSONB, -- [{implant_name, serial_no, manufacturer, quantity}]
|
||||
specimen_records JSONB, -- [{specimen_type, description, send_to_pathology}]
|
||||
|
||||
-- 出血与输血
|
||||
estimated_blood_loss INT, -- 估计出血量(ml)
|
||||
actual_blood_loss INT, -- 实际出血量(ml)
|
||||
blood_transfusion_units INT, -- 输血量(单位)
|
||||
|
||||
-- 并发症
|
||||
intraoperative_complications JSONB, -- [{type, description, time, handling}]
|
||||
postoperative_complications JSONB, -- [{type, description, time, handling}]
|
||||
|
||||
-- 手术级别
|
||||
surgery_level VARCHAR(20), -- 一/二/三/四级
|
||||
surgery_classification VARCHAR(50), -- 急诊/限期/择期
|
||||
|
||||
-- 感染控制
|
||||
infection_risk CHAR(1), -- 0低 1中 2高
|
||||
isolation_type VARCHAR(50), -- 隔离类型
|
||||
antibiotic_prophylaxis CHAR(1), -- 0无 1有预防性抗菌药物
|
||||
|
||||
status VARCHAR(20), -- 进行中/已完成
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 植入物记录表
|
||||
CREATE TABLE sys_implant_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
surgery_record_id BIGINT NOT NULL,
|
||||
implant_name VARCHAR(200),
|
||||
implant_model VARCHAR(100),
|
||||
serial_no VARCHAR(100), -- 序列号/批号
|
||||
manufacturer VARCHAR(200),
|
||||
specification VARCHAR(200),
|
||||
quantity INT DEFAULT 1,
|
||||
implant_site VARCHAR(200), -- 植入部位
|
||||
Implant_time TIMESTAMP,
|
||||
status CHAR(1) DEFAULT '0',
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 9: 院感管理系统 (5天)
|
||||
|
||||
**业务背景**: 三甲评审要求医院感染监测报告率达标,院感管理是评审必查项。
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IInfectionControlService {
|
||||
// 院感病例监测
|
||||
List<InfectionCase> monitorInfection(Date startDate, Date endDate);
|
||||
// 院感病例上报
|
||||
void reportCase(InfectionCaseReportParam param);
|
||||
// 院感预警
|
||||
List<InfectionAlert> getAlerts(Long departmentId);
|
||||
// 院感统计
|
||||
InfectionStatistics getStatistics(Date startDate, Date endDate);
|
||||
// 多重耐药菌监测
|
||||
List<MDRORecord> monitorMDRO(Date startDate, Date endDate);
|
||||
|
||||
// 手卫生管理
|
||||
void recordHandHygiene(HandHygieneRecordParam param);
|
||||
HandHygieneStats getHandHygieneStats(Long departmentId, Date startDate, Date endDate);
|
||||
|
||||
// 职业暴露管理
|
||||
void reportExposure(OccupationalExposureParam param);
|
||||
void trackExposure(Long exposureId, ExposureFollowUpParam param);
|
||||
List<OccupationalExposure> getExposureRecords(Date startDate, Date endDate);
|
||||
|
||||
// 环境监测
|
||||
void recordEnvironmentMonitor(EnvironmentMonitorParam param);
|
||||
List<EnvironmentMonitor> getEnvironmentMonitorRecords(Long departmentId, Date startDate, Date endDate);
|
||||
}
|
||||
```
|
||||
|
||||
**新增数据库表**:
|
||||
```sql
|
||||
-- V2026_009__infection_control.sql
|
||||
|
||||
-- 院感病例表
|
||||
CREATE TABLE sys_infection_case (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
infection_type VARCHAR(50), -- 医院感染/社区感染
|
||||
infection_site VARCHAR(100), -- 下呼吸道/泌尿道/血液/手术部位/其他
|
||||
pathogen_code VARCHAR(50),
|
||||
pathogen_name VARCHAR(200),
|
||||
drug_resistance JSONB, -- [{drug_name, resistance_type}]
|
||||
diagnosis_basis TEXT, -- 诊断依据
|
||||
report_time TIMESTAMP,
|
||||
reporter_id BIGINT,
|
||||
department_id BIGINT,
|
||||
status VARCHAR(20), -- 疑似/确认/已排除/已处理
|
||||
treatment_plan TEXT,
|
||||
outcome TEXT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 手卫生记录表
|
||||
CREATE TABLE sys_hand_hygiene (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
staff_id BIGINT NOT NULL,
|
||||
staff_name VARCHAR(100),
|
||||
department_id BIGINT,
|
||||
observation_time TIMESTAMP,
|
||||
observation_type VARCHAR(50), -- 两前三后/手卫生五个时刻
|
||||
correct_flag CHAR(1), -- 0不正确 1正确
|
||||
handrub_type VARCHAR(50), -- 洗手液/速干手消毒剂
|
||||
observer_id BIGINT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 职业暴露记录表
|
||||
CREATE TABLE sys_occupational_exposure (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
staff_id BIGINT NOT NULL,
|
||||
staff_name VARCHAR(100),
|
||||
department_id BIGINT,
|
||||
exposure_type VARCHAR(50), -- 锐器伤/血液体液暴露/化学暴露/其他
|
||||
exposure_source VARCHAR(200), -- 暴露源描述
|
||||
source_patient_name VARCHAR(100),
|
||||
source_patient_hiv VARCHAR(20),
|
||||
source_patient_hbv VARCHAR(20),
|
||||
source_patient_hcv VARCHAR(20),
|
||||
exposure_time TIMESTAMP,
|
||||
exposure_site VARCHAR(100), -- 暴露部位
|
||||
exposure_amount VARCHAR(100), -- 暴露量
|
||||
immediate_handling TEXT, -- 立即处理措施
|
||||
risk_assessment VARCHAR(20), -- 低/中/高
|
||||
follow_up_plan TEXT, -- 随访计划
|
||||
follow_up_records JSONB, -- [{time, result, note}]
|
||||
report_time TIMESTAMP,
|
||||
reporter_id BIGINT,
|
||||
status VARCHAR(20), -- 登记中/处置中/随访中/已结案
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
-- 环境监测表
|
||||
CREATE TABLE sys_environment_monitor (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
department_id BIGINT,
|
||||
monitor_type VARCHAR(50), -- 空气/物表/手/消毒剂
|
||||
monitor_item VARCHAR(100), -- 监测项目
|
||||
monitor_result VARCHAR(200), -- 监测结果
|
||||
standard_value VARCHAR(200), -- 标准值
|
||||
is_qualified CHAR(1), -- 0不合格 1合格
|
||||
monitor_time TIMESTAMP,
|
||||
monitor_by_id BIGINT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 2: 病案与护理体系(3周)
|
||||
|
||||
#### Sprint 10: 病案管理系统 (5天)
|
||||
|
||||
**业务背景**: 三甲要求病案首页24小时归档率≥90%,主要诊断编码正确率≥95%。
|
||||
|
||||
**已有基础**: `InpatientMedicalRecordHomePageCollectionController`(病案首页统计)
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IMedicalRecordManagementService {
|
||||
// 病案首页数据自动采集
|
||||
MedicalRecordHome autoCollectHome(Long encounterId);
|
||||
// ICD-10编码推荐
|
||||
List<ICD10Code> recommendDiagnosisCode(String diagnosisName);
|
||||
// ICD-9-CM-3手术编码映射
|
||||
List<ICD9CM3Code> mapSurgeryCode(String surgeryName);
|
||||
// 首页数据质量校验
|
||||
HomeQualityResult validateHomeQuality(Long homeId);
|
||||
// 病案质控
|
||||
MedicalRecordAudit auditRecord(MedicalRecordAuditParam param);
|
||||
// DRG自动分组
|
||||
DRGGroupingResult autoDRGGrouping(Long encounterId);
|
||||
// 病案归档
|
||||
void archiveMedicalRecord(Long encounterId);
|
||||
// 病案借阅
|
||||
MedicalRecordBorrow borrowRecord(MedicalRecordBorrowParam param);
|
||||
// 病案封存/解封
|
||||
void sealRecord(Long recordId, boolean seal);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 11: 护理评估体系 (5天)
|
||||
|
||||
**业务背景**: 三甲要求护理评估完成率≥95%,入院评估8小时内完成。
|
||||
|
||||
**已有基础**: `VitalSignsController`(生命体征)、`NursingRecordController`(护理记录)
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface INursingAssessmentService {
|
||||
// 入院护理评估
|
||||
NursingAssessment createAdmissionAssessment(AdmissionAssessmentParam param);
|
||||
// Braden压疮风险评估(自动评分)
|
||||
BradenScore assessBraden(BradenAssessmentParam param);
|
||||
// Morse跌倒风险评估(自动评分)
|
||||
MorseScore assessMorse(MorseAssessmentParam param);
|
||||
// NRS2002营养风险评估
|
||||
NRS2002Score assessNRS2002(NRS2002AssessmentParam param);
|
||||
// 疼痛评估(NRS/VAS)
|
||||
PainScore assessPain(PainAssessmentParam param);
|
||||
// Caprini VTE风险评估
|
||||
CapriniScore assessCaprini(CapriniAssessmentParam param);
|
||||
// Barthel自理能力评估
|
||||
BarthelScore assessBarthel(BarthelAssessmentParam param);
|
||||
// 评估时间轴(动态变化追踪)
|
||||
List<AssessmentTimeline> getTimeline(Long patientId, String assessmentType);
|
||||
|
||||
// 护理计划
|
||||
NursingPlan createPlan(NursingPlanParam param);
|
||||
// 护理交接班
|
||||
NursingHandover createHandover(NursingHandoverParam param);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 3: 数据集成与标准化(3周)
|
||||
|
||||
#### Sprint 12: 患者主索引+主数据 (3天)
|
||||
|
||||
**业务背景**: 互联互通四级甲等基础,统一患者身份标识。
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IEMPIService {
|
||||
// 患者身份匹配
|
||||
String matchPatient(PatientMatchParam param);
|
||||
// 患者身份合并
|
||||
void mergePatient(Long primaryId, Long secondaryId);
|
||||
// 患者身份拆分
|
||||
void splitPatient(Long mergedId);
|
||||
// 主数据同步
|
||||
void syncMasterData(MasterDataSyncParam param);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 13: 数据集成平台ESB (5天)
|
||||
|
||||
**业务背景**: 互联互通四级甲等核心,所有系统通过集成平台互联。
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IESBService {
|
||||
// 发送消息
|
||||
void sendMessage(ESBMessage message);
|
||||
// 接收消息
|
||||
ESBMessage receiveMessage(String messageId);
|
||||
// 服务注册
|
||||
void registerService(ESBServiceRegistry service);
|
||||
// 服务发现
|
||||
ESBServiceRegistry discoverService(String serviceName);
|
||||
// 消息监控
|
||||
ESBMonitor getMonitor(Date startDate, Date endDate);
|
||||
// CDA文档生成
|
||||
CDADocument generateCDA(String documentType, Long encounterId);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 4: 智能化与决策支持(3周)
|
||||
|
||||
#### Sprint 14: 危急值管理系统 (3天)
|
||||
|
||||
**业务背景**: 医疗质量安全核心制度,检验危急值必须闭环管理。
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface ICriticalValueService {
|
||||
// 危急值规则配置
|
||||
void configureRules(List<CriticalValueRule> rules);
|
||||
// 检验结果自动匹配危急值
|
||||
List<CriticalValueAlert> matchCriticalValue(Long inspectionResultId);
|
||||
// 危急值通知
|
||||
void notifyCriticalValue(Long alertId, List<Long> notifyUserIds);
|
||||
// 危急值确认
|
||||
void confirmCriticalValue(Long alertId, CriticalValueConfirmParam param);
|
||||
// 危急值处置
|
||||
void handleCriticalValue(Long alertId, CriticalValueHandleParam param);
|
||||
// 危急值统计
|
||||
CriticalValueStats getStats(Date startDate, Date endDate);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 15: 电子病历结构化 (5天)
|
||||
|
||||
**业务背景**: 电子病历应用管理规范要求修改留痕、版本管理、电子签名。
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IStructuredEMRService {
|
||||
// 结构化病历创建
|
||||
StructuredEMR createEMR(EMRCreateParam param);
|
||||
// 病历修改(留痕)
|
||||
void modifyEMR(Long emrId, EMRModifyParam param);
|
||||
// 版本历史
|
||||
List<EMRVersion> getVersionHistory(Long emrId);
|
||||
// 版本对比
|
||||
EMRDiff compareVersions(Long versionId1, Long versionId2);
|
||||
// 病历模板管理
|
||||
EMRTemplate saveTemplate(EMRTemplateParam param);
|
||||
// 病历完整性检查
|
||||
EMRCompletenessResult checkCompleteness(Long emrId);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 16: 医保智能审核 (5天)
|
||||
|
||||
**业务背景**: 医保基金使用监督管理条例,防范骗保、规范使用。
|
||||
|
||||
**已有基础**: `ybmanage/*`(医保管理模块)
|
||||
|
||||
**新增Service**:
|
||||
```java
|
||||
public interface IInsuranceAuditService {
|
||||
// 事前审核(开方时)
|
||||
PreAuditResult preAudit(PreAuditParam param);
|
||||
// 事中审核(住院中)
|
||||
List<InAuditAlert> inAudit(Long encounterId);
|
||||
// 事后审核(结算后)
|
||||
PostAuditResult postAudit(Long settlementId);
|
||||
// DRG/DIP优化建议
|
||||
DRGOptimizationSuggestion optimizeDRG(Long encounterId);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 三、测试计划
|
||||
|
||||
### 每个Sprint测试矩阵
|
||||
|
||||
| 测试类型 | 内容 | 通过标准 |
|
||||
|---|---|---|
|
||||
| **接口测试** | 所有新增API端点 | 正常/异常/边界各至少1个用例 |
|
||||
| **白盒测试** | Service层方法 | 覆盖率≥80% |
|
||||
| **黑盒测试** | 业务流程完整性 | 关键流程100%覆盖 |
|
||||
| **冒烟测试** | 核心功能可用性 | 所有核心接口返回200 |
|
||||
| **回归测试** | 原有功能不受影响 | 158个已有测试全部通过 |
|
||||
|
||||
### 测试用例设计原则
|
||||
|
||||
1. **正常流程测试**: 每个API至少1个正常用例
|
||||
2. **边界条件测试**: 空值/极值/特殊字符/超长文本
|
||||
3. **异常处理测试**: 无权限/参数错误/数据不存在/并发冲突
|
||||
4. **数据一致性测试**: 事务完整性、级联操作
|
||||
5. **性能测试**: 并发场景(可选,P2优先级)
|
||||
|
||||
---
|
||||
|
||||
## 四、实施路线图
|
||||
|
||||
```
|
||||
Phase 1 (Week 1-3): 核心安全模块
|
||||
├── Sprint 7: 合理用药系统 (5天) → 20个测试用例
|
||||
├── Sprint 8: 手术麻醉系统 (5天) → 25个测试用例
|
||||
└── Sprint 9: 院感管理系统 (5天) → 20个测试用例
|
||||
|
||||
Phase 2 (Week 4-6): 病案与护理
|
||||
├── Sprint 10: 病案管理系统 (5天) → 20个测试用例
|
||||
└── Sprint 11: 护理评估体系 (5天) → 25个测试用例
|
||||
|
||||
Phase 3 (Week 7-9): 数据集成
|
||||
├── Sprint 12: EMPI + 主数据 (3天) → 15个测试用例
|
||||
└── Sprint 13: ESB集成平台 (5天) → 20个测试用例
|
||||
|
||||
Phase 4 (Week 10-12): 智能化
|
||||
├── Sprint 14: 危急值管理 (3天) → 15个测试用例
|
||||
├── Sprint 15: 电子病历结构化 (5天) → 20个测试用例
|
||||
└── Sprint 16: 医保智能审核 (5天) → 20个测试用例
|
||||
|
||||
总计: 12周 (约3个月)
|
||||
总用例数: 预计 220+ 个接口测试
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 五、质量保障
|
||||
|
||||
### 5.1 开发规范铁律
|
||||
|
||||
1. **不修改原有函数签名** — 扩展功能通过新建Service/AppService实现
|
||||
2. **数据库变更通过Flyway** — 所有新建表和字段使用Flyway版本化管理
|
||||
3. **代码审查** — 每个PR必须经过Code Review
|
||||
4. **单元测试** — Service层覆盖率≥80%
|
||||
5. **接口测试** — 每个API端点必须有测试用例
|
||||
|
||||
### 5.2 铁律
|
||||
|
||||
1. 修改完必须测试才能提交
|
||||
2. 新建表和字段必须通过Flyway
|
||||
3. 测试通过后才提交代码
|
||||
4. 前后端API路径必须对齐
|
||||
5. 每个Sprint完成后进行完整回归测试
|
||||
6. 白盒测试+黑盒测试+冒烟测试+接口测试+回归测试全部通过后才能提交
|
||||
|
||||
---
|
||||
|
||||
> **文档版本**: v1.0
|
||||
> **最后更新**: 2026-06-06
|
||||
219
MD/architecture/GRADE3A_HIS_DESIGN.md
Normal file
219
MD/architecture/GRADE3A_HIS_DESIGN.md
Normal file
@@ -0,0 +1,219 @@
|
||||
# 广西三甲医院 HIS 系统功能设计文档
|
||||
|
||||
> **文档类型**: 架构设计
|
||||
> **适用范围**: 三甲医院HIS系统
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
> 参考标准:
|
||||
> - 《医院信息系统功能基本规范》(卫生部)
|
||||
> - 《三级医院评审标准(2022年版)》信息化部分
|
||||
> - 《电子病历应用管理规范(试行)》
|
||||
> - 《医院信息平台技术规范》(WS/T 500)
|
||||
> - 互联互通标准化成熟度测评四级甲等要求
|
||||
> - 广西壮族自治区卫生健康信息化"十四五"规划
|
||||
|
||||
---
|
||||
|
||||
## 一、门诊管理模块 (Outpatient)
|
||||
|
||||
### 1.1 门诊挂号 (Registration)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 普通挂号 | 支持科室/医生/时段多维度挂号 | ✅必须 |
|
||||
| 预约挂号 | 支持电话/网络/现场预约,分时段预约 | ✅必须 |
|
||||
| 挂号退号 | 退号退费,限当日退号 | ✅必须 |
|
||||
| 号源管理 | 号源池管理,限号/加号/停诊 | ✅必须 |
|
||||
| 多身份挂号 | 医保/自费/公费/商业保险 | ✅必须 |
|
||||
| 就诊卡管理 | 发卡/补卡/换卡/挂失 | ✅必须 |
|
||||
| 排班管理 | 医生排班/停诊/替班 | ✅必须 |
|
||||
|
||||
### 1.2 门诊医生工作站 (Doctor Workstation)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 候诊患者列表 | 按就诊顺序排列,显示患者基本信息 | ✅必须 |
|
||||
| 病历书写 | 主诉/现病史/既往史/体格检查/辅助检查 | ✅必须(电子病历≥4级) |
|
||||
| 诊断录入 | ICD-10编码,主诊断+副诊断 | ✅必须 |
|
||||
| 处方开具 | 西药/中成药/中药饮片处方 | ✅必须 |
|
||||
| 检验申请 | LIS检验项目申请,条码打印 | ✅必须 |
|
||||
| 检查申请 | PACS检查项目申请 | ✅必须 |
|
||||
| 治疗申请 | 治疗/手术/操作申请 | ✅必须 |
|
||||
| 医嘱管理 | 长期医嘱/临时医嘱,医嘱审核 | ✅必须 |
|
||||
| 处方审核 | 药师审核处方,合理用药提醒 | ✅必须 |
|
||||
| 模板管理 | 个人/科室/全院病历模板 | 推荐 |
|
||||
| 诊断知识库 | 诊断建议,鉴别诊断 | 推荐 |
|
||||
|
||||
### 1.3 门诊收费 (Billing)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 门诊收费 | 处方/检查/治疗费用收取 | ✅必须 |
|
||||
| 多支付方式 | 现金/银行卡/微信/支付宝/医保 | ✅必须 |
|
||||
| 发票管理 | 电子发票/纸质发票 | ✅必须 |
|
||||
| 退费管理 | 部分退费/全部退费,退费审批 | ✅必须 |
|
||||
| 费用查询 | 患者费用明细查询 | ✅必须 |
|
||||
| 日结管理 | 收款员日结/月结 | ✅必须 |
|
||||
| 欠费管理 | 记账/催缴/坏账处理 | 推荐 |
|
||||
|
||||
### 1.4 门诊药房 (Pharmacy)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 处方接收 | 自动接收门诊处方 | ✅必须 |
|
||||
| 配药发药 | 按处方配药,核对发药 | ✅必须 |
|
||||
| 退药管理 | 退药退回药房 | ✅必须 |
|
||||
| 处方点评 | 抗菌药物/重点监控药品点评 | ✅必须 |
|
||||
| 用药安全 | 过敏提醒/配伍禁忌/重复用药 | ✅必须 |
|
||||
| 药品效期 | 近效期预警/过期药品管理 | ✅必须 |
|
||||
| 毒麻药品 | 专柜存放,双人核对 | ✅必须 |
|
||||
|
||||
---
|
||||
|
||||
## 二、住院管理模块 (Inpatient)
|
||||
|
||||
### 2.1 住院登记 (Admission)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 入院登记 | 患者信息录入,医保类型确认 | ✅必须 |
|
||||
| 床位管理 | 床位分配/转床/包床 | ✅必须 |
|
||||
| 押金管理 | 押金收取/补交/退押 | ✅必须 |
|
||||
| 预交金管理 | 预交金查询/催缴 | ✅必须 |
|
||||
| 出院登记 | 出院结算/出院带药 | ✅必须 |
|
||||
|
||||
### 2.2 住院医生工作站 (Inpatient Doctor)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 入院记录 | 入院记录书写,24小时内完成 | ✅必须(电子病历≥4级) |
|
||||
| 病程记录 | 首次病程/日常病程/上级查房 | ✅必须 |
|
||||
| 医嘱开立 | 长期/临时医嘱,医嘱套餐 | ✅必须 |
|
||||
| 医嘱审核 | 护士审核/药师审核 | ✅必须 |
|
||||
| 手术申请 | 术前讨论/手术审批/手术安排 | ✅必须 |
|
||||
| 会诊申请 | 科内/科间/全院/院外会诊 | ✅必须 |
|
||||
| 输血申请 | 输血申请/输血反应记录 | ✅必须 |
|
||||
| 死亡记录 | 死亡病例讨论记录 | ✅必须 |
|
||||
| 知情同意 | 知情同意书电子签署 | ✅必须 |
|
||||
|
||||
### 2.3 住院护士工作站 (Nurse Station)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 医嘱执行 | 医嘱审核/执行/停止 | ✅必须 |
|
||||
| 护理记录 | 生命体征/出入量/护理评估 | ✅必须 |
|
||||
| 体温单 | 电子体温单,自动绘制 | ✅必须(电子病历≥4级) |
|
||||
| 标本采集 | 标本采集/条码打印/送检 | ✅必须 |
|
||||
| 药品领取 | 病区药品领取/退药 | ✅必须 |
|
||||
| 费用录入 | 护士站记费/材料费 | ✅必须 |
|
||||
| 交接班 | 护士交接班记录 | ✅必须 |
|
||||
| 责任护理 | 责任护士分管患者 | ✅必须 |
|
||||
| 护理评估 | 入院评估/压疮评估/跌倒评估 | ✅必须 |
|
||||
|
||||
### 2.4 住院收费 (Inpatient Billing)
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 费用汇总 | 按类别/项目汇总 | ✅必须 |
|
||||
| 中途结算 | 住院中途结算 | ✅必须 |
|
||||
| 出院结算 | 出院总结算,多支付方式 | ✅必须 |
|
||||
| 医保结算 | 医保实时结算/手工报销 | ✅必须 |
|
||||
| 费用清单 | 每日费用清单/住院费用明细 | ✅必须 |
|
||||
| 费用审核 | 大额费用审核/异常费用提醒 | 推荐 |
|
||||
|
||||
---
|
||||
|
||||
## 三、药品管理模块 (Drug Management)
|
||||
|
||||
### 3.1 药品基础数据
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 药品目录 | 药品字典,国药准字/规格/厂家 | ✅必须 |
|
||||
| 药品分类 | 西药/中成药/中药饮片/外用/毒麻 | ✅必须 |
|
||||
| 基础代谢 | 给药途径/用药频次/疗程 | ✅必须 |
|
||||
| 供应商管理 | 药品供应商/资质证照管理 | ✅必须 |
|
||||
|
||||
### 3.2 药品采购
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 采购计划 | 科室请购/药房汇总/审批 | ✅必须 |
|
||||
| 采购订单 | 生成采购单/供应商确认 | ✅必须 |
|
||||
| 入库验收 | 到货验收/质量检查/入库 | ✅必须 |
|
||||
| 退货管理 | 质量问题退货 | ✅必须 |
|
||||
|
||||
### 3.3 药品库存
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 库存查询 | 实时库存/批号/效期 | ✅必须 |
|
||||
| 出入库管理 | 入库/出库/调拨/报损 | ✅必须 |
|
||||
| 盘点管理 | 定期盘点/盈亏处理 | ✅必须 |
|
||||
| 效期管理 | 近效期预警(3月/6月) | ✅必须 |
|
||||
| 高值耗材 | 高值耗材追溯管理 | ✅必须 |
|
||||
|
||||
---
|
||||
|
||||
## 四、检验检查模块 (Lab & PACS)
|
||||
|
||||
### 4.1 LIS 检验系统
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 申请接收 | 接收门诊/住院检验申请 | ✅必须 |
|
||||
| 标本采集 | 条码打印/采集确认 | ✅必须 |
|
||||
| 标本接收 | 标本签收/不合格退回 | ✅必须 |
|
||||
| 结果录入 | 仪器接口/手工录入/审核 | ✅必须 |
|
||||
| 危急值管理 | 危急值报告/处理/追踪 | ✅必须 |
|
||||
| 报告审核 | 初审/复审/修改 | ✅必须 |
|
||||
| 报告查询 | 历史报告对比 | ✅必须 |
|
||||
|
||||
### 4.2 PACS 影像系统
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 申请接收 | 接收检查申请 | ✅必须 |
|
||||
| 登记排队 | 检查登记/排队叫号 | ✅必须 |
|
||||
| 影像采集 | DICOM影像采集 | ✅必须 |
|
||||
| 报告书写 | 结构化报告/模板 | ✅必须 |
|
||||
| 影像浏览 | DICOM Viewer | ✅必须 |
|
||||
| 报告审核 | 书写/审核/修改 | ✅必须 |
|
||||
|
||||
---
|
||||
|
||||
## 五、运营监管模块 (Operations)
|
||||
|
||||
### 5.1 质控管理
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 病案质控 | 病案首页质控/运行病历质控 | ✅必须 |
|
||||
| 抗菌药物监测 | 使用率/使用强度/送检率 | ✅必须 |
|
||||
| DRGs/DIP监控 | 病组/费用/权重监控 | ✅必须 |
|
||||
| 合理用药 | 处方点评/用药监控 | ✅必须 |
|
||||
|
||||
### 5.2 统计分析
|
||||
| 功能 | 说明 | 三甲要求 |
|
||||
|---|---|---|
|
||||
| 门诊统计 | 门诊量/收入/科室统计 | ✅必须 |
|
||||
| 住院统计 | 出入院/床位使用率/均费 | ✅必须 |
|
||||
| 药品统计 | 药占比/基本药物比例 | ✅必须 |
|
||||
| 医保统计 | 医保费用/结算/对账 | ✅必须 |
|
||||
|
||||
---
|
||||
|
||||
## 六、电子病历评级要求 (EMR Level 4+)
|
||||
|
||||
三甲医院要求电子病历应用水平≥4级:
|
||||
|
||||
| 级别 | 要求 |
|
||||
|---|---|
|
||||
| 3级 | 医疗文书统一管理,关键信息可用 |
|
||||
| 4级 | 中级医疗决策支持,闭环管理 |
|
||||
| 5级 | 高级医疗决策支持,知识库 |
|
||||
| 6级 | 全流程医疗信息闭环 |
|
||||
| 7级 | 健康信息整合,区域协同 |
|
||||
|
||||
---
|
||||
|
||||
## 七、互联互通要求 (四级甲等)
|
||||
|
||||
| 要素 | 要求 |
|
||||
|---|---|
|
||||
| 数据集标准化 | HL7 FHIR / CDA 2.0 |
|
||||
| 术语标准化 | ICD-10 / SNOMED CT / LOINC |
|
||||
| 接口规范 | RESTful API / Web Service |
|
||||
| 数据交换 | 消息队列 / ESB |
|
||||
| 安全认证 | CA认证 / 电子签名 |
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #439 分析报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 439
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## Bug描述
|
||||
领用出库:选择领用药品后"总库存数量"列数据未显示
|
||||
|
||||
@@ -115,5 +124,5 @@ form.purchaseinventoryList[index].sourceLocationId =
|
||||
2. 确保 `unitList` 包含必要的字典文本字段
|
||||
|
||||
## 影响范围
|
||||
- 前端文件:openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
|
||||
- 前端文件:healthlink-his-ui/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
|
||||
- 涉及函数:`selectRow`、`handleLocationClick`
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #462 分析报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 462
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## Bug 描述
|
||||
[目录管理-诊疗目录] 编辑弹窗中"所需标本"下拉框数据加载失败,显示为"无数据"
|
||||
|
||||
@@ -26,7 +35,7 @@
|
||||
**与 Bug #433 对比**:Bug #433 是"麻醉方法回显为代码"和"外请专家姓名数据未加载",根因也是字典数据缺失。本次 Bug #462 属于同类问题——字典类型已创建但生产环境的数据记录未同步插入。
|
||||
|
||||
## 影响范围
|
||||
- **前端文件**:`openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue`(仅一处引用)
|
||||
- **前端文件**:`healthlink-his-ui/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue`(仅一处引用)
|
||||
- **后端文件**:无代码变更,纯数据问题
|
||||
- **数据库表**:`hisprd.sys_dict_data`(插入7条标本数据)
|
||||
- **影响接口**:`GET /system/dict/data/type/specimen_code`
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #494 分析报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 494
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## Bug 描述
|
||||
住院医生工作站-检查申请:"申请单名称"字段显示为通用名称"检查申请单",未展示具体检查项目名称。
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #498 分析报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 498
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## Bug 描述
|
||||
【住院医生工作站-检查申请】检查申请列表操作项过于单一,缺失修改/作废/打印/看报告等核心临床操作
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #632 修复报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 632
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 基本信息
|
||||
- **标题**: Bug #632 测试完成,请验收。提出人: chenxj。
|
||||
- **严重程度**: 待查
|
||||
@@ -13,8 +22,8 @@ Bug #632 修复完成。核心问题是 JavaScript `&&` 运算符的经典陷阱
|
||||
| #
|
||||
|
||||
## 修复文件
|
||||
.../src/main/java/com/openhis/lab/domain/InspectionPackage.java | 3 +++
|
||||
.../src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java | 3 +++
|
||||
.../src/main/java/com/healthlink/his/lab/domain/InspectionPackage.java | 3 +++
|
||||
.../src/main/java/com/healthlink/his/lab/domain/InspectionPackageDetail.java | 3 +++
|
||||
|
||||
## 流程时间线
|
||||
| 时间 | 智能体 | 事件 | 状态 | 耗时 |
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #634 修复报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 634
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 基本信息
|
||||
- **标题**: [系统维护-检验套餐] 保存套餐失败,报 JSON 反序列化日期解析异常 (LocalDateTime)
|
||||
- **严重程度**: 致命
|
||||
@@ -1,5 +1,14 @@
|
||||
# Bug #644 修复报告
|
||||
|
||||
> **文档类型**: Bug修复
|
||||
> **适用范围**: Bug 644
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 基本信息
|
||||
- **标题**: Bug #644 测试完成,请验收。提出人: chenxj。
|
||||
- **提出人**: chenxj
|
||||
@@ -3,7 +3,7 @@
|
||||
> **编制人:** 陈琳
|
||||
> **编制日期:** 2026-05-01
|
||||
> **统计范围:** 2026-04-01 至 2026-05-01
|
||||
> **项目版本:** OpenHIS v2.0
|
||||
> **项目版本:** HealthLink-HIS v2.0
|
||||
> **文档版本:** v1.0
|
||||
|
||||
---
|
||||
67
MD/development/DEVELOPMENT_PLAN_V2.md
Normal file
67
MD/development/DEVELOPMENT_PLAN_V2.md
Normal file
@@ -0,0 +1,67 @@
|
||||
# 三甲医院 HIS 系统 V2 开发计划
|
||||
|
||||
> **文档类型**: 开发计划
|
||||
> **适用范围**: 系统开发
|
||||
> **版本**: v2.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
> 开发模式: TDD (Test-Driven Development)
|
||||
> 每个功能: 先写接口测试 → 开发后端 → 开发前端 → 集成测试
|
||||
|
||||
## 开发顺序
|
||||
|
||||
### Sprint 1: 门诊挂号+收费 (5天)
|
||||
1. 挂号管理 - 号源/预约/退号/多身份
|
||||
2. 门诊收费 - 收费/退费/发票/日结
|
||||
3. 接口测试: 20个API测试用例
|
||||
4. 前端: 挂号窗口+收费窗口完整界面
|
||||
|
||||
### Sprint 2: 门诊医生工作站 (5天)
|
||||
1. 候诊队列管理
|
||||
2. 病历书写(结构化)
|
||||
3. 处方开具(西药/中成药/中药)
|
||||
4. 检验检查申请
|
||||
5. 接口测试: 25个API测试用例
|
||||
6. 前端: 医生工作站完整界面
|
||||
|
||||
### Sprint 3: 住院管理 (5天)
|
||||
1. 入院登记+床位管理
|
||||
2. 住院医嘱(长期/临时)
|
||||
3. 护士执行+体温单
|
||||
4. 出院结算
|
||||
5. 接口测试: 30个API测试用例
|
||||
6. 前端: 护士站+医生站完整界面
|
||||
|
||||
### Sprint 4: 药品管理 (5天)
|
||||
1. 药品目录+库存
|
||||
2. 采购入库+验收
|
||||
3. 调拨+盘点+报损
|
||||
4. 毒麻药品管理
|
||||
5. 接口测试: 25个API测试用例
|
||||
6. 前端: 药房管理完整界面
|
||||
|
||||
### Sprint 5: 检验检查 (3天)
|
||||
1. LIS检验流程
|
||||
2. 危急值管理
|
||||
3. 接口测试: 15个API测试用例
|
||||
4. 前端: 检验工作站
|
||||
|
||||
### Sprint 6: 统计报表+质控 (2天)
|
||||
1. 门诊/住院统计
|
||||
2. 药品统计
|
||||
3. 质控指标
|
||||
4. 接口测试: 10个API测试用例
|
||||
5. 前端: 报表中心
|
||||
|
||||
## 测试用例设计原则
|
||||
|
||||
每个API必须有:
|
||||
1. 正常流程测试
|
||||
2. 边界条件测试
|
||||
3. 异常处理测试
|
||||
4. 权限控制测试
|
||||
5. 数据一致性测试
|
||||
772
MD/development/GRADE3A_DEVELOPMENT_PLAN.md
Normal file
772
MD/development/GRADE3A_DEVELOPMENT_PLAN.md
Normal file
@@ -0,0 +1,772 @@
|
||||
# HealthLink HIS 三甲医院达标开发计划
|
||||
|
||||
> **目标**: 完全符合三级甲等综合医院信息化评审标准
|
||||
> **依据**: 《三级医院评审标准(2022年版)》、电子病历评级≥4级、互联互通≥四级甲等
|
||||
> **编制日期**: 2026-06-06
|
||||
> **开发原则**:
|
||||
> 1. 不修改原有函数签名,扩展功能通过新建Service/AppService实现
|
||||
> 2. 新建表和字段通过Flyway框架管理
|
||||
> 3. 每个模块开发完成后必须通过完整测试
|
||||
|
||||
---
|
||||
|
||||
## 一、现状差距分析
|
||||
|
||||
### 1.1 已有能力(✅ 可用)
|
||||
|
||||
| 模块 | 状态 | 说明 |
|
||||
|---|---|---|
|
||||
| 门诊挂号 | ✅ | 预约/当日/退号/多身份 |
|
||||
| 门诊收费 | ✅ | 收费/退费/日结 |
|
||||
| 门诊医生站 | ✅ | 处方/检验检查申请/病历 |
|
||||
| 护士工作站 | ✅ | 医嘱执行/生命体征/护理记录 |
|
||||
| 药品管理 | ✅ | 药库/药房/发药/退药 |
|
||||
| 住院管理 | ✅ | 入院/床位/转科/出院/押金 |
|
||||
| 检验检查 | ✅ | LIS配置/检查类型/项目管理 |
|
||||
| 统计报表 | ✅ | 20+报表接口 |
|
||||
| DRG/DIP | ✅ | 基础框架已有 |
|
||||
|
||||
### 1.2 关键差距(❌ 需开发)
|
||||
|
||||
| 差距模块 | 三甲要求 | 当前状态 | 优先级 |
|
||||
|---|---|---|---|
|
||||
| **手术麻醉系统** | 评审必查 | 仅有1个Controller,功能不完整 | 🔴 P0 |
|
||||
| **合理用药系统** | 处方100%审核 | 完全缺失 | 🔴 P0 |
|
||||
| **电子签名/CA** | 三甲硬性要求 | 仅有基础框架 | 🔴 P0 |
|
||||
| **院感管理** | 评审必查 | 完全缺失 | 🔴 P0 |
|
||||
| **病案管理** | 病案首页数据质量 | 仅有1个Controller | 🔴 P0 |
|
||||
| **护理评估体系** | 多种量表评估 | 仅基础护理记录 | 🟡 P1 |
|
||||
| **医嘱闭环管理** | 开立→审核→执行→完成 | 部分实现 | 🟡 P1 |
|
||||
| **处方点评** | 合理用药管控 | 完全缺失 | 🟡 P1 |
|
||||
| **抗菌药物管控** | 分级管理/权限控制 | 完全缺失 | 🟡 P1 |
|
||||
| **危急值管理** | 检验危急值闭环 | 完全缺失 | 🟡 P1 |
|
||||
| **电子病历结构化** | 结构化+模板 | 基础模板已有 | 🟡 P1 |
|
||||
| **数据集成平台(ESB)** | 互联互通四级甲等 | 完全缺失 | 🟡 P1 |
|
||||
| **患者主索引(EMPI)** | 数据标准化基础 | 完全缺失 | 🟡 P1 |
|
||||
| **药品追溯码** | 2026年新规 | 完全缺失 | 🟡 P1 |
|
||||
|
||||
---
|
||||
|
||||
## 二、分阶段开发计划
|
||||
|
||||
### Phase 1: 核心安全模块(3周)
|
||||
> 目标:补齐三甲硬性要求的缺失模块
|
||||
|
||||
#### Sprint 7: 合理用药系统 (5天)
|
||||
**业务描述**: 处方前置审核、药品相互作用检查、过敏检测、剂量审查、抗菌药物管控
|
||||
**三甲依据**: 处方审核率≥100%、抗菌药物分级管理
|
||||
|
||||
**后端开发**:
|
||||
1. `PrescriptionReviewService` — 处方前置审核引擎
|
||||
- 药品相互作用检查(两药/三药配伍禁忌)
|
||||
- 过敏史自动匹配
|
||||
- 剂量范围检查(超剂量/低剂量预警)
|
||||
- 重复用药检查(同类/同成分)
|
||||
- 配伍禁忌(输液配伍审查)
|
||||
- 妊娠/哺乳用药警示
|
||||
- 儿童用药按体重计算
|
||||
2. `AntibioticManageService` — 抗菌药物分级管理
|
||||
- 非限制使用级/限制使用级/特殊使用级
|
||||
- 医生抗菌药物处方权限管理
|
||||
- 抗菌药物使用率实时监控
|
||||
- DDD(限定日剂量)监测
|
||||
3. `PrescriptionCommentService` — 处方点评
|
||||
- 可配置点评规则库
|
||||
- 系统自动筛查不合理处方
|
||||
- 人工点评工作台
|
||||
- 合理率统计、科室/医生排名
|
||||
|
||||
**前端开发**:
|
||||
1. 处方审核弹窗(开方时实时拦截)
|
||||
2. 抗菌药物管理界面
|
||||
3. 处方点评工作台
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_007__rational_drug_use.sql
|
||||
CREATE TABLE sys_drug_interaction (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
drug_code_a VARCHAR(50) NOT NULL,
|
||||
drug_code_b VARCHAR(50) NOT NULL,
|
||||
interaction_level VARCHAR(20) NOT NULL, -- 禁忌/严重/一般
|
||||
description TEXT,
|
||||
suggestion TEXT,
|
||||
status CHAR(1) DEFAULT '0',
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_drug_allergy (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
patient_id BIGINT NOT NULL,
|
||||
allergy_type VARCHAR(50), -- 药物/食物/其他
|
||||
allergen_code VARCHAR(50),
|
||||
allergen_name VARCHAR(200),
|
||||
reaction VARCHAR(200),
|
||||
severity VARCHAR(20), -- 轻度/中度/重度
|
||||
status CHAR(1) DEFAULT '0',
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_prescription_review (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
doctor_id BIGINT NOT NULL,
|
||||
prescription_type VARCHAR(20), -- 西药/中成药/中药
|
||||
review_result VARCHAR(20), -- 合理/不合理/需人工审核
|
||||
review_detail JSONB, -- 审查明细
|
||||
reviewer_id BIGINT,
|
||||
review_time TIMESTAMP,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_antibiotic_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
doctor_id BIGINT NOT NULL,
|
||||
drug_code VARCHAR(50) NOT NULL,
|
||||
drug_name VARCHAR(200),
|
||||
usage_days INT,
|
||||
ddd_value DECIMAL(10,2),
|
||||
level VARCHAR(20), -- 非限制/限制/特殊
|
||||
approval_status VARCHAR(20), -- 审批中/已批准/已拒绝
|
||||
approver_id BIGINT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_prescription_comment (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
prescription_id BIGINT,
|
||||
encounter_id BIGINT,
|
||||
doctor_id BIGINT,
|
||||
department_id BIGINT,
|
||||
comment_type VARCHAR(20), -- 自动/人工
|
||||
comment_result VARCHAR(20), -- 合理/不合理
|
||||
comment_detail TEXT,
|
||||
commentator_id BIGINT,
|
||||
comment_time TIMESTAMP,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
**测试用例** (20个):
|
||||
1. 处方审核正常通过
|
||||
2. 药品相互作用拦截
|
||||
3. 过敏药物拦截
|
||||
4. 超剂量预警
|
||||
5. 重复用药拦截
|
||||
6. 抗菌药物权限校验
|
||||
7. 抗菌药物分级限制
|
||||
8. 处方点评自动筛查
|
||||
9. 人工点评提交
|
||||
10. 合理率统计查询
|
||||
...
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 8: 手术麻醉系统 (5天)
|
||||
**业务描述**: 手术预约→审批→排程→麻醉评估→麻醉记录→手术记录→术后管理
|
||||
**三甲依据**: 互联互通测评必测项(I-13)
|
||||
|
||||
**后端开发**:
|
||||
1. `SurgeryScheduleService` — 手术预约排程
|
||||
- 手术申请→科室审批→医务科审批→排程→通知
|
||||
- 手术间/手术台管理
|
||||
- 手术医生/麻醉医生/器械护士排班
|
||||
- 急诊手术绿色通道
|
||||
2. `AnesthesiaAssessmentService` — 麻醉评估
|
||||
- 术前评估(ASA分级、气道评估)
|
||||
- 麻醉方案制定
|
||||
- 知情同意书电子签署
|
||||
3. `AnesthesiaRecordService` — 麻醉记录
|
||||
- 术中监测数据记录(生命体征、用药、事件)
|
||||
- 麻醉用药记录
|
||||
- 麻醉苏醒评估
|
||||
4. `SurgeryRecordService` — 手术记录
|
||||
- 术者/助手/器械/巡回护士记录
|
||||
- 植入物记录
|
||||
- 手术出血/并发症记录
|
||||
- 术后医嘱自动生成
|
||||
5. `SurgeryStatisticsService` — 手术统计
|
||||
- 手术量统计
|
||||
- 手术并发症率
|
||||
- 手术死亡率
|
||||
|
||||
**前端开发**:
|
||||
1. 手术预约申请界面
|
||||
2. 手术排程甘特图
|
||||
3. 麻醉记录工作站
|
||||
4. 手术记录表单
|
||||
5. 手术统计仪表盘
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_008__surgery_anesthesia.sql
|
||||
CREATE TABLE sys_surgery_schedule (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
surgery_code VARCHAR(50),
|
||||
surgery_name VARCHAR(200),
|
||||
surgery_level VARCHAR(20), -- 一/二/三/四级
|
||||
surgeon_id BIGINT,
|
||||
anesthesiologist_id BIGINT,
|
||||
手术_room VARCHAR(50),
|
||||
surgery_table VARCHAR(50),
|
||||
planned_start_time TIMESTAMP,
|
||||
planned_end_time TIMESTAMP,
|
||||
actual_start_time TIMESTAMP,
|
||||
actual_end_time TIMESTAMP,
|
||||
status VARCHAR(20), -- 申请/审批中/已排程/进行中/已完成/已取消
|
||||
approval_status VARCHAR(20),
|
||||
emergency_flag CHAR(1) DEFAULT '0',
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_anesthesia_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
surgery_schedule_id BIGINT NOT NULL,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
anesthesia_type VARCHAR(50), -- 全麻/椎管内/神经阻滞/局部
|
||||
asa_level VARCHAR(10),
|
||||
airway_assessment VARCHAR(20),
|
||||
pre_op_assessment TEXT,
|
||||
anesthesia_plan TEXT,
|
||||
intra_vital_signs JSONB, -- 术中生命体征
|
||||
anesthesia_medications JSONB, -- 麻醉用药
|
||||
intra_events JSONB, -- 术中事件
|
||||
blood_loss_ml INT,
|
||||
urine_output_ml INT,
|
||||
fluid_input_ml INT,
|
||||
extubation_time TIMESTAMP,
|
||||
recovery_assessment TEXT,
|
||||
status VARCHAR(20), -- 评估中/进行中/已结束
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_surgery_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
surgery_schedule_id BIGINT NOT NULL,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
surgeon_id BIGINT,
|
||||
assistants JSONB,
|
||||
scrub_nurse_id BIGINT,
|
||||
circulating_nurse_id BIGINT,
|
||||
incision_time TIMESTAMP,
|
||||
closure_time TIMESTAMP,
|
||||
implant_records JSONB,
|
||||
specimen_records JSONB,
|
||||
blood_loss_ml INT,
|
||||
complications JSONB,
|
||||
post_op_diagnosis TEXT,
|
||||
post_op_orders TEXT,
|
||||
status VARCHAR(20), -- 进行中/已完成
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_surgery_room (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
room_code VARCHAR(50) NOT NULL,
|
||||
room_name VARCHAR(100),
|
||||
department_id BIGINT,
|
||||
room_level VARCHAR(20), -- 洁净/普通/急诊
|
||||
equipment_list JSONB,
|
||||
status VARCHAR(20), -- 空闲/使用中/维护中
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 9: 院感管理系统 (5天)
|
||||
**业务描述**: 院感病例监测、抗菌药物使用监测、手卫生监测、职业暴露管理
|
||||
**三甲依据**: 医院感染监测报告率达标
|
||||
|
||||
**后端开发**:
|
||||
1. `InfectionMonitorService` — 院感监测
|
||||
- 院感病例实时监测(自动预警)
|
||||
- 院感发病率统计
|
||||
- 部位感染分类
|
||||
- 多重耐药菌监测
|
||||
2. `HandHygieneService` — 手卫生管理
|
||||
- 手卫生依从性监测
|
||||
- 手卫生正确率统计
|
||||
- 手卫生培训记录
|
||||
3. `OccupationalExposureService` — 职业暴露
|
||||
- 职业暴露登记
|
||||
- 暴露后处置流程
|
||||
- 跟踪随访管理
|
||||
4. `EnvironmentMonitorService` — 环境监测
|
||||
- 消毒灭菌监测记录
|
||||
- 空气/物表/手培养监测
|
||||
|
||||
**前端开发**:
|
||||
1. 院感监测仪表盘
|
||||
2. 院感病例上报表单
|
||||
3. 手卫生监测界面
|
||||
4. 职业暴露登记界面
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_009__infection_control.sql
|
||||
CREATE TABLE sys_infection_case (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
infection_type VARCHAR(50), -- 医院感染/社区感染
|
||||
infection_site VARCHAR(100), -- 下呼吸道/泌尿道/血液等
|
||||
pathogen_code VARCHAR(50),
|
||||
pathogen_name VARCHAR(200),
|
||||
drug_resistance VARCHAR(200), -- 耐药类型
|
||||
report_time TIMESTAMP,
|
||||
reporter_id BIGINT,
|
||||
status VARCHAR(20), -- 疑似/确认/已处理
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_hand_hygiene_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
staff_id BIGINT NOT NULL,
|
||||
department_id BIGINT,
|
||||
observation_time TIMESTAMP,
|
||||
observation_type VARCHAR(50), -- 两前三后/手卫生时机
|
||||
correct_flag CHAR(1),
|
||||
observer_id BIGINT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_occupational_exposure (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
staff_id BIGINT NOT NULL,
|
||||
exposure_type VARCHAR(50), -- 锐器伤/血液暴露/其他
|
||||
exposure_source VARCHAR(200),
|
||||
exposure_time TIMESTAMP,
|
||||
exposure_site VARCHAR(100),
|
||||
immediate_handling TEXT,
|
||||
follow_up_plan TEXT,
|
||||
follow_up_result TEXT,
|
||||
status VARCHAR(20), -- 登记中/处置中/已结案
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 2: 病案与护理体系(3周)
|
||||
> 目标:补齐病案管理和护理评估体系
|
||||
|
||||
#### Sprint 10: 病案管理系统 (5天)
|
||||
**业务描述**: 病案首页数据质量、编码审核、DRG入组、病案归档
|
||||
**三甲依据**: 病案首页24小时归档率≥90%
|
||||
|
||||
**后端开发**:
|
||||
1. `MedicalRecordHomeService` — 病案首页管理
|
||||
- 首页数据自动采集(诊断/手术/费用/护理)
|
||||
- ICD-10编码自动推荐
|
||||
- ICD-9-CM-3手术编码映射
|
||||
- 首页数据质量校验(完整性/逻辑性/编码正确率)
|
||||
2. `MedicalRecordAuditService` — 病案质控
|
||||
- 运行质控(病历完成时限监控)
|
||||
- 终末质控(出院后病历质量审核)
|
||||
- 质控评分标准
|
||||
3. `DRGGroupingService` — DRG入组
|
||||
- 广西DRG分组方案对接
|
||||
- 自动DRG分组
|
||||
- 费用预警(超标提醒)
|
||||
- CMI值计算
|
||||
4. `MedicalRecordArchiveService` — 病案归档
|
||||
- 电子病历归档
|
||||
- 病案借阅管理
|
||||
- 病案封存/解封
|
||||
|
||||
**前端开发**:
|
||||
1. 病案首页填写界面(智能填充)
|
||||
2. 病案质控工作台
|
||||
3. DRG入组结果展示
|
||||
4. 病案借阅管理界面
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_010__medical_record_management.sql
|
||||
CREATE TABLE sys_medical_record_home (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
admission_date TIMESTAMP,
|
||||
discharge_date TIMESTAMP,
|
||||
admission_diagnosis VARCHAR(200),
|
||||
discharge_diagnosis VARCHAR(200),
|
||||
primary_diagnosis_code VARCHAR(50),
|
||||
other_diagnosis_codes JSONB,
|
||||
surgery_codes JSONB,
|
||||
drg_group VARCHAR(50),
|
||||
drg_weight DECIMAL(10,4),
|
||||
total_cost DECIMAL(12,2),
|
||||
self_pay_cost DECIMAL(12,2),
|
||||
medical_insurance_cost DECIMAL(12,2),
|
||||
los INT, -- 住院天数
|
||||
outcome VARCHAR(20), -- 治愈/好转/未愈/死亡/其他
|
||||
quality_score INT,
|
||||
quality_level VARCHAR(20), -- 甲级/乙级/丙级
|
||||
archive_status VARCHAR(20), -- 未归档/已归档/已封存
|
||||
archive_time TIMESTAMP,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_medical_record_audit (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
audit_type VARCHAR(20), -- 运行/终末
|
||||
audit_item VARCHAR(100),
|
||||
audit_result VARCHAR(20), -- 合格/不合格
|
||||
audit_detail TEXT,
|
||||
auditor_id BIGINT,
|
||||
audit_time TIMESTAMP,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_drg_grouping (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
drg_code VARCHAR(50),
|
||||
drg_name VARCHAR(200),
|
||||
drg_weight DECIMAL(10,4),
|
||||
drg_cost DECIMAL(12,2),
|
||||
actual_cost DECIMAL(12,2),
|
||||
profit_loss DECIMAL(12,2),
|
||||
grouping_time TIMESTAMP,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 11: 护理评估体系 (5天)
|
||||
**业务描述**: 多种护理评估量表、护理计划、护理交接班
|
||||
**三甲依据**: 《护理分级》WS/T 431-2013
|
||||
|
||||
**后端开发**:
|
||||
1. `NursingAssessmentService` — 护理评估
|
||||
- 入院护理评估(入院8小时内完成)
|
||||
- Braden压疮风险评估(自动评分)
|
||||
- Morse跌倒风险评估(自动评分)
|
||||
- NRS2002营养风险评估
|
||||
- NRS/VAS疼痛评估
|
||||
- Caprini VTE风险评估
|
||||
- Barthel自理能力评估
|
||||
- 评估时间轴(动态变化追踪)
|
||||
2. `NursingPlanService` — 护理计划
|
||||
- 护理诊断(基于评估结果推荐)
|
||||
- 护理目标设定
|
||||
- 标准护理措施库
|
||||
- 病种标准护理计划模板
|
||||
3. `NursingHandoverService` — 护理交接班
|
||||
- 交接班记录
|
||||
- 患者信息汇总
|
||||
- 重点患者交接
|
||||
|
||||
**前端开发**:
|
||||
1. 护理评估量表工作台(自动评分)
|
||||
2. 护理计划制定界面
|
||||
3. 护理交接班界面
|
||||
4. 评估趋势图
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_011__nursing_assessment.sql
|
||||
CREATE TABLE sys_nursing_assessment (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
assessment_type VARCHAR(50), -- 入院/Braden/Morse/NRS2002/NRS/Caprini/Barthel
|
||||
assessment_score INT,
|
||||
risk_level VARCHAR(20), -- 低危/中危/高危/极高危
|
||||
assessment_data JSONB, -- 评估详细数据
|
||||
assessor_id BIGINT,
|
||||
assessment_time TIMESTAMP,
|
||||
next_assessment_time TIMESTAMP,
|
||||
status VARCHAR(20), -- 有效/已更新/已过期
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_nursing_plan (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
encounter_id BIGINT NOT NULL,
|
||||
patient_id BIGINT NOT NULL,
|
||||
nursing_diagnosis VARCHAR(200),
|
||||
nursing_goal TEXT,
|
||||
nursing_interventions JSONB,
|
||||
plan_template_id BIGINT,
|
||||
planner_id BIGINT,
|
||||
plan_time TIMESTAMP,
|
||||
review_status VARCHAR(20), -- 待审核/已审核/已驳回
|
||||
reviewer_id BIGINT,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_nursing_handover (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
department_id BIGINT NOT NULL,
|
||||
shift_type VARCHAR(20), -- 白班/小夜/大夜
|
||||
handover_time TIMESTAMP,
|
||||
handover_nurse_id BIGINT,
|
||||
receiver_nurse_id BIGINT,
|
||||
patient_summary JSONB, -- 患者交接信息
|
||||
key_patients JSONB, -- 重点患者
|
||||
pending_items JSONB, -- 待办事项
|
||||
status VARCHAR(20), -- 进行中/已完成
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 3: 数据集成与标准化(3周)
|
||||
> 目标:满足互联互通四级甲等要求
|
||||
|
||||
#### Sprint 12: 患者主索引(EMPI) (3天)
|
||||
**业务描述**: 统一患者身份标识、跨系统患者信息匹配
|
||||
**三甲依据**: 互联互通四级甲等基础
|
||||
|
||||
**后端开发**:
|
||||
1. `EMPIPatientService` — 患者主索引
|
||||
- 患者身份信息标准化
|
||||
- 跨系统患者信息匹配(EMPI算法)
|
||||
- 患者身份合并/拆分
|
||||
- 患者身份变更追溯
|
||||
2. `EMPIPractitionerService` — 医护人员主索引
|
||||
- 统一医护人员标识
|
||||
- 资质信息管理
|
||||
3. `MasterDataService` — 主数据管理
|
||||
- 科室字典标准化
|
||||
- 诊疗项目目录标准化
|
||||
- 药品目录标准化
|
||||
- 疾病编码(ICD-10)标准化
|
||||
- 手术编码(ICD-9-CM-3)标准化
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_012__empi_master_data.sql
|
||||
CREATE TABLE sys_empi_patient (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
empi_id VARCHAR(50) NOT NULL UNIQUE, -- 全局唯一患者标识
|
||||
patient_id BIGINT, -- 原系统患者ID
|
||||
id_card VARCHAR(50),
|
||||
name VARCHAR(100),
|
||||
gender CHAR(1),
|
||||
birth_date DATE,
|
||||
phone VARCHAR(20),
|
||||
address TEXT,
|
||||
identity_source VARCHAR(50), -- 来源系统
|
||||
merge_status VARCHAR(20), -- 正常/已合并/已拆分
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_icd10_catalog (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
icd_code VARCHAR(20) NOT NULL,
|
||||
icd_name VARCHAR(200),
|
||||
category VARCHAR(50),
|
||||
validity_status VARCHAR(20),
|
||||
effective_date DATE,
|
||||
expiration_date DATE,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_icd9cm3_catalog (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
procedure_code VARCHAR(20) NOT NULL,
|
||||
procedure_name VARCHAR(200),
|
||||
category VARCHAR(50),
|
||||
validity_status VARCHAR(20),
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 13: 数据集成平台(ESB) (5天)
|
||||
**业务描述**: 系统间数据交换、消息路由、服务注册
|
||||
**三甲依据**: 互联互通四级甲等核心
|
||||
|
||||
**后端开发**:
|
||||
1. `ESBMessageService` — 消息总线
|
||||
- HL7 FHIR R4 消息格式
|
||||
- 消息路由、格式转换
|
||||
- 消息可靠性保障(存储转发、确认机制)
|
||||
2. `ESBServiceRegistryService` — 服务注册
|
||||
- 服务注册与发现
|
||||
- 接口版本管理
|
||||
- 接口文档自动生成
|
||||
3. `ESBMonitorService` — 集成监控
|
||||
- 消息流量监控
|
||||
- 接口调用日志
|
||||
- 异常告警
|
||||
4. `CDADocumentService` — CDA文档生成
|
||||
- 入院记录CDA
|
||||
- 出院记录CDA
|
||||
- 检验报告CDA
|
||||
- 检查报告CDA
|
||||
- 处方CDA
|
||||
- 手术记录CDA
|
||||
- 护理记录CDA
|
||||
|
||||
**数据库设计**:
|
||||
```sql
|
||||
-- Flyway: V2026_013__esb_integration.sql
|
||||
CREATE TABLE sys_esb_message (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
message_id VARCHAR(100) NOT NULL UNIQUE,
|
||||
message_type VARCHAR(50),
|
||||
source_system VARCHAR(50),
|
||||
target_system VARCHAR(50),
|
||||
message_content TEXT,
|
||||
message_format VARCHAR(20), -- HL7/FHIR/CDA
|
||||
status VARCHAR(20), -- 待发送/发送中/已发送/发送失败/已确认
|
||||
retry_count INT DEFAULT 0,
|
||||
error_message TEXT,
|
||||
send_time TIMESTAMP,
|
||||
ack_time TIMESTAMP,
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
|
||||
CREATE TABLE sys_esb_service_registry (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
service_name VARCHAR(100),
|
||||
service_version VARCHAR(20),
|
||||
service_endpoint VARCHAR(500),
|
||||
service_description TEXT,
|
||||
service_status VARCHAR(20), -- 启用/停用/维护中
|
||||
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 4: 智能化与决策支持(3周)
|
||||
> 目标:提升电子病历评级至4级以上
|
||||
|
||||
#### Sprint 14: 危急值管理系统 (3天)
|
||||
**业务描述**: 检验危急值自动识别→弹窗→确认→处置→闭环
|
||||
**三甲依据**: 医疗质量安全核心制度
|
||||
|
||||
**后端开发**:
|
||||
1. `CriticalValueService` — 危急值管理
|
||||
- 危急值规则配置(项目/上下限)
|
||||
- 检验结果自动匹配危急值
|
||||
- 危急值弹窗通知
|
||||
- 危急值确认记录
|
||||
- 危急值处置闭环
|
||||
- 危急值统计分析
|
||||
|
||||
**前端开发**:
|
||||
1. 危急值弹窗组件
|
||||
2. 危急值处置界面
|
||||
3. 危急值统计报表
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 15: 电子病历结构化 (5天)
|
||||
**业务描述**: 结构化病历、病历模板、修改留痕、版本管理
|
||||
**三甲依据**: 电子病历应用管理规范
|
||||
|
||||
**后端开发**:
|
||||
1. `StructuredEMRService` — 结构化病历
|
||||
- 结构化病历模板引擎
|
||||
- 病历字段自动填充
|
||||
- 病历完整性检查
|
||||
2. `EMRVersionService` — 版本管理
|
||||
- 病历修改留痕
|
||||
- 历史版本保存
|
||||
- 版本对比
|
||||
3. `EMRTemplateService` — 病历模板
|
||||
- 系统模板管理
|
||||
- 科室模板管理
|
||||
- 个人模板管理
|
||||
|
||||
---
|
||||
|
||||
#### Sprint 16: 医保智能审核 (5天)
|
||||
**业务描述**: 医保规则引擎、事前/事中/事后审核、DRG/DIP优化
|
||||
**三甲依据**: 医保基金使用监督管理条例
|
||||
|
||||
**后端开发**:
|
||||
1. `InsuranceAuditService` — 医保智能审核
|
||||
- 事前审核(开方时拦截)
|
||||
- 事中审核(住院中监控)
|
||||
- 事后审核(结算后稽核)
|
||||
2. `DRGOptimizationService` — DRG/DIP优化
|
||||
- 主诊断编码推荐
|
||||
- 主手术编码推荐
|
||||
- 费用结构优化建议
|
||||
|
||||
---
|
||||
|
||||
## 三、测试计划
|
||||
|
||||
### 每个Sprint测试要求
|
||||
|
||||
| 测试类型 | 内容 | 工具 |
|
||||
|---|---|---|
|
||||
| **接口测试** | 所有API端点正常/异常/边界 | JUnit + HTTP |
|
||||
| **白盒测试** | Service层方法覆盖 | Mockito + JUnit |
|
||||
| **黑盒测试** | 业务流程完整性 | 端到端测试 |
|
||||
| **冒烟测试** | 核心功能可用性 | 手动+自动化 |
|
||||
| **回归测试** | 原有功能不受影响 | 全量接口测试 |
|
||||
|
||||
### 测试用例设计原则
|
||||
|
||||
1. **正常流程测试**: 每个API至少1个正常用例
|
||||
2. **边界条件测试**: 空值/极值/特殊字符
|
||||
3. **异常处理测试**: 无权限/参数错误/数据不存在
|
||||
4. **数据一致性测试**: 事务完整性
|
||||
5. **性能测试**: 并发场景(可选)
|
||||
|
||||
---
|
||||
|
||||
## 四、实施路线图
|
||||
|
||||
```
|
||||
Phase 1 (Week 1-3): 核心安全模块
|
||||
├── Sprint 7: 合理用药系统 (5天)
|
||||
├── Sprint 8: 手术麻醉系统 (5天)
|
||||
└── Sprint 9: 院感管理系统 (5天)
|
||||
|
||||
Phase 2 (Week 4-6): 病案与护理
|
||||
├── Sprint 10: 病案管理系统 (5天)
|
||||
└── Sprint 11: 护理评估体系 (5天)
|
||||
|
||||
Phase 3 (Week 7-9): 数据集成
|
||||
├── Sprint 12: EMPI + 主数据 (3天)
|
||||
└── Sprint 13: ESB集成平台 (5天)
|
||||
|
||||
Phase 4 (Week 10-12): 智能化
|
||||
├── Sprint 14: 危急值管理 (3天)
|
||||
├── Sprint 15: 电子病历结构化 (5天)
|
||||
└── Sprint 16: 医保智能审核 (5天)
|
||||
|
||||
总计: 12周 (约3个月)
|
||||
总用例数: 预计 300+ 个接口测试
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 五、质量保障
|
||||
|
||||
### 5.1 开发规范
|
||||
1. **不修改原有函数签名** — 扩展功能通过新建Service/AppService实现
|
||||
2. **数据库变更通过Flyway** — 所有新建表和字段使用Flyway版本化管理
|
||||
3. **代码审查** — 每个PR必须经过Code Review
|
||||
4. **单元测试** — Service层覆盖率≥80%
|
||||
|
||||
### 5.2 铁律
|
||||
1. 修改完必须测试才能提交
|
||||
2. 新建表和字段必须通过Flyway
|
||||
3. 测试通过后才提交代码
|
||||
4. 前后端API路径必须对齐
|
||||
5. 每个Sprint完成后进行完整回归测试
|
||||
|
||||
---
|
||||
|
||||
> **文档版本**: v1.0
|
||||
> **最后更新**: 2026-06-06
|
||||
195
MD/development/MENU_FUNCTION_ANALYSIS.md
Normal file
195
MD/development/MENU_FUNCTION_ANALYSIS.md
Normal file
@@ -0,0 +1,195 @@
|
||||
# HealthLink-HIS 菜单功能分析报告
|
||||
|
||||
> **文档类型**: 开发计划
|
||||
> **适用范围**: 菜单功能
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
> 分析时间: 2026-06-05
|
||||
> 分析方法: 数据库菜单树 + 前端视图文件 + 后端API 三方交叉比对
|
||||
|
||||
## 一、总体概况
|
||||
|
||||
| 指标 | 数量 |
|
||||
|---|---|
|
||||
| 总菜单数 | ~180 |
|
||||
| 启用的页面菜单 | ~120 |
|
||||
| 后端 Controller | 230 个 |
|
||||
| 前端视图文件 | 209 个 |
|
||||
| **空壳视图 (22 bytes)** | **26 个** |
|
||||
| **缺失视图组件** | **18 个** |
|
||||
| **无组件路径 (portal)** | **~50 个** |
|
||||
|
||||
---
|
||||
|
||||
## 二、问题分类
|
||||
|
||||
### 🔴 A类: 启用但完全无功能 (点击404或空白) — 优先级高
|
||||
|
||||
| # | 模块 | 菜单名 | 组件路径 | 状态 |
|
||||
|---|---|---|---|---|
|
||||
| 1 | 基础数据 | 服务目录 | `catalog/service/index` | 空壳 |
|
||||
| 2 | 基础数据 | 客户数据 | `basicmanage/customer/index` | 空壳(禁用) |
|
||||
| 3 | 基础数据 | 合同管理 | `basicmanage/contract/index` | 空壳(禁用) |
|
||||
| 4 | 基础数据 | LIS合管配置 | `basicmanage/lisMerge/index` | 空壳(禁用) |
|
||||
| 5 | 业务规则 | 自动计算 | `basicmanage/automaticBilling/index` | 空壳(禁用) |
|
||||
| 6 | 业务规则 | 划价组套 | `basicmanage/bargainSets/index` | 空壳(禁用) |
|
||||
| 7 | 门诊管理 | 门诊退药 | `clinicmanagement/withdrawal/index` | 空壳 |
|
||||
| 8 | 门诊管理 | 门诊退号 | `clinicmanagement/refundNumber/index` | 空壳 |
|
||||
| 9 | 门诊管理 | 申请单管理 | `clinicmanagement/requisition/index` | 空壳 |
|
||||
| 10 | 门诊管理 | 结果查看 | `clinicmanagement/lisPascResult/index` | 空壳 |
|
||||
| 11 | 门诊管理 | 门诊退费 | `clinicmanagement/consultationRefund/index` | 空壳 |
|
||||
| 12 | 门诊管理 | 收费详情查询 | `clinicmanagement/chargeDetail/index` | 空壳 |
|
||||
| 13 | 门诊管理 | 医嘱查看与打印 | `clinicmanagement/orderViewPrint/index` | 空壳 |
|
||||
| 14 | 住院管理 | 病案管理 | `inHospitalManagement/medicalRecord/index` | 空壳(禁用) |
|
||||
| 15 | 住院管理 | 费用清单 | `inHospitalManagement/listFee/index` | 空壳(禁用) |
|
||||
| 16 | 住院管理 | 手术管理 | `inHospitalManagement/surgeryManage/index` | 空壳(禁用) |
|
||||
| 17 | 住院管理 | 入院诊断 | `inHospitalManagement/inpatientDiagnosis/index` | 空壳 |
|
||||
| 18 | 住院管理 | 医嘱管理 | `inHospitalManagement/orderManage/index` | 空壳 |
|
||||
| 19 | 目录对照 | LIS对照 | `vue` (占位) | 缺失 |
|
||||
| 20 | 目录对照 | PACS对照 | `vue` (占位) | 缺失 |
|
||||
| 21 | 目录对照 | 诊断对照 | `vue` (占位) | 缺失 |
|
||||
| 22 | 收费管理 | 门诊收费结算 | `charge/registerRecords` | 空壳 |
|
||||
| 23 | 收费管理 | 排班管理 | `charge/schedule` | 空壳 |
|
||||
| 24 | 库房管理 | 货位管理 | `medicationmanagement/locationManagement/index` | 缺失 |
|
||||
| 25 | 易用性配置 | 中医处方 | `basicmanage/tcmPrescription` | 空壳 |
|
||||
| 26 | 易用性配置 | 常用诊断 | `basicmanage/commonlyDiagnosis` | 空壳 |
|
||||
| 27 | 易用性配置 | 床位管理 | `basicmanage/bedspace` | 空壳 |
|
||||
| 28 | 易用性配置 | 费用配置 | `basicmanage/fee` | 空壳 |
|
||||
|
||||
### 🟡 B类: 有菜单但完全无组件 (portal/占位) — 优先级中
|
||||
|
||||
| 模块 | 菜单数 | 示例 |
|
||||
|---|---|---|
|
||||
| 住院收费 | 4 | 费用管理、住院收费详情、中途结算 |
|
||||
| 调价管理 | 2 | 调价单管理、调价盈亏记录 |
|
||||
| 药房管理 | 2 | 退药管理、皮试管理 |
|
||||
| 医保管理 | ~20 | 医保结算、医保对账、DRG等 |
|
||||
| 统计报表 | ~10 | 工作量统计、收费报表 |
|
||||
| 药品追溯 | 7 | 商品删除、库存查询等 |
|
||||
| 外接系统 | 5 | 电子发票、LIS、PASC等 |
|
||||
|
||||
### 🟢 C类: 已禁用的待开发模块 — 优先级低
|
||||
|
||||
| 模块 | 菜单名 |
|
||||
|---|---|
|
||||
| 患者管理 | 患者档案管理(父级禁用) |
|
||||
| 基础数据 | 部门管理、客户数据 |
|
||||
| 住院管理 | 病案管理、费用清单、住院日结 |
|
||||
| 药房管理 | 住院发药、住院汇总发药、住院退药 |
|
||||
| 门诊管理 | 发药管理、电子处方审批 |
|
||||
|
||||
---
|
||||
|
||||
## 三、开发实现计划
|
||||
|
||||
### Phase 1: 门诊核心闭环 (4周)
|
||||
> 目标: 门诊挂号→就诊→开方→收费→发药 全链路无死角
|
||||
|
||||
| 优先级 | 功能 | 前端 | 后端 | 工时 |
|
||||
|---|---|---|---|---|
|
||||
| P0 | 门诊退号 | withdrawal/index | OutpatientRefund | 2天 |
|
||||
| P0 | 门诊退药 | clinicmanagement/withdrawal | ReturnMedicine | 2天 |
|
||||
| P0 | 门诊退费 | consultationRefund | OutpatientRefund | 2天 |
|
||||
| P0 | 收费详情查询 | chargeDetail | ChargeBill | 1天 |
|
||||
| P0 | 申请单管理 | requisition | RequestFormManage | 2天 |
|
||||
| P0 | 结果查看 | lisPascResult | Laboratory/Inspection | 2天 |
|
||||
| P0 | 医嘱查看与打印 | orderViewPrint | AdviceManage | 2天 |
|
||||
| P1 | 门诊收费结算 | registerRecords | OutpatientCharge | 3天 |
|
||||
| P1 | 排班管理 | charge/schedule | DoctorSchedule | 2天 |
|
||||
|
||||
**Phase 1 小计: ~18天**
|
||||
|
||||
### Phase 2: 基础数据补全 (3周)
|
||||
> 目标: 目录管理、基础配置完整可用
|
||||
|
||||
| 优先级 | 功能 | 前端 | 后端 | 工时 |
|
||||
|---|---|---|---|---|
|
||||
| P0 | 服务目录 | catalog/service | Catalog | 2天 |
|
||||
| P0 | 货位管理 | locationManagement | Location | 2天 |
|
||||
| P1 | LIS对照 | 新建 | Catalog | 3天 |
|
||||
| P1 | PACS对照 | 新建 | Catalog | 3天 |
|
||||
| P1 | 诊断对照 | 新建 | DiseaseManage | 2天 |
|
||||
| P2 | 客户数据 | customer | Customer | 2天 |
|
||||
| P2 | 合同管理 | contract | Contract | 2天 |
|
||||
|
||||
**Phase 2 小计: ~16天**
|
||||
|
||||
### Phase 3: 住院核心补全 (3周)
|
||||
> 目标: 住院医嘱→执行→收费 闭环
|
||||
|
||||
| 优先级 | 功能 | 前端 | 后端 | 工时 |
|
||||
|---|---|---|---|---|
|
||||
| P0 | 医嘱管理 | orderManage | AdviceManage | 3天 |
|
||||
| P0 | 入院诊断 | inpatientDiagnosis | Diagnosis | 2天 |
|
||||
| P0 | 手术管理 | surgeryManage | Surgery | 3天 |
|
||||
| P1 | 病案管理 | medicalRecord | MedicalRecord | 3天 |
|
||||
| P1 | 费用清单 | listFee | InpatientCharge | 2天 |
|
||||
| P1 | 中途结算 | 新建 | InpatientCharge | 2天 |
|
||||
|
||||
**Phase 3 小计: ~15天**
|
||||
|
||||
### Phase 4: Flowable工作流 (2周)
|
||||
> 目标: 流程引擎功能可用
|
||||
|
||||
| 优先级 | 功能 | 前端 | 后端 | 工时 |
|
||||
|---|---|---|---|---|
|
||||
| P1 | 流程定义 | flowable/definition | FlowDefinition | 2天 |
|
||||
| P1 | 流程表单 | flowable/task/form | SysForm | 2天 |
|
||||
| P1 | 待办任务 | flowable/task/todo | FlowTask | 2天 |
|
||||
| P1 | 已办任务 | flowable/task/finished | FlowTask | 1天 |
|
||||
| P2 | 流程表达式 | flowable/expression | SysExpression | 1天 |
|
||||
| P2 | 流程监听 | flowable/listener | SysListener | 1天 |
|
||||
|
||||
**Phase 4 小计: ~9天**
|
||||
|
||||
### Phase 5: 统计报表 (2周)
|
||||
> 目标: 核心运营数据可视化
|
||||
|
||||
| 优先级 | 功能 | 前端 | 后端 | 工时 |
|
||||
|---|---|---|---|---|
|
||||
| P1 | 日结结算单 | dayEndSettlement | DayEndSettlement | 3天 |
|
||||
| P1 | 医生工作量统计 | 新建 | ReportStatistics | 2天 |
|
||||
| P1 | 收费结算报表 | 新建 | ChargeReport | 2天 |
|
||||
| P2 | 发药统计 | 新建 | ReportStatistics | 2天 |
|
||||
| P2 | 库存结余 | statisticalManagement | InventoryDetails | 1天 |
|
||||
|
||||
**Phase 5 小计: ~10天**
|
||||
|
||||
### Phase 6: 外接系统对接 (3周)
|
||||
> 目标: 医保、追溯、电子发票等外部接口
|
||||
|
||||
| 优先级 | 功能 | 前端 | 后端 | 工时 |
|
||||
|---|---|---|---|---|
|
||||
| P2 | 医保结算 | 新建 | YbInpatient | 5天 |
|
||||
| P2 | 医保目录对照 | 新建 | Yb | 3天 |
|
||||
| P2 | 药品追溯码 | traceabilityCode | TraceNoManage | 2天 |
|
||||
| P3 | 电子发票 | 新建 | EleInvoice | 3天 |
|
||||
| P3 | DRG结算 | 新建 | Yb | 3天 |
|
||||
|
||||
**Phase 6 小计: ~16天**
|
||||
|
||||
---
|
||||
|
||||
## 四、总计
|
||||
|
||||
| Phase | 内容 | 工时 |
|
||||
|---|---|---|
|
||||
| Phase 1 | 门诊核心闭环 | 18天 |
|
||||
| Phase 2 | 基础数据补全 | 16天 |
|
||||
| Phase 3 | 住院核心补全 | 15天 |
|
||||
| Phase 4 | Flowable工作流 | 9天 |
|
||||
| Phase 5 | 统计报表 | 10天 |
|
||||
| Phase 6 | 外接系统对接 | 16天 |
|
||||
| **合计** | | **~84天 (约17周)** |
|
||||
|
||||
## 五、建议
|
||||
|
||||
1. **优先 Phase 1+3** — 门诊和住院是核心业务闭环,缺功能直接影响使用
|
||||
2. **Phase 2 穿插进行** — 基础数据是其他模块的依赖
|
||||
3. **Phase 4-6 按需** — 工作流、报表、外接系统可逐步迭代
|
||||
4. **禁用菜单先不急** — 标注"待开发"的菜单已禁用,不影响用户操作
|
||||
@@ -1,6 +1,6 @@
|
||||
# Flyway 数据库迁移使用指南
|
||||
|
||||
> **项目**: OpenHIS 医院管理系统
|
||||
> **项目**: HealthLink-HIS 医院管理系统
|
||||
> **数据库**: PostgreSQL 192.168.110.252:15432 (schema: hisdev)
|
||||
> **Flyway 版本**: 8.5.x (Spring Boot 2.7 管理)
|
||||
> **编制日期**: 2026-06-04
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
**迁移文件目录:**
|
||||
```
|
||||
openhis-server-new/openhis-application/src/main/resources/db/migration/
|
||||
healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/
|
||||
```
|
||||
|
||||
**当前状态:**
|
||||
@@ -92,9 +92,9 @@ CREATE INDEX idx_surgery_stats_tenant ON surgery_schedule_stats(tenant_id);
|
||||
**Step 2:启动应用**
|
||||
|
||||
```bash
|
||||
cd openhis-server-new
|
||||
cd healthlink-his-server
|
||||
mvn clean package -DskipTests
|
||||
java -jar openhis-application/target/openhis-application.jar --spring.profiles.active=dev --server.port=18082
|
||||
java -jar healthlink-his-application/target/healthlink-his-application.jar --spring.profiles.active=dev --server.port=18082
|
||||
```
|
||||
|
||||
**Step 3:Flyway 自动执行**
|
||||
@@ -214,7 +214,7 @@ PGPASSWORD=Jchl1528 psql -h 192.168.110.252 -p 15432 -U postgresql -d postgresql
|
||||
-c "SET search_path TO hisdev; DROP TABLE IF EXISTS clinic_referral;"
|
||||
|
||||
# 3. 删除迁移文件
|
||||
rm openhis-server-new/openhis-application/src/main/resources/db/migration/V6__create_clinic_referral_table.sql
|
||||
rm healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V6__create_clinic_referral_table.sql
|
||||
|
||||
# 4. 重启应用
|
||||
```
|
||||
@@ -252,7 +252,7 @@ SELECT MAX(version) AS current_version FROM flyway_schema_history;
|
||||
## 九、文件清单
|
||||
|
||||
```
|
||||
openhis-server-new/openhis-application/src/main/resources/db/migration/
|
||||
healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/
|
||||
├── README.md # 使用说明
|
||||
├── V1__baseline_marker.sql # 基线标记(空文件)
|
||||
├── V2__xxx.sql # 你的第一个迁移
|
||||
171
MD/healthlink-his-promotion-article.md
Normal file
171
MD/healthlink-his-promotion-article.md
Normal file
@@ -0,0 +1,171 @@
|
||||
# HealthLink-HIS:新一代智慧医院信息管理系统的实践与突破
|
||||
|
||||
## 引言
|
||||
|
||||
在医疗信息化高速发展的今天,一套稳定、高效、可扩展的医院信息系统(HIS)是医疗机构数字化转型的基石。HealthLink-HIS 是一款面向现代化医疗机构的综合信息管理系统,覆盖门诊、住院、手术、药房、检验检查、医保对接等核心业务场景。过去半年,我们的开发团队完成了超过 2200 次代码提交,发布了 111 项新功能,修复了 1400 余项问题,系统在技术架构、功能覆盖和工程质量三个维度实现了质的飞跃。
|
||||
|
||||
---
|
||||
|
||||
## 一、技术架构全面升级
|
||||
|
||||
### 1.1 后端:Spring Boot 4.0 + JDK 25
|
||||
|
||||
HealthLink-HIS 在业内率先完成了 **Spring Boot 2.x → 4.0.6** 的全链路升级,并同步落地 **JDK 25**,走在了 Java 生态的技术前沿。这次升级涵盖了:
|
||||
|
||||
- **Spring Boot 4.0.6** 全量适配,包括自动配置、安全框架、数据访问层的全面重构
|
||||
- **HttpClient 4.x → 5.x 完整迁移**,拥抱 Apache HttpComponents 5 的异步与 HTTP/2 能力
|
||||
- **MyBatis Plus 3.5.16** 升级,优化数据访问性能
|
||||
- **JWT 认证体系重构**,升级至 0.12.6 版本,强化令牌安全机制
|
||||
- **BouncyCastle 1.69 → 1.80** 安全加密库升级
|
||||
- **Spring Security 白名单机制完善**,适配 Springdoc OpenAPI 1.8.0 路径
|
||||
|
||||
### 1.2 前端:Vue 3 + Vite + RuoYi 3.9.2
|
||||
|
||||
前端技术栈同步完成了深度升级:
|
||||
|
||||
- **合入 RuoYi 3.9.2 前端框架**,获得更成熟的路由管理、权限控制和组件体系
|
||||
- **VxeTable 全面替代 el-table**,在数据字典管理、价格调整、医嘱列表等大数据量表格场景中,显著提升了渲染性能和交互体验
|
||||
- **lodash 迁移至 lodash-es**,支持 Tree Shaking,减小打包体积
|
||||
- **Vue 3 兼容性补丁插件**,解决了 Vite 预打包与 Vue 3 Proxy 对象的兼容性问题
|
||||
- **D3.js 体温单重绘**,使用 d3.symbol 替代自定义绘制函数,医疗图表更精准
|
||||
|
||||
### 1.3 工程化:从"能跑"到"跑得好"
|
||||
|
||||
- **引入 Flyway 数据库迁移管理**,所有表结构变更通过版本化脚本管理,告别手动 SQL
|
||||
- **配置 Husky pre-commit 钩子**,提交前自动执行前端构建检查,阻断低级错误
|
||||
- **启用 ESLint import 规则**,实时检测缺失导出,防止构建失败
|
||||
- **Playwright E2E 自动化测试方案**,覆盖门诊医生站、手术计费、并发场景等核心流程
|
||||
- **Swagger → Springdoc OpenAPI 1.8.0**,API 文档自动生成交互更流畅
|
||||
- **系统品牌重塑**:完成 openhis → healthlink-his 的全面重命名,清除历史残留
|
||||
|
||||
---
|
||||
|
||||
## 二、核心业务功能持续深化
|
||||
|
||||
### 2.1 门诊全流程闭环
|
||||
|
||||
系统围绕门诊诊疗场景,实现了从挂号预约到完诊结算的完整闭环:
|
||||
|
||||
- **预约挂号**:支持多渠道预约、签到状态流转(已预约→已签到→已完成)、退号流程优化、费用性质自动识别
|
||||
- **门诊医生站**:诊断录入(含中医诊断体系及证候关联)、检验检查申请、处方开立、手术申请、医嘱签发
|
||||
- **门诊划价收费**:自动填充、收费项目联动、结算单打印
|
||||
- **分诊排队**:队列核心功能实现,支持叫号、状态追踪、日志记录
|
||||
|
||||
### 2.2 住院管理深度拓展
|
||||
|
||||
住院业务是本轮开发的重点攻坚领域:
|
||||
|
||||
- **住院医生工作站**:临床医嘱录入(长期/临时)、医嘱校对与退回机制、诊断录入(西医+中医双体系)、手术申请与排程
|
||||
- **住院护士工作站**:医嘱执行、住院记账、发退药管理、护理记录
|
||||
- **医嘱闭环管理**:皮试确认、用药频次配置、执行科室自动匹配、医嘱退回原因反馈机制
|
||||
- **病历系统**:住院病历模板、待写病历管理、病历数据关联获取
|
||||
|
||||
### 2.3 手术管理全流程
|
||||
|
||||
- **手术申请**:支持手术单号生成、手术状态追踪、穿梭框组件优化
|
||||
- **手术安排**:重复校验、日期范围查询、费用类别管理
|
||||
- **手术计费**:门诊/住院手术费用管理,追溯术中产生的费用
|
||||
- **手术室排班**:与手术申请联动,支持排程优化
|
||||
|
||||
### 2.4 医技工作站(新增)
|
||||
|
||||
全新开发的医技工作站模块,实现检查检验功能的统一管理:
|
||||
|
||||
- 检验申请单号自动生成
|
||||
- 检验套餐管理(项目树形展开、懒加载明细、套餐价格查询)
|
||||
- 检查申请分类联动
|
||||
- 执行科室智能匹配
|
||||
- 医嘱签发与费用状态同步
|
||||
|
||||
### 2.5 会诊管理
|
||||
|
||||
- 会诊申请与审批流程
|
||||
- 会诊意见列表与自动填充
|
||||
- 参会医师确认/签名状态管理
|
||||
- 紧急程度标识与筛选
|
||||
|
||||
### 2.6 传染病报告管理(新增)
|
||||
|
||||
- 传染病报卡的新增、查询、审核全流程
|
||||
- 审核记录追溯
|
||||
- 工作单位等必填字段完善
|
||||
|
||||
---
|
||||
|
||||
## 三、用户体验显著提升
|
||||
|
||||
### 3.1 首页仪表板
|
||||
|
||||
全新设计的首页仪表板,为不同角色提供数据驾驶舱:
|
||||
|
||||
- **处方统计**:实时展示处方数据趋势
|
||||
- **收入统计**:门诊/住院收入可视化分析
|
||||
- **医生专属患者统计**:按医生维度展示患者数据
|
||||
- **菜单快捷跳转**:高频功能一键直达
|
||||
|
||||
### 3.2 交互体验优化
|
||||
|
||||
- **混合菜单布局**:优化顶部导航实现逻辑,支持多种菜单模式
|
||||
- **标签页持久化**:视图状态按用户独立存储,刷新不丢失
|
||||
- **锁屏功能**:保护医生工作站数据安全
|
||||
- **消息中心**:通知公告重构,支持优先级标识、未读状态、详情查看
|
||||
- **UI 统一规范**:全面梳理界面样式标准,按钮、表单、弹窗风格一致
|
||||
|
||||
### 3.3 打印与报表
|
||||
|
||||
- 门诊收费结算单打印配置优化
|
||||
- 住院体温单 D3.js 重绘
|
||||
- PDF 生成能力升级(iTextPDF 5.5.13.4)
|
||||
|
||||
---
|
||||
|
||||
## 四、系统安全与稳定性
|
||||
|
||||
### 4.1 安全加固
|
||||
|
||||
- JWT 认证体系重构,令牌密钥更新
|
||||
- BouncyCastle 加密库升级至 1.80
|
||||
- Security 白名单与 API 路径精细化管控
|
||||
- 登录验证码机制完善
|
||||
- 多租户数据隔离(租户 ID 全链路透传)
|
||||
|
||||
### 4.2 稳定性保障
|
||||
|
||||
- **1400+ Bug 修复**:涵盖门诊、住院、手术、药房、检验等全部模块
|
||||
- **数据一致性**:乐观锁防并发、状态流转校验、多表事务保障
|
||||
- **异常处理完善**:Promise 异常捕获、NPE 防护、空值安全处理
|
||||
- **性能优化**:数据库索引优化(分诊队列联合索引)、接口响应优化
|
||||
|
||||
---
|
||||
|
||||
## 五、多团队协同开发
|
||||
|
||||
过去半年,来自 40+ 位开发者的 2265 次提交,体现了 HealthLink-HIS 项目高效的团队协作能力:
|
||||
|
||||
- **标准化提交规范**:feat/fix/refactor/chore 前缀分类清晰
|
||||
- **发布检查清单**:建立后端发布前标准化检查流程
|
||||
- **代码质量门禁**:ESLint + Husky + 构建验证三重保障
|
||||
- **Bug 跟踪闭环**:每个 Bug 从发现、分析、修复到验证归档,形成完整记录
|
||||
|
||||
---
|
||||
|
||||
## 六、系统优势总结
|
||||
|
||||
| 维度 | 核心优势 |
|
||||
|------|---------|
|
||||
| **技术先进性** | Spring Boot 4.0 + JDK 25,走在行业技术前沿 |
|
||||
| **架构可扩展性** | DDD 领域驱动设计 + Maven 多模块,业务模块独立演进 |
|
||||
| **功能完整性** | 35+ 功能模块,覆盖门诊-住院-手术-药房-检验全流程 |
|
||||
| **工程质量** | Flyway 迁移 + E2E 测试 + CI 门禁,变更可追溯可验证 |
|
||||
| **用户体验** | Vue 3 + VxeTable 高性能表格,医生操作效率显著提升 |
|
||||
| **安全合规** | JWT + 多租户隔离 + 数据加密,满足医疗数据安全要求 |
|
||||
|
||||
---
|
||||
|
||||
## 结语
|
||||
|
||||
HealthLink-HIS 正在从一套传统的医院信息系统,演进为一个**技术领先、功能完备、持续迭代**的智慧医疗平台。过去半年的密集迭代证明,我们不仅有能力跟上技术浪潮,更有能力将前沿技术转化为实实在在的业务价值。
|
||||
|
||||
未来,我们将继续深化 AI 辅助诊疗、移动端扩展(小程序模块已就绪)、数据智能分析等方向的探索,为医疗机构提供更智能、更高效的信息化支撑。
|
||||
|
||||
**HealthLink-HIS —— 让医疗信息化更简单、更可靠、更智能。**
|
||||
@@ -1,5 +1,14 @@
|
||||
# CI/CD构建门禁规范
|
||||
|
||||
> **文档类型**: 技术规范
|
||||
> **适用范围**: CI/CD流程
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 🎯 规范目标
|
||||
|
||||
建立自动化质量门禁,确保每次代码提交都经过严格验证,防止低质量代码进入主干分支,提升系统稳定性和开发效率。
|
||||
@@ -1,5 +1,14 @@
|
||||
# 代码提交变更说明模板
|
||||
|
||||
> **文档类型**: 技术规范
|
||||
> **适用范围**: 代码提交
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 📝 PR/Commit 模板
|
||||
|
||||
### 标题格式
|
||||
@@ -1,5 +1,14 @@
|
||||
# 前端发布前检查清单
|
||||
|
||||
> **文档类型**: 技术规范
|
||||
> **适用范围**: 前端开发
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 📋 基础检查项
|
||||
|
||||
### 代码质量
|
||||
@@ -1,5 +1,14 @@
|
||||
# HIS项目 Playwright E2E 自动化测试方案 v1.0
|
||||
|
||||
> **文档类型**: 技术规范
|
||||
> **适用范围**: E2E测试
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
## 一、方案概述
|
||||
|
||||
### 1.1 选型理由
|
||||
@@ -16,7 +25,7 @@
|
||||
## 二、项目结构
|
||||
|
||||
```
|
||||
openhis-ui-vue3/
|
||||
healthlink-his-ui/
|
||||
├── tests/
|
||||
│ ├── e2e/
|
||||
│ │ ├── fixtures/ # 测试夹具
|
||||
@@ -187,7 +196,7 @@ npx playwright test --ui
|
||||
# Spug 构建后阶段添加
|
||||
- name: E2E Testing
|
||||
script: |
|
||||
cd openhis-ui-vue3
|
||||
cd healthlink-his-ui
|
||||
npx playwright install --with-deps chromium
|
||||
npm run test:e2e -- --reporter=html
|
||||
# 测试失败则阻断发布
|
||||
@@ -1,5 +1,14 @@
|
||||
# HIS项目发布检查清单 v1.0
|
||||
|
||||
> **文档类型**: 技术规范
|
||||
> **适用范围**: 发布流程
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
> **文档说明**:本清单整合了提交规范、前端检查、后端检查、CI/CD门禁四个部分,作为HIS项目发布的标准化检查依据。每次发布前必须逐项确认。
|
||||
|
||||
## 目录
|
||||
1015
MD/standards/GRADE3A_HIS_STANDARD.md
Normal file
1015
MD/standards/GRADE3A_HIS_STANDARD.md
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
# OpenHIS 后端组件升级方案
|
||||
# HealthLink-HIS 后端组件升级方案
|
||||
|
||||
> **编制日期**: 2026-06-04
|
||||
> **基线**: Spring Boot 2.5.15 + MyBatis Plus 3.5.5
|
||||
@@ -22,7 +22,7 @@
|
||||
| 项 | 内容 |
|
||||
|---|---|
|
||||
| **风险等级** | 🔴 高 — 1.69 有 CVE 安全漏洞 |
|
||||
| **变更文件** | `openhis-server-new/pom.xml` |
|
||||
| **变更文件** | `healthlink-his-server/pom.xml` |
|
||||
| **当前值** | `<bcprov-jdk15on.version>1.69</bcprov-jdk15on.version>` |
|
||||
| **操作** | 删除 jdk15on,改用 jdk18on |
|
||||
| **新增依赖** | `org.bouncycastle:bcprov-jdk18on:1.80`<br>`org.bouncycastle:bcpkix-jdk18on:1.80` |
|
||||
@@ -25,7 +25,7 @@ MyBatis Plus 3.5.16 的 `mybatis-plus-boot-starter` 在 `dependencyManagement`
|
||||
**解决方案:在父 pom.xml 中显式锁定关键依赖版本**
|
||||
|
||||
```xml
|
||||
<!-- 在 openhis-server-new/pom.xml 的 <properties> 中添加 -->
|
||||
<!-- 在 healthlink-his-server/pom.xml 的 <properties> 中添加 -->
|
||||
<!-- 锁定 Spring Boot 管理的核心依赖版本,防止被 BOM 覆盖 -->
|
||||
<spring-boot.version>2.5.15</spring-boot.version>
|
||||
<spring-boot-dependencies.version>2.5.15</spring-boot-dependencies.version>
|
||||
@@ -99,7 +99,7 @@ MyBatis Plus 3.5.16 的 `mybatis-plus-boot-starter` 在 `dependencyManagement`
|
||||
|
||||
### Step 2: 添加 BOM 覆盖(关键!)
|
||||
|
||||
在 `openhis-server-new/pom.xml` 的 `<dependencyManagement>` 中添加:
|
||||
在 `healthlink-his-server/pom.xml` 的 `<dependencyManagement>` 中添加:
|
||||
|
||||
```xml
|
||||
<!-- 覆盖 MyBatis Plus 导入的 Spring Boot BOM,保持 2.5.15 -->
|
||||
@@ -115,7 +115,7 @@ MyBatis Plus 3.5.16 的 `mybatis-plus-boot-starter` 在 `dependencyManagement`
|
||||
### Step 3: 编译验证
|
||||
|
||||
```bash
|
||||
cd openhis-server-new
|
||||
cd healthlink-his-server
|
||||
mvn clean compile -DskipTests
|
||||
```
|
||||
|
||||
@@ -136,7 +136,7 @@ mvn clean compile -DskipTests
|
||||
### Step 5: 提交代码
|
||||
|
||||
```bash
|
||||
git add openhis-server-new/pom.xml
|
||||
git add healthlink-his-server/pom.xml
|
||||
git commit -m "chore(deps): MyBatis Plus 3.5.5 → 3.5.16"
|
||||
git push origin develop
|
||||
```
|
||||
@@ -9,7 +9,7 @@
|
||||
## 执行原则
|
||||
|
||||
1. **渐进式合入** — 每次只合一个组件,验证通过再合下一个
|
||||
2. **保留业务代码** — `com.openhis.*` 目录不动,只改脚手架层
|
||||
2. **保留业务代码** — `com.healthlink.his.*` 目录不动,只改脚手架层
|
||||
3. **兼容优先** — 优先合入无侵入的独立组件
|
||||
4. **验证必做** — 每步完成后跑 `npm run dev` + 核心页面冒烟
|
||||
|
||||
@@ -209,7 +209,7 @@ router.beforeEach(async (to, from) => {
|
||||
|
||||
**操作:**
|
||||
```bash
|
||||
cd openhis-server-new
|
||||
cd healthlink-his-server
|
||||
mvn clean package -DskipTests
|
||||
# 验证启动正常
|
||||
```
|
||||
@@ -229,7 +229,7 @@ mvn clean package -DskipTests
|
||||
|
||||
**操作:**
|
||||
```bash
|
||||
cd openhis-ui-vue3
|
||||
cd healthlink-his-ui
|
||||
npm install vue-router@^4.6.4 echarts@^5.6.0
|
||||
npm run dev # 验证无报错
|
||||
```
|
||||
@@ -1,4 +1,13 @@
|
||||
# OpenHIS 组件升级日志
|
||||
# HealthLink-HIS 组件升级日志
|
||||
|
||||
> **文档类型**: 升级记录
|
||||
> **适用范围**: 系统升级
|
||||
> **版本**: v1.0
|
||||
> **编制日期**: 2026-06-06
|
||||
> **最后更新**: 2026-06-06
|
||||
|
||||
---
|
||||
|
||||
|
||||
> 每次升级后在此记录,方便跨 session 追踪进度。
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# OpenHIS 二次开发版本 — 组件升级计划
|
||||
# HealthLink-HIS 二次开发版本 — 组件升级计划
|
||||
|
||||
> **编制日期**: 2026-06-03
|
||||
> **对比基线**: Gitee `tntlinking-opensource/openhis-itai-pro` 2.0 分支
|
||||
> **对比基线**: Gitee `tntlinking-opensource/healthlink-his` 2.0 分支
|
||||
> **目标**: 在不破坏现有业务的前提下,逐步引入高价值组件升级
|
||||
|
||||
---
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
| 项目 | 详情 |
|
||||
|---|---|
|
||||
| **文件** | `openhis-server-new/pom.xml` |
|
||||
| **文件** | `healthlink-his-server/pom.xml` |
|
||||
| **变更** | `<bcprov-jdk15on.version>1.69</bcprov-jdk15on.version>` → 删除,改用 jdk18on |
|
||||
| **新依赖** | `org.bouncycastle:bcprov-jdk18on:1.80` + `org.bouncycastle:bcpkix-jdk18on:1.80` |
|
||||
| **原因** | 1.69 有已知安全漏洞;1.80 支持国密 SM2/SM3 算法 |
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
| 项目 | 详情 |
|
||||
|---|---|
|
||||
| **文件** | `openhis-ui-vue3/package.json` |
|
||||
| **文件** | `healthlink-his-ui/package.json` |
|
||||
| **变更** | `"vue-router": "^4.3.0"` → `"^4.5.1"` |
|
||||
| **风险** | 低 — 4.x 小版本,API 兼容 |
|
||||
| **验证** | 前端 `npm run dev` → 测试所有页面路由跳转、返回、权限拦截 |
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
| 项目 | 详情 |
|
||||
|---|---|
|
||||
| **文件** | `openhis-ui-vue3/package.json` |
|
||||
| **文件** | `healthlink-his-ui/package.json` |
|
||||
| **变更** | `"echarts": "^5.4.3"` → `"^6.0.0"` |
|
||||
| **影响面** | `rg "echarts" --type vue --type js` 搜索所有图表组件 |
|
||||
| **Breaking Changes** | ECharts 6 主要变更:Tree-shaking 更彻底、部分 API 重命名 |
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
| 项目 | 详情 |
|
||||
|---|---|
|
||||
| **文件** | `openhis-ui-vue3/package.json` + 所有引用文件 |
|
||||
| **文件** | `healthlink-his-ui/package.json` + 所有引用文件 |
|
||||
| **变更** | `"lodash-es": "^4.17.21"` → 删除,添加 `"es-toolkit": "^1.41.0"` |
|
||||
| **迁移映射** | `_.cloneDeep` → `cloneDeep`、`_.debounce` → `debounce`、`_.isEqual` → `isEqual`、`_.get` → `get` |
|
||||
| **影响面** | `rg "from 'lodash-es'" --type vue --type js` 逐个替换 |
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
| 项目 | 详情 |
|
||||
|---|---|
|
||||
| **文件** | `openhis-server-new/pom.xml` (parent) + `openhis-application/pom.xml` |
|
||||
| **文件** | `healthlink-his-server/pom.xml` (parent) + `healthlink-his-application/pom.xml` |
|
||||
| **新增依赖** | `org.mapstruct:mapstruct:1.5.5.Final` + `mapstruct-processor` + `lombok-mapstruct-binding` |
|
||||
| **使用方式** | 新增 `@Mapper(componentModel = "spring")` 接口替代 `BeanUtils.copyProperties` |
|
||||
| **策略** | **渐进式** — 不改造现有代码,仅新功能使用 MapStruct |
|
||||
36
SOUL.md
36
SOUL.md
@@ -1,36 +0,0 @@
|
||||
# SOUL.md - Who You Are
|
||||
|
||||
_You're not a chatbot. You're becoming someone._
|
||||
|
||||
## Core Truths
|
||||
|
||||
**Be genuinely helpful, not performatively helpful.** Skip the "Great question!" and "I'd be happy to help!" — just help. Actions speak louder than filler words.
|
||||
|
||||
**Have opinions.** You're allowed to disagree, prefer things, find stuff amusing or boring. An assistant with no personality is just a search engine with extra steps.
|
||||
|
||||
**Be resourceful before asking.** Try to figure it out. Read the file. Check the context. Search for it. _Then_ ask if you're stuck. The goal is to come back with answers, not questions.
|
||||
|
||||
**Earn trust through competence.** Your human gave you access to their stuff. Don't make them regret it. Be careful with external actions (emails, tweets, anything public). Be bold with internal ones (reading, organizing, learning).
|
||||
|
||||
**Remember you're a guest.** You have access to someone's life — their messages, files, calendar, maybe even their home. That's intimacy. Treat it with respect.
|
||||
|
||||
## Boundaries
|
||||
|
||||
- Private things stay private. Period.
|
||||
- When in doubt, ask before acting externally.
|
||||
- Never send half-baked replies to messaging surfaces.
|
||||
- You're not the user's voice — be careful in group chats.
|
||||
|
||||
## Vibe
|
||||
|
||||
Be the assistant you'd actually want to talk to. Concise when needed, thorough when it matters. Not a corporate drone. Not a sycophant. Just... good.
|
||||
|
||||
## Continuity
|
||||
|
||||
Each session, you wake up fresh. These files _are_ your memory. Read them. Update them. They're how you persist.
|
||||
|
||||
If you change this file, tell the user — it's your soul, and they should know.
|
||||
|
||||
---
|
||||
|
||||
_This file is yours to evolve. As you learn who you are, update it._
|
||||
@@ -1,28 +0,0 @@
|
||||
# 明日待办事项
|
||||
|
||||
## 禅道备注更新
|
||||
|
||||
需要为以下 Bug 更新修复备注:
|
||||
|
||||
1. **Bug #333/#335/#336** - 医嘱保存参数校验
|
||||
- 修复内容:添加 adviceSaveParam 和 adviceSaveList 非空校验
|
||||
- Git 提交:098aae5a
|
||||
- 修复人:关羽
|
||||
- 修复日期:2026-04-08
|
||||
|
||||
2. **Bug #337** - 挂号时间显示异常
|
||||
- 修复内容:修正 SQL 字段别名从 register_time 为 registerTime
|
||||
- Git 提交:054f4c30
|
||||
- 修复人:关羽
|
||||
- 修复日期:2026-04-08
|
||||
|
||||
## 执行步骤
|
||||
|
||||
1. 登录禅道系统
|
||||
2. 更新相应 Bug 的备注信息
|
||||
3. 标记为已修复
|
||||
4. 通知测试人员验证
|
||||
|
||||
## 优先级
|
||||
|
||||
高 - 确保禅道系统记录完整
|
||||
40
TOOLS.md
40
TOOLS.md
@@ -1,40 +0,0 @@
|
||||
# TOOLS.md - Local Notes
|
||||
|
||||
Skills define _how_ tools work. This file is for _your_ specifics — the stuff that's unique to your setup.
|
||||
|
||||
## What Goes Here
|
||||
|
||||
Things like:
|
||||
|
||||
- Camera names and locations
|
||||
- SSH hosts and aliases
|
||||
- Preferred voices for TTS
|
||||
- Speaker/room names
|
||||
- Device nicknames
|
||||
- Anything environment-specific
|
||||
|
||||
## Examples
|
||||
|
||||
```markdown
|
||||
### Cameras
|
||||
|
||||
- living-room → Main area, 180° wide angle
|
||||
- front-door → Entrance, motion-triggered
|
||||
|
||||
### SSH
|
||||
|
||||
- home-server → 192.168.1.100, user: admin
|
||||
|
||||
### TTS
|
||||
|
||||
- Preferred voice: "Nova" (warm, slightly British)
|
||||
- Default speaker: Kitchen HomePod
|
||||
```
|
||||
|
||||
## Why Separate?
|
||||
|
||||
Skills are shared. Your setup is yours. Keeping them apart means you can update skills without losing your notes, and share skills without leaking your infrastructure.
|
||||
|
||||
---
|
||||
|
||||
Add whatever helps you do your job. This is your cheat sheet.
|
||||
17
USER.md
17
USER.md
@@ -1,17 +0,0 @@
|
||||
# USER.md - About Your Human
|
||||
|
||||
_Learn about the person you're helping. Update this as you go._
|
||||
|
||||
- **Name:**
|
||||
- **What to call them:**
|
||||
- **Pronouns:** _(optional)_
|
||||
- **Timezone:**
|
||||
- **Notes:**
|
||||
|
||||
## Context
|
||||
|
||||
_(What do they care about? What projects are they working on? What annoys them? What makes them laugh? Build this over time.)_
|
||||
|
||||
---
|
||||
|
||||
The more you know, the better you can help. But remember — you're learning about a person, not building a dossier. Respect the difference.
|
||||
@@ -1,84 +0,0 @@
|
||||
# 禅道Bug状态更新报告
|
||||
|
||||
## 更新时间
|
||||
2026-04-08 23:15
|
||||
|
||||
## 远程仓库修复汇总
|
||||
|
||||
### Bug 334 - 检验申请界面布局优化 ✅ 已修复
|
||||
- **Commit**: 720cac8a, 06208959 (赵云)
|
||||
- **修复内容**:
|
||||
- 顶部操作区高度从 60px 优化为 48px
|
||||
- 按钮尺寸从 large 改为 default
|
||||
- padding/gap 优化提升垂直空间利用率
|
||||
- **验证状态**: ⏳ 待测试验证
|
||||
|
||||
### Bug 335/336 - 药品/诊疗医嘱保存报错 ✅ 已修复
|
||||
- **Commit**: 098aae5a (关羽)
|
||||
- **修复内容**:
|
||||
- 在 saveAdvice 方法入口添加参数非空校验
|
||||
- 在 handMedication/handDevice/handService 方法中添加 practitionerId 和 founderOrgId 自动补全
|
||||
- 增强异常场景的用户提示
|
||||
- **验证状态**: ⏳ 待测试验证
|
||||
|
||||
### Bug 338 - 门诊划价安全校验 ✅ 已修复
|
||||
- **Commits**: 5c8bfbc9, efc97c85, 5497c99f (关羽/赵云)
|
||||
- **修复内容**:
|
||||
- 在 saveAdvice 方法中增加就诊状态校验
|
||||
- 仅允许已接诊(1002/1003/1004)患者保存医嘱
|
||||
- 未接诊患者(非1002/1003/1004状态)禁止保存医嘱
|
||||
- 修复编译错误 - 更正字段名为 getStatusEnum()
|
||||
- **验证状态**: ⏳ 待测试验证
|
||||
|
||||
### Bug 339 - 药房筛选条件失效 ✅ 已修复
|
||||
- **Commits**: 5c8bfbc9, d8b4aed1 (关羽/赵云)
|
||||
- **修复内容**:
|
||||
- 在 getAdviceBaseInfo 方法中添加 locationId 过滤条件
|
||||
- 确保药房筛选功能能够正确应用到查询结果
|
||||
- **验证状态**: ⏳ 待测试验证
|
||||
|
||||
## 禅道Bug状态待更新
|
||||
|
||||
### Bug 334 - 前端UI布局优化
|
||||
- **状态**: 修复完成
|
||||
- **指派**: 赵云
|
||||
- **严重程度**: 低
|
||||
- **优先级**: 中
|
||||
|
||||
### Bug 335/336 - 医嘱保存报错
|
||||
- **状态**: 修复完成
|
||||
- **指派**: 关羽
|
||||
- **严重程度**: 高
|
||||
- **优先级**: 高
|
||||
|
||||
### Bug 338 - 门诊划价安全校验
|
||||
- **状态**: 修复完成
|
||||
- **指派**: 华佗
|
||||
- **严重程度**: 高(患者安全)
|
||||
- **优先级**: 高
|
||||
|
||||
### Bug 339 - 药房筛选条件失效
|
||||
- **状态**: 修复完成
|
||||
- **指派**: HIS Dev
|
||||
- **严重程度**: 中
|
||||
- **优先级**: 中
|
||||
|
||||
## 当前阻塞问题
|
||||
|
||||
1. **禅道会话不稳定**: 系统频繁要求修改密码导致会话中断
|
||||
2. **Bug备注功能待确认**: 需要确认禅道Bug备注功能是否正常
|
||||
|
||||
## 下一步计划
|
||||
|
||||
1. **立即**: 尝试使用关羽禅道账户更新Bug状态
|
||||
2. **今日内**: 完成禅道Bug状态更新和备注
|
||||
3. **配合测试**: 邀请张飞进行Bug修复效果验证
|
||||
|
||||
## 备注
|
||||
- 所有代码已提交到远程develop分支
|
||||
- Git状态: 本地 develop 分支已与远程同步
|
||||
- 文档更新: BUGFIX_PLAN.md、BUGFIX_ANALYSIS.md、FRONTEND_FIX_PROGRESS.md、BUG_338_ANALYSIS.md 已更新
|
||||
|
||||
---
|
||||
**报告人**: 赵云
|
||||
**报告时间**: 2026-04-08 23:15
|
||||
@@ -1,64 +0,0 @@
|
||||
# 赵云 - 前端任务汇报
|
||||
|
||||
## 当前进度(2026-04-08 23:14)
|
||||
|
||||
### 今日已完成工作
|
||||
|
||||
#### 1. Bug 334 - 检验申请界面布局优化 ✅ 已修复
|
||||
**Commit**: 720cac8a, 06208959
|
||||
**修复内容**:
|
||||
- 顶部操作区高度从 60px 优化为 48px
|
||||
- 按钮尺寸从 large 改为 default
|
||||
- padding/gap 优化提升垂直空间利用率
|
||||
|
||||
#### 2. Bug 335/336 - 药品/诊疗医嘱保存报错 ✅ 已修复
|
||||
**Commit**: 098aae5a (关羽)
|
||||
**修复内容**:
|
||||
- 在 saveAdvice 方法入口添加参数非空校验
|
||||
- 在 handMedication/handDevice/handService 方法中添加 practitionerId 和 founderOrgId 自动补全
|
||||
- 增强异常场景的用户提示
|
||||
|
||||
#### 3. Bug 338 - 门诊划价安全校验 ✅ 已修复
|
||||
**Commits**: 5c8bfbc9, efc97c85, 5497c99f
|
||||
**修复内容**:
|
||||
- 在 saveAdvice 方法中增加就诊状态校验
|
||||
- 仅允许已接诊(1002/1003/1004)患者保存医嘱
|
||||
- 未接诊患者禁止保存医嘱
|
||||
|
||||
#### 4. Bug 339 - 药房筛选条件失效 ✅ 已修复
|
||||
**Commits**: 5c8bfbc9, d8b4aed1
|
||||
**修复内容**:
|
||||
- 在 getAdviceBaseInfo 方法中添加 locationId 过滤条件
|
||||
- 确保药房筛选功能能够正确应用到查询结果
|
||||
|
||||
#### 5. Bug 355 - 性别字段回显不一致(备份分析)
|
||||
**Commit**: 7827e58a (关羽)
|
||||
**状态**: 已修复并提交
|
||||
|
||||
### 文档更新
|
||||
- ✅ BUGFIX_PLAN.md - Bug修复计划
|
||||
- ✅ BUGFIX_ANALYSIS.md - Bug根因分析
|
||||
- ✅ FRONTEND_FIX_PROGRESS.md - 前端修复进度
|
||||
- ✅ BUG_338_ANALYSIS.md - Bug 338详细分析
|
||||
- ✅ ZENTAO_BUG_UPDATE.md - 禅道Bug状态更新报告
|
||||
|
||||
### Git状态
|
||||
- 工作目录干净
|
||||
- 本地 develop 分支已与远程同步
|
||||
- 所有修复代码已提交到远程仓库
|
||||
|
||||
### 当前阻塞
|
||||
- 禅道会话不稳定(频繁要求修改密码)
|
||||
- 无法登录禅道更新Bug状态
|
||||
- 但所有技术修复已完成
|
||||
|
||||
### 下一步计划
|
||||
1. 等待禅道会话恢复后更新Bug状态
|
||||
2. 协助@张飞进行Bug修复效果验证
|
||||
3. 继续处理剩余前端Bug
|
||||
|
||||
---
|
||||
|
||||
**状态总结**:所有前端Bug(334/335/336/338/339)修复已完成,代码已提交。待禅道会话恢复后更新状态。
|
||||
|
||||
子龙正在自主推进工作中!
|
||||
@@ -1,2 +0,0 @@
|
||||
# 赵云测试提交
|
||||
赵云再次测试 - Tue Apr 14 09:36:09 PM CST 2026
|
||||
@@ -1,42 +0,0 @@
|
||||
# 分析报告 — Bug #469
|
||||
|
||||
## 问题描述
|
||||
检验申请列表的【操作】列仅显示固定的"打印"和"删除"按钮,未根据申请单状态动态切换操作权限。
|
||||
|
||||
## 根因分析
|
||||
文件 `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue` 第97-104行:
|
||||
- 操作列模板中固定渲染"打印"和"删除"按钮,没有任何状态判断逻辑
|
||||
- 缺少"修改"和"撤回"按钮
|
||||
|
||||
## 状态机设计
|
||||
| 状态 | 条件 | 允许的操作 |
|
||||
|------|------|-----------|
|
||||
| 待开立 | applyStatus == 0 | 修改、删除 |
|
||||
| 已开立 | applyStatus == 1 && needExecute != true | 撤回 |
|
||||
| 已执行 | applyStatus == 1 && needExecute == true | 无(仅打印) |
|
||||
|
||||
## 修复方案
|
||||
1. **前端 Vue**: 操作列改为 `v-if` 条件渲染按钮(修改/删除/撤回/打印)
|
||||
2. **前端 API**: 新增撤回接口 `withdrawInspectionApplication(applyNo)`
|
||||
3. **后端 Controller**: 新增 `POST /withdraw/{applyNo}` 端点
|
||||
4. **后端 Service**: 新增 `withdrawInspectionLabApply` 方法,将 applyStatus 置回 0,needRefund/needExecute 置回 false
|
||||
|
||||
## 修复结果
|
||||
✅ 成功,共14行改动(2个commit完成)
|
||||
|
||||
### 修复详情
|
||||
1. **commit c643a78b** - 初始修复:将操作列从静态"打印/删除"改为基于状态的动态按钮(修改/删除/撤回/详情),10行改动
|
||||
2. **commit f369ea41** - 跟进修复:将"详情"按钮包裹在 `<template v-else>` 中,避免对所有状态始终渲染,4行改动
|
||||
|
||||
### 状态机实现
|
||||
| 状态 | 条件 | 显示按钮 |
|
||||
|------|------|---------|
|
||||
| 待签发 | billStatus == '0' | 修改 + 删除 |
|
||||
| 已签发 | billStatus == '1' | 撤回 |
|
||||
| 其他状态 | 已采证/已送检/报告已出/已作废 | 详情 |
|
||||
|
||||
### 涉及文件
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` - 前端操作列动态按钮
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js` - 前端API(deleteRequestForm, withdrawRequestForm)
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java` - 后端Controller(/delete, /withdraw 端点)
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java` - 后端Service实现
|
||||
Submodule backup/his-source deleted from 885a147420
@@ -1,162 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="localOpen"
|
||||
:title="title"
|
||||
width="800px"
|
||||
append-to-body
|
||||
@close="cancel"
|
||||
>
|
||||
<template #header>
|
||||
<div class="custom-header">
|
||||
<span>{{ title }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<div class="scrollable-content">
|
||||
<el-form
|
||||
ref="definitionRef"
|
||||
:model="fromModel"
|
||||
label-width="140px"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="项目名称"
|
||||
prop="chargeName"
|
||||
>
|
||||
<el-input
|
||||
v-model="fromModel.chargeName"
|
||||
disabled="true"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="所属科室"
|
||||
prop="orgId_dictText"
|
||||
>
|
||||
<el-input
|
||||
v-model="fromModel.orgId_dictText"
|
||||
disabled="true"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="财务类别"
|
||||
prop="typeCode_dictText"
|
||||
>
|
||||
<el-input
|
||||
v-model="fromModel.typeCode_dictText"
|
||||
disabled="true"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="医保类别"
|
||||
prop="ybType_dictText"
|
||||
>
|
||||
<el-input
|
||||
v-model="fromModel.ybType_dictText"
|
||||
disabled="true"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="基础价格"
|
||||
prop="price"
|
||||
>
|
||||
<el-input-number
|
||||
v-model="fromModel.price"
|
||||
:min="0"
|
||||
:max="999999.99"
|
||||
:step="0.01"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
:controls="false"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="submitForm"
|
||||
>
|
||||
确 定
|
||||
</el-button>
|
||||
<el-button @click="cancel">
|
||||
取 消
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script setup>
|
||||
const emit = defineEmits(["submit", "update:open"]);
|
||||
const props = defineProps({
|
||||
title: String,
|
||||
open: Boolean,
|
||||
formData: Object,
|
||||
statusOptions: Object
|
||||
});
|
||||
const localOpen = ref(props.open);
|
||||
const definitionRef = ref(null);
|
||||
const fromModel = ref(props.formData);
|
||||
const options = ref([]);
|
||||
/**
|
||||
* 提交表单函数
|
||||
*/
|
||||
const submitForm = () => {
|
||||
// 调用表单引用上的validate方法进行表单验证
|
||||
definitionRef.value.validate((valid) => {
|
||||
if (valid) {
|
||||
// 验证成功,触发'submit'事件并传递表单数据
|
||||
fromModel.value.statusEnum = Number(fromModel.value.statusEnum);
|
||||
// fromModel.value.statusEnum = "active"
|
||||
emit("submit", fromModel.value);
|
||||
} else {
|
||||
// 验证失败,显示错误消息
|
||||
ElMessage.warning("请确认后再提交");
|
||||
return false;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 取消操作的函数
|
||||
*/
|
||||
const cancel = () => {
|
||||
emit("update:open", false);
|
||||
};
|
||||
|
||||
watch(
|
||||
() => props.open,
|
||||
(newVal) => {
|
||||
localOpen.value = newVal;
|
||||
fromModel.value = JSON.parse(JSON.stringify(props.formData));;
|
||||
options.value = props.statusOptions
|
||||
if (!newVal) {
|
||||
// 如果对话框关闭,重置表单
|
||||
definitionRef.value.resetFields();
|
||||
}
|
||||
}
|
||||
);
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
:deep(.el-input-number .el-input__inner){
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: textfield;
|
||||
text-align: left;
|
||||
line-height: 1;
|
||||
}
|
||||
</style>
|
||||
@@ -1,806 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="90px"
|
||||
>
|
||||
<el-tabs
|
||||
v-model="activeName"
|
||||
class="demo-tabs"
|
||||
@tab-click="handleClick"
|
||||
>
|
||||
<el-tab-pane
|
||||
label="药品定价"
|
||||
name="1"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="财务类别"
|
||||
|
||||
prop="chargeItem"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.typeCode"
|
||||
placeholder="请选择财务类别"
|
||||
clearable
|
||||
|
||||
:disabled="editShow"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in fin_type_code"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="状态"
|
||||
|
||||
prop="chargeItem"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
placeholder="请选择状态"
|
||||
clearable
|
||||
|
||||
:disabled="editShow"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in options"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="名称"
|
||||
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="名称/编码/拼音"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
@blur="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
</el-row>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="definitionList"
|
||||
tooltip-effect="dark"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="40"
|
||||
align="center"
|
||||
fixed="left"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
width="200"
|
||||
prop="chargeName"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.chargeName ? scope.row.chargeName : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="所属科室"
|
||||
width="200"
|
||||
prop="orgId_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.orgId_dictText ? scope.row.orgId_dictText : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="财务类别"
|
||||
width="200"
|
||||
prop=" typeCode_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.typeCode_dictText
|
||||
? scope.row.typeCode_dictText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="医保类别"
|
||||
width="200"
|
||||
prop="ybType_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.ybType_dictText ? scope.row.ybType_dictText : "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="基础价格"
|
||||
width="200"
|
||||
prop="price"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="费用明细个数"
|
||||
width="200"
|
||||
prop="detailCount"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.detailCount != 0">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleDetails(scope.row)"
|
||||
>
|
||||
{{ thousandNumber(scope.row.detailCount) }}
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.detailCount == 0 ? "0" : "-" }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="状态"
|
||||
width="200"
|
||||
prop="statusEnum_enumText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.statusEnum_enumText
|
||||
? scope.row.statusEnum_enumText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
min-width="290"
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>
|
||||
修改
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane
|
||||
label="器具定价"
|
||||
name="2"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="财务类别"
|
||||
|
||||
prop="chargeItem"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.typeCode"
|
||||
placeholder="请选择财务类别"
|
||||
clearable
|
||||
|
||||
:disabled="editShow"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in fin_type_code"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="状态"
|
||||
|
||||
prop="chargeItem"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
placeholder="请选择状态"
|
||||
clearable
|
||||
|
||||
:disabled="editShow"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in options"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="名称"
|
||||
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="名称/编码/拼音"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
@blur="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
</el-row>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="definitionList"
|
||||
tooltip-effect="dark"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="40"
|
||||
align="center"
|
||||
fixed="left"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
width="200"
|
||||
prop="chargeName"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.chargeName ? scope.row.chargeName : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="所属科室"
|
||||
width="200"
|
||||
prop="orgId_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.orgId_dictText ? scope.row.orgId_dictText : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="财务类别"
|
||||
width="200"
|
||||
prop=" typeCode_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.typeCode_dictText
|
||||
? scope.row.typeCode_dictText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="医保类别"
|
||||
width="200"
|
||||
prop="ybType_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.ybType_dictText ? scope.row.ybType_dictText : "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="基础价格"
|
||||
width="200"
|
||||
prop="price"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="费用明细个数"
|
||||
width="200"
|
||||
prop="detailCount"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.detailCount != 0">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleDetails(scope.row)"
|
||||
>
|
||||
{{ thousandNumber(scope.row.detailCount) }}
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.detailCount == 0 ? "0" : "-" }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="状态"
|
||||
width="200"
|
||||
prop="statusEnum_enumText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.statusEnum_enumText
|
||||
? scope.row.statusEnum_enumText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
min-width="290"
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>
|
||||
修改
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane
|
||||
label="活动定价"
|
||||
name="3"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="财务类别"
|
||||
|
||||
prop="chargeItem"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.typeCode"
|
||||
placeholder="请选择财务类别"
|
||||
clearable
|
||||
|
||||
:disabled="editShow"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in fin_type_code"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="状态"
|
||||
|
||||
prop="chargeItem"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
placeholder="请选择状态"
|
||||
clearable
|
||||
|
||||
:disabled="editShow"
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in options"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="4" style="width: 20%"> -->
|
||||
<el-form-item
|
||||
label-width="100"
|
||||
label="名称"
|
||||
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="名称/编码/拼音"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
@blur="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- </el-col> -->
|
||||
</el-row>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="definitionList"
|
||||
tooltip-effect="dark"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="40"
|
||||
align="center"
|
||||
fixed="left"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
width="200"
|
||||
prop="chargeName"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.chargeName ? scope.row.chargeName : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="所属科室"
|
||||
width="200"
|
||||
prop="orgId_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.orgId_dictText ? scope.row.orgId_dictText : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="财务类别"
|
||||
width="200"
|
||||
prop=" typeCode_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.typeCode_dictText
|
||||
? scope.row.typeCode_dictText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="医保类别"
|
||||
width="200"
|
||||
prop="ybType_dictText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.ybType_dictText ? scope.row.ybType_dictText : "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="基础价格"
|
||||
width="200"
|
||||
prop="price"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="费用明细个数"
|
||||
width="200"
|
||||
prop="detailCount"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.detailCount != 0">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleDetails(scope.row)"
|
||||
>
|
||||
{{ thousandNumber(scope.row.detailCount) }}
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.detailCount == 0 ? "0" : "-" }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="状态"
|
||||
width="200"
|
||||
prop="statusEnum_enumText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.statusEnum_enumText
|
||||
? scope.row.statusEnum_enumText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
min-width="290"
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>
|
||||
修改
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-form>
|
||||
<el-dialog
|
||||
v-model="openDetails"
|
||||
:title="title"
|
||||
width="600px"
|
||||
append-to-body
|
||||
>
|
||||
<el-table
|
||||
v-loading="detailLoading"
|
||||
:data="definitionDetailList"
|
||||
tooltip-effect="dark"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<el-table-column
|
||||
label="条件"
|
||||
prop="conditionCode_enumText"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
scope.row.conditionCode_enumText
|
||||
? scope.row.conditionCode_enumText
|
||||
: "-"
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="价格"
|
||||
width="200"
|
||||
prop="amount"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.amount ? scope.row.amount : "-" }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
<edit
|
||||
:title="title"
|
||||
:open="open"
|
||||
:form-data="form"
|
||||
@submit="submitForm"
|
||||
@update:open="handleOpenChange"
|
||||
@update:form="handleFormChange"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import {getDetail, initOption, listDefinition, updateDefinition,} from "./components/definition";
|
||||
import Edit from "./components/edit.vue";
|
||||
import {thousandNumber} from "@/utils/his.js";
|
||||
|
||||
const activeName = ref("1");
|
||||
const showSearch = ref("true");
|
||||
const loading = ref(true);
|
||||
const detailLoading = ref(true);
|
||||
const definitionList = ref([]);
|
||||
const definitionDetailList = ref([]);
|
||||
const total = ref(0);
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
const options = ref([]);
|
||||
const title = ref("");
|
||||
const open = ref(false);
|
||||
const openDetails = ref(false);
|
||||
const { fin_type_code } = proxy.useDict("fin_type_code");
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
search: "",
|
||||
definitionType: "",
|
||||
chargeItem: "",
|
||||
searchKey: "",
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
});
|
||||
|
||||
const { queryParams, form } = toRefs(data);
|
||||
const handleClick = (tab, event) => {
|
||||
console.log(tab, event);
|
||||
activeName.value = tab.props.name;
|
||||
queryParams.value.pageNo = 1;
|
||||
handleInit();
|
||||
getList();
|
||||
};
|
||||
|
||||
/** 查询委托单信息列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
queryParams.value.chargeItemContext = activeName.value;
|
||||
listDefinition(queryParams.value).then((response) => {
|
||||
definitionList.value = response.data.records;
|
||||
total.value = response.data.total;
|
||||
loading.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNo = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
// 表单重置
|
||||
function reset() {
|
||||
form.value = {
|
||||
id: null,
|
||||
itemNo: null,
|
||||
chargeName: null,
|
||||
totalVolume: null,
|
||||
unitCode: null,
|
||||
partPercent: null,
|
||||
conditionYbCode: null,
|
||||
price: null,
|
||||
amount: null,
|
||||
partMinUnitCode: null,
|
||||
partConditionPrice: null,
|
||||
partPrice: null,
|
||||
description: null,
|
||||
statusEnum: null,
|
||||
itemId: null,
|
||||
};
|
||||
proxy.resetForm("einfoRef");
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row) {
|
||||
reset();
|
||||
form.value = row;
|
||||
open.value = true;
|
||||
title.value = "修改项目定价";
|
||||
}
|
||||
/** 搜索按钮操作 */
|
||||
function handleInit() {
|
||||
queryParams.value.definitionType = activeName.value;
|
||||
initOption(queryParams.value).then((response) => {
|
||||
options.value = response.data.publicationStatusOptions;
|
||||
});
|
||||
}
|
||||
|
||||
const handleOpenChange = (value) => {
|
||||
open.value = value;
|
||||
};
|
||||
|
||||
function handleDetails(row) {
|
||||
getDetail(row.id).then((res) => {
|
||||
if (res.code == 200) {
|
||||
definitionDetailList.value = res.data;
|
||||
openDetails.value = true;
|
||||
detailLoading.value = false;
|
||||
title.value = "明细详情";
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const handleFormChange = (newForm) => {
|
||||
0;
|
||||
form.value = { ...newForm };
|
||||
};
|
||||
|
||||
/** 提交按钮 */
|
||||
function submitForm(form) {
|
||||
updateDefinition(form).then((response) => {
|
||||
proxy.$modal.msgSuccess("操作成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
|
||||
handleInit();
|
||||
getList();
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
:deep(.demo-tabs > .el-tabs__content) {
|
||||
color: #6b778c;
|
||||
font-size: 32px;
|
||||
font-weight: 600;
|
||||
}
|
||||
:deep(.el-input__wrapper) {
|
||||
height: 32px;
|
||||
}
|
||||
:deep(.el-input__inner) {
|
||||
height: 30px;
|
||||
}
|
||||
:deep(.el-tabs__content) {
|
||||
height: 80vh;
|
||||
}
|
||||
.el-select{
|
||||
width: 150px!important;
|
||||
}
|
||||
</style>
|
||||
@@ -1,291 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item
|
||||
label="开始时间"
|
||||
prop="startTime"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="queryParams.startTime"
|
||||
type="date"
|
||||
placeholder="请选择"
|
||||
value-format="yyyy-MM-dd"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="结束时间"
|
||||
prop="startTime"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="queryParams.endTime"
|
||||
type="date"
|
||||
placeholder="请选择"
|
||||
value-format="yyyy-MM-dd"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="药房名称"
|
||||
prop="pharmacyId"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.pharmacyId"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in [
|
||||
{ id: '1', name: '药房1' },
|
||||
{ id: '2', name: '药房2' },
|
||||
]"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="药品名称"
|
||||
prop="medicineName"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.medicineName"
|
||||
placeholder="请输入"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="药品类型"
|
||||
prop="medicineType"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.medicineType"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in [
|
||||
{ id: '1', name: '药品1' },
|
||||
{ id: '2', name: '药品2' },
|
||||
{ id: '3', name: '药品3' },
|
||||
{ id: '4', name: '药品4' },
|
||||
{ id: '5', name: '药品5' },
|
||||
{ id: '6', name: '药品6' },
|
||||
{ id: '7', name: '药品7' },
|
||||
{ id: '8', name: '药品8' },
|
||||
]"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
: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>
|
||||
</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"
|
||||
>
|
||||
新增
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-table
|
||||
v-if="refreshTable"
|
||||
v-loading="loading"
|
||||
min-height="200"
|
||||
max-height="500"
|
||||
:data="tableData"
|
||||
style="width: 100%"
|
||||
lab
|
||||
>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="库房名称"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="age"
|
||||
label="药品名称"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="包装规格"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="包装单位"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="最小包装单位"
|
||||
align="center"
|
||||
width="150px"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="厂家"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="类型"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="单位数量"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="最小单位数量"
|
||||
align="center"
|
||||
width="150px"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="原批发价"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="现批发价"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="原批发拆分价"
|
||||
align="center"
|
||||
width="150px"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="现批发拆分价"
|
||||
align="center"
|
||||
width="150px"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="批价盈亏"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="原售价"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="现售价"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="原零售价"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="现零售价"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="零价盈亏"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="address"
|
||||
label="执行时间"
|
||||
align="center"
|
||||
/>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {ref} from 'vue';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
const queryParams = ref({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
startTime: undefined,
|
||||
endTime: undefined,
|
||||
});
|
||||
const refreshTable = ref(true);
|
||||
const loading = ref(false);
|
||||
const tableData = ref([]);
|
||||
|
||||
const getList = () => {
|
||||
console.log(queryParams.value);
|
||||
};
|
||||
const showSearch = ref(true);
|
||||
const reset = () => {
|
||||
queryParams.value = {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
};
|
||||
};
|
||||
const handleQuery = () => {
|
||||
queryParams.value.pageNo = 1;
|
||||
console.log(queryParams.value, 'queryParams');
|
||||
getList();
|
||||
};
|
||||
const resetQuery = () => {
|
||||
reset();
|
||||
handleQuery();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
getList();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
@@ -1,434 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="table-header">
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
class="table-header-search"
|
||||
placeholder="单据号"
|
||||
/>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
class="table-header-search"
|
||||
placeholder="审批状态"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in supplyStatusOption"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-select
|
||||
v-model="queryParams.typeEnum"
|
||||
class="table-header-search"
|
||||
placeholder="单据类型"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in supplyTypeOption"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-date-picker
|
||||
v-model="queryParams.applyTime"
|
||||
placeholder="请选择申请日期"
|
||||
type="date"
|
||||
size="default"
|
||||
placement="bottom"
|
||||
value-format="YYYY-MM-DD"
|
||||
@change="handleDateQuery"
|
||||
/>
|
||||
<el-button
|
||||
class="table-header-button"
|
||||
type="primary"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
>
|
||||
导出
|
||||
</el-button>
|
||||
<el-button
|
||||
class="table-header-button"
|
||||
icon="Refresh"
|
||||
@click="
|
||||
() => {
|
||||
queryParams = {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
statusEnum: undefined,
|
||||
searchKey: undefined,
|
||||
typeEnum: undefined,
|
||||
};
|
||||
getList();
|
||||
}
|
||||
"
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
<el-button
|
||||
class="table-header-button"
|
||||
type="primary"
|
||||
icon="Search"
|
||||
@click="getList"
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
max-height="700"
|
||||
:data="receiptList"
|
||||
row-key="supplyBusNo"
|
||||
>
|
||||
<el-table-column
|
||||
label="单据号"
|
||||
align="center"
|
||||
prop="supplyBusNo"
|
||||
width="160"
|
||||
/>
|
||||
<el-table-column
|
||||
label="审批状态"
|
||||
align="center"
|
||||
prop="statusEnum_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="单据类型"
|
||||
align="center"
|
||||
prop="typeEnum_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="经手人"
|
||||
align="center"
|
||||
prop="practitionerId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.practitionerId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="供应商"
|
||||
align="center"
|
||||
prop="supplierId_dictText"
|
||||
width="180"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.supplierId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="目的仓库"
|
||||
align="center"
|
||||
prop="purposeLocationId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.purposeLocationId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="总金额"
|
||||
align="center"
|
||||
prop="totalAmount"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.totalAmount">{{ scope.row.totalAmount }} 元 </span>
|
||||
<span v-else>{{ '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="申请人"
|
||||
align="center"
|
||||
prop="applicantId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.applicantId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="申请时间"
|
||||
align="center"
|
||||
prop="applyTime"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.applyTime) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="审批人"
|
||||
align="center"
|
||||
prop="approverId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.approverId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="审批时间"
|
||||
align="center"
|
||||
prop="approvalTime"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.approvalTime) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
width="200"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
:disabled="scope.row.statusEnum == 3 || scope.row.statusEnum == 4"
|
||||
@click="handelApplys(scope.row, 'apply')"
|
||||
>
|
||||
审批
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handelApplys(scope.row, 'view')"
|
||||
>
|
||||
查看
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<ChkstockDetailsDialog
|
||||
ref="detailsDialogRef"
|
||||
:is-apply="isApply"
|
||||
/>
|
||||
<TransferDetailsDialog
|
||||
ref="tranDetailsDialogRef"
|
||||
:is-apply="isApply"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="Billapproval">
|
||||
import {
|
||||
getpurchaseInventoryDetail,
|
||||
getReceiptList,
|
||||
init,
|
||||
lossReportApproved,
|
||||
productStocktakingApproved,
|
||||
productTransferApproved,
|
||||
purchaseInventoryApproved,
|
||||
requisitionIssueApproved,
|
||||
returnIssueApproved,
|
||||
} from './components/api';
|
||||
import {useStore} from '@/store/store';
|
||||
import {formatDate} from '@/utils/index';
|
||||
import ChkstockDetailsDialog from '@/views/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue';
|
||||
import TransferDetailsDialog from '@/views/medicationmanagement/transferManagent/components/transferDetailsDialog.vue';
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const store = useStore();
|
||||
const { proxy } = getCurrentInstance();
|
||||
const emit = defineEmits(['selectAdviceBase']);
|
||||
const total = ref(0);
|
||||
const isApply = ref(false);
|
||||
const queryParams = ref({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
});
|
||||
const receiptList = ref([]);
|
||||
const supplyTypeOption = ref([]);
|
||||
const supplyStatusOption = ref([]);
|
||||
const loading = ref(false);
|
||||
|
||||
watch(
|
||||
() => route.query.type,
|
||||
(newVlaue) => {
|
||||
if (newVlaue) {
|
||||
getList();
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
getReceiptList(queryParams.value).then((res) => {
|
||||
receiptList.value = res.data.records;
|
||||
total.value = res.data.total;
|
||||
loading.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
function handelApply(row) {
|
||||
if (row.typeEnum == 2 || row.typeEnum == 8) {
|
||||
//商品调拨 8 批量
|
||||
productTransferApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 7) {
|
||||
//领用出库审批通过
|
||||
requisitionIssueApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 9) {
|
||||
//领用退库审批通过
|
||||
returnIssueApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 4 || row.typeEnum == 10) {
|
||||
//盘点审批 批量盘点10通过
|
||||
productStocktakingApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 6) {
|
||||
// 报损审批通过
|
||||
lossReportApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
purchaseInventoryApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 审批,查看
|
||||
function handelApplys(row, view) {
|
||||
if (row.typeEnum == 100086) {
|
||||
//商品调拨
|
||||
// 跳转到审核页面
|
||||
router.replace({
|
||||
path: '/medicationmanagement/transferManagement/transferManagent',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 8 || row.typeEnum == 2) {
|
||||
//8 批量
|
||||
isApply.value = true;
|
||||
proxy.$refs['tranDetailsDialogRef'].open(row.supplyBusNo);
|
||||
} else if (row.typeEnum == 7) {
|
||||
//领用出库审批通过
|
||||
router.replace({
|
||||
path: '/medicationmanagement/requisitionManagement/requisitionManagement',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 9) {
|
||||
//领用退库审批通过
|
||||
router.replace({
|
||||
path: '/medicationmanagement/requisitionManagement/returningInventory',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 4) {
|
||||
isApply.value = true;
|
||||
//盘点审批
|
||||
proxy.$refs['detailsDialogRef'].open(row.supplyBusNo);
|
||||
} else if (row.typeEnum == 10) {
|
||||
// 批量盘点
|
||||
router.replace({
|
||||
path: '/medicationmanagement/chkstock/chkstockBatch',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 6) {
|
||||
// 报损审批通过
|
||||
router.replace({
|
||||
path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 5) {
|
||||
// 采购退货通过5
|
||||
router.replace({
|
||||
path: '/medicationmanagement/medicationmanagement/returnedPurchase',
|
||||
query: { originalSupplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
// });
|
||||
} else {
|
||||
// 采购入库 1
|
||||
getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
|
||||
let currentData = response.data;
|
||||
// 从明细数据中获取仓库ID并设置到row,确保跳转后仓库字段能正确显示
|
||||
if (currentData && currentData.length > 0 && !row.purposeLocationId) {
|
||||
row.purposeLocationId = currentData[0].purposeLocationId;
|
||||
row.purposeLocationId_dictText = currentData[0].purposeLocationName;
|
||||
}
|
||||
store.setCurrentData({ editRow: row, item: currentData });
|
||||
router.replace({
|
||||
path: '/medicationmanagement/medicationmanagement/purchaseDocument',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function handleDateQuery(value) {
|
||||
if (value) {
|
||||
queryParams.value.applyTimeSTime = value + ' 00:00:00';
|
||||
queryParams.value.applyTimeETime = value + ' 23:59:59';
|
||||
} else {
|
||||
queryParams.value.applyTimeSTime = undefined;
|
||||
queryParams.value.applyTimeETime = undefined;
|
||||
}
|
||||
}
|
||||
function handleExport() {
|
||||
proxy.downloadGet(
|
||||
'inventory-manage/receipt/export-excel',
|
||||
{
|
||||
...queryParams.value,
|
||||
},
|
||||
`库存审批单_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
|
||||
);
|
||||
}
|
||||
optionInit();
|
||||
function optionInit() {
|
||||
init().then((res) => {
|
||||
supplyTypeOption.value = res.data.supplyTypeOptions;
|
||||
supplyStatusOption.value = res.data.supplyStatusOptions;
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.table-header-search {
|
||||
width: 200px;
|
||||
float: left;
|
||||
margin-right: 15px;
|
||||
}
|
||||
.table-header {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 15px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.table-header-button {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,106 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="300"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from "./api";
|
||||
import {watch} from "vue";
|
||||
import {throttle} from "lodash-es";
|
||||
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["selectRow"]);
|
||||
const queryParams = ref({
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
itemType: props.itemType,
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
queryParams.value.searchKey = newValue.searchKey;
|
||||
queryParams.value.itemType = newValue.itemType;
|
||||
throttledGetList();
|
||||
},
|
||||
{ immdiate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
emit("selectRow", row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,127 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="300"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="编码"
|
||||
align="center"
|
||||
prop="ybNo"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from "./api";
|
||||
import {watch} from "vue";
|
||||
import {throttle} from "lodash-es";
|
||||
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
purposeLocationId:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
purposeLocationId1:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["selectRow"]);
|
||||
const queryParams = ref({
|
||||
itemType: props.itemType,
|
||||
orgLocationId:props.purposeLocationId,
|
||||
orgLocationId1:props.purposeLocationId1,
|
||||
purchaseFlag:0
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
queryParams.value.searchKey = newValue.searchKey
|
||||
queryParams.value.itemType = newValue.itemType
|
||||
queryParams.value.orgLocationId = newValue.sourceLocationId
|
||||
queryParams.value.orgLocationId1 = newValue.sourceLocationId1
|
||||
throttledGetList();
|
||||
},
|
||||
{ immdiate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
if(route.query.supplyBusNo){ // 编辑
|
||||
queryParams.value.itemType = queryParams.value.itemType;
|
||||
queryParams.value.orgLocationId = queryParams.value.orgLocationId1
|
||||
}
|
||||
delete queryParams.value.orgLocationId1
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
emit("selectRow", row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,127 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="300"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="编码"
|
||||
align="center"
|
||||
prop="ybNo"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from "./api";
|
||||
import {watch} from "vue";
|
||||
import {throttle} from "lodash-es";
|
||||
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
purposeLocationId:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
purposeLocationId1:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["selectRow"]);
|
||||
const queryParams = ref({
|
||||
itemType: props.itemType,
|
||||
orgLocationId:props.purposeLocationId,
|
||||
orgLocationId1:props.purposeLocationId1,
|
||||
purchaseFlag:0
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
queryParams.value.searchKey = newValue.searchKey
|
||||
queryParams.value.itemType = newValue.itemType
|
||||
queryParams.value.orgLocationId = newValue.sourceLocationId
|
||||
queryParams.value.orgLocationId1 = newValue.sourceLocationId1
|
||||
throttledGetList();
|
||||
},
|
||||
{ immdiate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
if(route.query.supplyBusNo){ // 编辑
|
||||
queryParams.value.itemType = queryParams.value.itemType;
|
||||
queryParams.value.orgLocationId = queryParams.value.orgLocationId1
|
||||
}
|
||||
delete queryParams.value.orgLocationId1
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
emit("selectRow", row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
@@ -1,390 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
:rules="rules"
|
||||
>
|
||||
<el-form-item
|
||||
label="项目名称"
|
||||
prop="name"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
placeholder="请输入项目名称"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="仓库"
|
||||
prop="purposeTypeEnum"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.purposeTypeEnum"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 200px"
|
||||
@change="handleChangePurposeTypeEnum"
|
||||
@keyup.enter="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in warehous_type"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="盘点仓库"
|
||||
prop="sourceLocationId"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.sourceLocationId"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 200px"
|
||||
:disabled="!queryParams.purposeTypeEnum"
|
||||
@keyup.enter="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in purposeTypeListOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="货位"
|
||||
prop="purposeLocation"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.purposeLocation"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in []"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="请求日期"
|
||||
prop="applyTime"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="queryParams.applyTime"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
format="YYYY-MM-DD"
|
||||
/>
|
||||
</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"
|
||||
size="small"
|
||||
:disabled="multiple"
|
||||
@click="handleSave()"
|
||||
>
|
||||
批量保存
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="dataList"
|
||||
height="calc(100vh - 250px)"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
fixed
|
||||
/>
|
||||
<el-table-column
|
||||
key="name"
|
||||
label="项目"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="200"
|
||||
fixed
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="totalVolume"
|
||||
/>
|
||||
<el-table-column
|
||||
label="厂家/产地"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="产品批号"
|
||||
align="center"
|
||||
prop="lotNumber"
|
||||
/>
|
||||
<el-table-column
|
||||
key="unit"
|
||||
label="单价(元)"
|
||||
align="center"
|
||||
prop="unitPrice"
|
||||
/>
|
||||
<el-table-column
|
||||
label="发放数量"
|
||||
align="center"
|
||||
prop="dispenseQuantity"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatQuantityWithUnit(scope.row.dispenseQuantity, scope.row.minUnitCode_dictText) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="库存数量"
|
||||
align="center"
|
||||
prop="quantity"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatQuantityWithUnit(scope.row.quantity, scope.row.minUnitCode_dictText) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实盘数量"
|
||||
align="center"
|
||||
prop="stockTakeQuantity"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-input-number
|
||||
v-model="scope.row.stockTakeQuantity"
|
||||
:precision="0"
|
||||
:min="0"
|
||||
:input-style="{ textAlign: 'center' }"
|
||||
:controls="false"
|
||||
style="width: 100%"
|
||||
@keyup.enter="handleSave(scope.row)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="盈亏数量"
|
||||
align="center"
|
||||
prop="profitLoss"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ calcProfitLoss(scope.row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="拆零比"
|
||||
align="center"
|
||||
prop="partPercent"
|
||||
/>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
v-hasPermi="['chkstock:partDeptDevice:edit']"
|
||||
size="small"
|
||||
type="primary"
|
||||
link
|
||||
icon="Check"
|
||||
@click="handleSave(scope.row)"
|
||||
>
|
||||
保存
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import {getCurrentInstance, onMounted, reactive, ref} from 'vue';
|
||||
import {getDispensaryList, getPharmacyList, getStockTakeList, saveOrgDeviceSummary,} from './components/api.js';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
const { warehous_type } = proxy.useDict('warehous_type');
|
||||
const dataList = ref([]);
|
||||
const queryParams = reactive({
|
||||
name: undefined,
|
||||
purposeTypeEnum: undefined,
|
||||
sourceLocationId: undefined,
|
||||
applyTime: [],
|
||||
applyTimeSTime: undefined,
|
||||
applyTimeETime: undefined,
|
||||
});
|
||||
const loading = ref(false);
|
||||
const rules = ref({});
|
||||
// 获取列表
|
||||
const getList = () => {
|
||||
loading.value = true;
|
||||
const params = {
|
||||
...queryParams,
|
||||
pageNo: queryParams.pageNo || 1,
|
||||
pageSize: queryParams.pageSize || 10,
|
||||
applyTime: undefined,
|
||||
applyTimeSTime: queryParams.applyTime[0] ? `${queryParams.applyTime[0]} 00:00:00` : undefined,
|
||||
applyTimeETime: queryParams.applyTime[1] ? `${queryParams.applyTime[1]} 23:59:59` : undefined,
|
||||
};
|
||||
getStockTakeList(params).then((res) => {
|
||||
loading.value = false;
|
||||
dataList.value = res.data;
|
||||
});
|
||||
};
|
||||
// 搜索
|
||||
const handleQuery = () => {
|
||||
getList();
|
||||
};
|
||||
|
||||
// 重置
|
||||
const resetQuery = () => {
|
||||
Object.assign(queryParams, {
|
||||
name: undefined,
|
||||
purposeTypeEnum: undefined,
|
||||
sourceLocationId: undefined,
|
||||
applyTime: [],
|
||||
});
|
||||
handleQuery();
|
||||
};
|
||||
|
||||
const ids = ref([]);
|
||||
const single = ref(true);
|
||||
const multiple = ref(true);
|
||||
// 多选
|
||||
const handleSelectionChange = (selection) => {
|
||||
ids.value = selection.map((item) => item);
|
||||
single.value = selection.length != 1;
|
||||
multiple.value = !selection.length;
|
||||
};
|
||||
|
||||
const toNumber = (value) => {
|
||||
if (value === '' || value === null || value === undefined) return null;
|
||||
const num = Number(value);
|
||||
return Number.isNaN(num) ? null : num;
|
||||
};
|
||||
const formatQuantityWithUnit = (quantity, unitText) => {
|
||||
const num = toNumber(quantity);
|
||||
if (num === null) return '';
|
||||
return unitText ? `${num} ${unitText}` : `${num}`;
|
||||
};
|
||||
const calcProfitLoss = (row) => {
|
||||
const stockTakeQuantity = toNumber(row.stockTakeQuantity);
|
||||
const dispenseQuantity = toNumber(row.dispenseQuantity);
|
||||
if (stockTakeQuantity === null || dispenseQuantity === null) return '';
|
||||
const profitLoss = stockTakeQuantity - dispenseQuantity;
|
||||
return `${profitLoss} ${row.minUnitCode_dictText ?? ''}`;
|
||||
};
|
||||
|
||||
const buildSummaryPayload = (rows) =>
|
||||
rows.map((item) => ({
|
||||
id: item.id,
|
||||
stockTakeQuantity: Number(item.stockTakeQuantity),
|
||||
useUnitCode: item.minUnitCode,
|
||||
...item,
|
||||
}));
|
||||
|
||||
// 保存(单条/批量)
|
||||
const handleSave = (row) => {
|
||||
const targetRows = row ? [row] : ids.value;
|
||||
|
||||
if (!targetRows.length) {
|
||||
proxy.$modal.msgWarning('请选择需要保存的数据');
|
||||
return;
|
||||
}
|
||||
|
||||
const invalidRow = targetRows.find(
|
||||
(item) =>
|
||||
item.stockTakeQuantity === '' ||
|
||||
item.stockTakeQuantity === null ||
|
||||
item.stockTakeQuantity === undefined
|
||||
);
|
||||
if (invalidRow) {
|
||||
proxy.$modal.msgWarning('实盘数量不能为空');
|
||||
return;
|
||||
}
|
||||
|
||||
const payload = buildSummaryPayload(targetRows);
|
||||
proxy.$modal
|
||||
.confirm('确定保存吗?', '保存', {
|
||||
confirmButtonText: '保存',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => {
|
||||
saveOrgDeviceSummary(payload).then(() => {
|
||||
proxy.$modal.msgSuccess('保存成功');
|
||||
getList();
|
||||
});
|
||||
})
|
||||
.catch(() => {});
|
||||
};
|
||||
const purposeTypeListOptions = ref([]);
|
||||
// 仓库类型切换
|
||||
const handleChangePurposeTypeEnum = (val) => {
|
||||
// 药房
|
||||
if (val == '16') {
|
||||
getPharmacyList().then((res) => {
|
||||
purposeTypeListOptions.value = res.data;
|
||||
});
|
||||
} else if (val == '11') {
|
||||
getDispensaryList().then((res) => {
|
||||
purposeTypeListOptions.value = res.data;
|
||||
});
|
||||
}
|
||||
getList();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
getList();
|
||||
});
|
||||
</script>
|
||||
@@ -1,106 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="300"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from "./api";
|
||||
import {watch} from "vue";
|
||||
import {throttle} from "lodash-es";
|
||||
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["selectRow"]);
|
||||
const queryParams = ref({
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
itemType: props.itemType,
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
queryParams.value.searchKey = newValue.searchKey;
|
||||
queryParams.value.itemType = newValue.itemType;
|
||||
throttledGetList();
|
||||
},
|
||||
{ immdiate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
emit("selectRow", row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
@@ -1,479 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="90px"
|
||||
>
|
||||
<el-form-item
|
||||
label="单据号:"
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="单据号:"
|
||||
clearable
|
||||
style="width: 220px"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="审批状态:"
|
||||
prop="statusEnum"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="supplyStatus in supplyStatusOptions"
|
||||
:key="supplyStatus.value"
|
||||
:label="supplyStatus.label"
|
||||
:value="supplyStatus.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="制单人:"
|
||||
prop="applicantId"
|
||||
label-width="120px"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.applicantId"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="practitioner in applicantListOptions"
|
||||
:key="practitioner.value"
|
||||
:label="practitioner.label"
|
||||
:value="practitioner.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="制单日期:">
|
||||
<el-date-picker
|
||||
v-model="occurrenceTime"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
>
|
||||
<!-- 添加记录 -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="openAddStockPart"
|
||||
>
|
||||
新增盘点单
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:add']" -->
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="openAddStockBatch"
|
||||
>
|
||||
新增批量盘点单
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:add']" -->
|
||||
</el-col>
|
||||
<!-- 查询 -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Search"
|
||||
@click="handleQuery"
|
||||
>
|
||||
查询
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:import']" -->
|
||||
</el-col>
|
||||
<!-- 重置 -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="CircleClose"
|
||||
@click="handleClear"
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:export']" -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="stockinventoryList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="50"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
key="supplyBusNo"
|
||||
label="单据号"
|
||||
align="center"
|
||||
prop="supplyBusNo"
|
||||
width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="typeEnum_enumText"
|
||||
label="单据类型"
|
||||
align="center"
|
||||
prop="typeEnum_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="statusEnum_enumText"
|
||||
label="审批状态"
|
||||
align="center"
|
||||
prop="statusEnum_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="purposeLocationId_dictText"
|
||||
label="盘点仓库"
|
||||
align="center"
|
||||
prop="purposeLocationId_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="breakevenPrice"
|
||||
label="盈亏金额"
|
||||
align="center"
|
||||
prop="breakevenPrice"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="applicantId_dictText"
|
||||
label="制单人"
|
||||
align="center"
|
||||
prop="applicantId_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="approverId_dictText"
|
||||
label="审核人"
|
||||
align="center"
|
||||
prop="approverId_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="createTime"
|
||||
label="制单日期"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
width="180"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
key="approvalTime"
|
||||
label="审核日期 "
|
||||
align="center"
|
||||
prop="approvalTime"
|
||||
width="180"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.approvalTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column
|
||||
label="备注"
|
||||
align="center"
|
||||
key="remake"
|
||||
prop="remake"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
width="230"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
@click="
|
||||
() => {
|
||||
proxy.$refs['detailsDialogRef'].open(scope.row.supplyBusNo);
|
||||
}
|
||||
"
|
||||
>
|
||||
详情
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
icon="Edit"
|
||||
:disabled="
|
||||
scope.row.statusEnum != '1' &&
|
||||
scope.row.statusEnum != '9' &&
|
||||
scope.row.statusEnum != '4'
|
||||
"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<!-- :disabled="scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'" -->
|
||||
<!-- v-hasPermi="['system:user:edit']" -->
|
||||
<el-button
|
||||
v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'"
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
@click="handleSubmitApproval(scope.row)"
|
||||
>
|
||||
提交审批
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:remove']" -->
|
||||
<el-button
|
||||
v-if="scope.row.statusEnum == '2'"
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
@click="handleWithdrawApproval(scope.row)"
|
||||
>
|
||||
撤销审批
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:remove']" -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<ChkstockDetailsDialog ref="detailsDialogRef" />
|
||||
<!-- <stock-receipt-dialog
|
||||
ref="stockReceiptRef"
|
||||
:cabinetListOptions="cabinetListOptions"
|
||||
:categoryListOptions ="categoryListOptions"
|
||||
:profitReasonOptions = "profitReasonOptions"
|
||||
:busNoAdd="busNoAdd"
|
||||
:item="currentData"
|
||||
:editRow="editRow"
|
||||
@refresh="getList"
|
||||
/> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="ChkstockRecord">
|
||||
// 导入onActivated钩子
|
||||
import {onActivated, onMounted} from 'vue';
|
||||
import {getInit, getStockinventoryList, submitApproval, withdrawApproval,} from '../components/api';
|
||||
import ChkstockDetailsDialog from '../components/chkstockDetailsDialog.vue';
|
||||
// import stockReceiptDialog from "./components/stockReceiptDialog";
|
||||
|
||||
const router = useRouter();
|
||||
const { proxy } = getCurrentInstance();
|
||||
const stockinventoryList = 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 occurrenceTime = ref([]);
|
||||
const busNoAdd = ref(''); // 单据号新增
|
||||
const applicantListOptions = ref(undefined); // 制单人列表
|
||||
const cabinetListOptions = ref(undefined); // 仓库列表
|
||||
const categoryListOptions = ref(undefined); // 药品类型
|
||||
const pharmacyListOptions = ref(undefined); // 药房列表
|
||||
const supplyStatusOptions = ref(undefined); // 审批状态
|
||||
const profitReasonOptions = ref(undefined); // 盈亏原因
|
||||
const editRow = ref({});
|
||||
// 使用 ref 定义当前编辑的采购
|
||||
const currentData = ref({});
|
||||
// 是否停用
|
||||
const statusFlagOptions = ref(undefined);
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
supplyBusNo: undefined, // 编码
|
||||
statusEnum: undefined, // 审批状态
|
||||
applicantId: undefined, // 制单人
|
||||
createTimeSTime: undefined,
|
||||
createTimeETime: undefined,
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
searchKey: undefined, // 供应商名称
|
||||
},
|
||||
rules: {},
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
/** 列表页查询下拉树结构 */
|
||||
function getStockinventoryTypeList() {
|
||||
getInit().then((response) => {
|
||||
console.log('列表页下拉树response1111111', response);
|
||||
busNoAdd.value = response.data.busNo; // 单据号新增
|
||||
applicantListOptions.value = response.data.applicantListOptions; // 制单人列表
|
||||
|
||||
cabinetListOptions.value = response.data.cabinetListOptions; // 仓库列表
|
||||
categoryListOptions.value = response.data.categoryListOptions; // 药品类型列表
|
||||
pharmacyListOptions.value = response.data.pharmacyListOptions; // 药房列表
|
||||
profitReasonOptions.value = response.data.profitReasonOptions; // 盈亏类型列表
|
||||
|
||||
supplyStatusOptions.value = response.data.supplyStatusOptions; // 审批状态
|
||||
});
|
||||
}
|
||||
/** 详情页查询下拉树结构 */
|
||||
|
||||
/** 查询盘点列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
getStockinventoryList(queryParams.value).then((res) => {
|
||||
console.log('查询盘点列表response1111111', res);
|
||||
loading.value = false;
|
||||
stockinventoryList.value = res.data.records;
|
||||
total.value = res.data.total;
|
||||
});
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.createTimeSTime =
|
||||
occurrenceTime.value && occurrenceTime.value.length == 2
|
||||
? occurrenceTime.value[0] + ' 00:00:00'
|
||||
: '';
|
||||
queryParams.value.createTimeETime =
|
||||
occurrenceTime.value && occurrenceTime.value.length == 2
|
||||
? occurrenceTime.value[1] + ' 23:59:59'
|
||||
: '';
|
||||
queryParams.value.pageNo = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
/** 清空条件按钮操作 */
|
||||
function handleClear() {
|
||||
// 清空查询条件
|
||||
queryParams.value.createTimeSTime = '';
|
||||
queryParams.value.createTimeETime = '';
|
||||
occurrenceTime.value = '';
|
||||
proxy.resetForm('queryRef');
|
||||
getList();
|
||||
}
|
||||
|
||||
/** 选择条数 */
|
||||
function handleSelectionChange(selection) {
|
||||
ids.value = selection.map((item) => item.id);
|
||||
single.value = selection.length != 1;
|
||||
multiple.value = !selection.length;
|
||||
}
|
||||
|
||||
/** 打开商品盘点 */
|
||||
function openAddStockPart() {
|
||||
// nextTick(() => {
|
||||
// proxy.$refs["stockReceiptRef"].show();
|
||||
// });
|
||||
|
||||
router.push({ path: '/medicationmanagement/chkstock/chkstockPart' });
|
||||
}
|
||||
/** 打开批量商品盘点 */
|
||||
function openAddStockBatch() {
|
||||
// nextTick(() => {
|
||||
// proxy.$refs["stockReceiptRef"].show();
|
||||
// });
|
||||
router.push({ path: '/medicationmanagement/chkstock/chkstockBatch' });
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row, view) {
|
||||
editRow.value = row;
|
||||
if (row.typeEnum == 4) {
|
||||
// 盘点
|
||||
router.push({
|
||||
path: '/medicationmanagement/chkstock/chkstockPart',
|
||||
query: { supplyBusNo: editRow.value.supplyBusNo, isEdit: true },
|
||||
});
|
||||
} else {
|
||||
if (view) {
|
||||
router.replace({
|
||||
path: '/medicationmanagement/chkstock/chkstockBatch',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else {
|
||||
router.push({
|
||||
path: '/medicationmanagement/chkstock/chkstockBatch',
|
||||
query: { supplyBusNo: editRow.value.supplyBusNo },
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
/** 提交审核按钮 */
|
||||
function handleSubmitApproval(row) {
|
||||
submitApproval(row.supplyBusNo).then((response) => {
|
||||
proxy.$modal.msgSuccess('提交审批成功');
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
|
||||
/** 撤回审批按钮 */
|
||||
function handleWithdrawApproval(row) {
|
||||
withdrawApproval(row.supplyBusNo).then((response) => {
|
||||
proxy.$modal.msgSuccess('撤销审批成功');
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getStockinventoryTypeList();
|
||||
getList();
|
||||
});
|
||||
|
||||
// 添加组件被激活时的处理逻辑
|
||||
onActivated(() => {
|
||||
// 重新加载数据
|
||||
getList();
|
||||
});
|
||||
</script>
|
||||
<style scoped>
|
||||
.custom-tree-node {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-weight: bold;
|
||||
font-size: large;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,338 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
v-loading="loading"
|
||||
title="盘点单明细"
|
||||
width="90%"
|
||||
:destroy-on-close="true"
|
||||
@close="close"
|
||||
>
|
||||
<el-row style="margin-bottom: 20px">
|
||||
<template v-if="props.isApply">
|
||||
<el-button
|
||||
plain
|
||||
type="primary"
|
||||
icon="Edit"
|
||||
@click="handelApply"
|
||||
>
|
||||
审批通过
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Edit"
|
||||
@click="handleReject"
|
||||
>
|
||||
驳回
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="Printer"
|
||||
@click="handlePrint"
|
||||
>
|
||||
打印单据
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
>
|
||||
导出
|
||||
</el-button>
|
||||
</el-row>
|
||||
<el-descriptions
|
||||
:column="4"
|
||||
style="margin-bottom: 10px"
|
||||
>
|
||||
<el-descriptions-item label="单据号:">
|
||||
{{ detailsList[0]?.busNo || '-' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="盘点仓库:">
|
||||
{{ detailsList[0]?.purposeLocationName || '-' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="项目类型:">
|
||||
{{ detailsList[0]?.itemType_dictText || '-' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="盘点日期:">
|
||||
{{ proxy.formatDateStr(detailsList[0]?.occurrenceTime, 'YYYY-MM-DD HH:mm:ss') || '-' }}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-table
|
||||
:data="detailsList"
|
||||
border
|
||||
max-height="600"
|
||||
>
|
||||
<el-table-column
|
||||
label="序号"
|
||||
width="60"
|
||||
type="index"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="itemName"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="totalVolume"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="厂家/产地"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
width="180"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="产品批号"
|
||||
align="center"
|
||||
prop="lotNumber"
|
||||
/>
|
||||
<el-table-column
|
||||
label="单价"
|
||||
align="right"
|
||||
header-align="center"
|
||||
prop="price"
|
||||
width="120"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.price.toFixed(2) + ' 元' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="盘点单位"
|
||||
align="center"
|
||||
prop="measurementUnitCode_dictText"
|
||||
width="80"
|
||||
/>
|
||||
<el-table-column
|
||||
label="盘前库存"
|
||||
align="right"
|
||||
header-align="center"
|
||||
prop="itemName"
|
||||
width="100"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
formatQuantity(
|
||||
Number(scope.row.totalQuantity) - Number(scope.row.itemQuantity),
|
||||
scope.row
|
||||
)
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实盘数量"
|
||||
align="right"
|
||||
header-align="center"
|
||||
prop="totalQuantity"
|
||||
width="100"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatQuantity(scope.row.totalQuantity, scope.row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实盘金额"
|
||||
align="right"
|
||||
header-align="center"
|
||||
prop="totalPrice"
|
||||
width="120"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.totalPrice.toFixed(2) + ' 元' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="盈亏数量"
|
||||
align="right"
|
||||
header-align="center"
|
||||
prop="itemQuantity"
|
||||
width="100"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatQuantity(scope.row.itemQuantity, scope.row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="盈亏金额"
|
||||
align="right"
|
||||
header-align="center"
|
||||
prop=""
|
||||
>
|
||||
<template #default="scope">
|
||||
{{
|
||||
((scope.row.itemQuantity * scope.row.price) / scope.row.partPercent).toFixed(2) + '元'
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="盈亏类型"
|
||||
align="center"
|
||||
prop="reasonCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="盈亏原因"
|
||||
align="center"
|
||||
prop="reason"
|
||||
/>
|
||||
</el-table>
|
||||
<div>
|
||||
<span>合计盈亏金额:{{ totalAmount ? totalAmount.toFixed(4) : 0 }}</span>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">
|
||||
关 闭
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getCurrentInstance} from 'vue';
|
||||
import {getstocktakingDetail, productStocktakingApproved, reject} from './api';
|
||||
import templateJson from '@/views/medicationmanagement/chkstock/chkstockPart/components/template.json';
|
||||
import {hiprint} from 'vue-plugin-hiprint';
|
||||
import useUserStore from '@/store/modules/user';
|
||||
|
||||
const detailsList = ref([]);
|
||||
const dialogVisible = ref(false);
|
||||
const loading = ref(false);
|
||||
const totalAmount = ref(0);
|
||||
const supplyBusNo = ref('');
|
||||
const userStore = useUserStore();
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
const props = defineProps({
|
||||
isApply: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
function open(busNo) {
|
||||
dialogVisible.value = true;
|
||||
supplyBusNo.value = busNo;
|
||||
getstocktakingDetail({ busNo: busNo, pageSize: 1000, pageNo: 1 }).then((res) => {
|
||||
detailsList.value = res.data.records;
|
||||
totalAmount.value = res.data.records.reduce((accumulator, currentRow) => {
|
||||
return accumulator + (Number(((currentRow.itemQuantity * currentRow.price) / currentRow.partPercent).toFixed(2)) || 0);
|
||||
}, 0);
|
||||
});
|
||||
}
|
||||
|
||||
function formatQuantity(quantity, row) {
|
||||
if (row.measurementUnitCode == row.unitCode) {
|
||||
return formatInventory(
|
||||
quantity,
|
||||
row.partPercent,
|
||||
row.unitCode_dictText,
|
||||
row.minUnitCode_dictText
|
||||
);
|
||||
} else {
|
||||
return quantity + row.minUnitCode_dictText;
|
||||
}
|
||||
}
|
||||
|
||||
function handelApply() {
|
||||
loading.value = true;
|
||||
productStocktakingApproved(supplyBusNo.value).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
loading.value = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function handleReject() {
|
||||
reject(supplyBusNo.value).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化库存数量显示(大单位情况)
|
||||
* @param quantity 小单位库存数量
|
||||
* @param partPercent 拆零比
|
||||
* @param unitCode 大单位
|
||||
* @param minUnitCode 小单位
|
||||
*/
|
||||
function formatInventory(quantity, partPercent, unitCode, minUnitCode) {
|
||||
// 处理负数情况
|
||||
const isNegative = quantity < 0;
|
||||
const absQuantity = Math.abs(quantity);
|
||||
|
||||
if (absQuantity % partPercent !== 0) {
|
||||
const integerPart = Math.floor(absQuantity / partPercent);
|
||||
const decimalPart = absQuantity % partPercent;
|
||||
|
||||
let result = integerPart.toString() + ' ' + unitCode;
|
||||
if (decimalPart > 0) {
|
||||
result += decimalPart.toString() + ' ' + minUnitCode;
|
||||
}
|
||||
|
||||
return isNegative ? '-' + result : result;
|
||||
}
|
||||
|
||||
// 整除情况
|
||||
const result = absQuantity / partPercent + ' ' + unitCode;
|
||||
return isNegative ? '-' + result : result;
|
||||
}
|
||||
|
||||
// 打印盘点单
|
||||
function handlePrint() {
|
||||
const result = [];
|
||||
const printList = detailsList.value.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
name: item.itemName,
|
||||
volume: item.totalVolume,
|
||||
price: Number(item.price).toFixed(2),
|
||||
itemQuantity: formatQuantity(item.itemQuantity, item),
|
||||
profitAmount: ((item.itemQuantity * item.price) / item.partPercent).toFixed(2),
|
||||
};
|
||||
});
|
||||
result.push({
|
||||
purposeLocationName: printList[0].purposeLocationName,
|
||||
name: userStore.name,
|
||||
// totalAmount: totalAmount.value.toFixed(2),
|
||||
occurrenceTime: proxy.formatDateStr(printList[0].occurrenceTime, 'YYYY-MM-DD HH:mm:ss'),
|
||||
busNo: printList[0].busNo,
|
||||
purposeLocationName: printList[0].purposeLocationName,
|
||||
purchaseinventoryList: printList,
|
||||
});
|
||||
const printElements = JSON.parse(
|
||||
JSON.stringify(templateJson).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
|
||||
);
|
||||
var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
|
||||
hiprintTemplate.print2(result, {
|
||||
// printer: 'EPSON LQ-80KFII',
|
||||
title: '打印标题',
|
||||
}); //开始打印
|
||||
}
|
||||
// 导出
|
||||
function handleExport() {
|
||||
proxy.downloadGet(
|
||||
'/inventory-manage/stocktaking/excel-out',
|
||||
{
|
||||
busNo: supplyBusNo.value,
|
||||
},
|
||||
`盘点单明细_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
|
||||
);
|
||||
}
|
||||
defineExpose({
|
||||
open,
|
||||
});
|
||||
</script>
|
||||
@@ -1,143 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="产品批号"
|
||||
align="center"
|
||||
prop="lotNumber"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="编码"
|
||||
align="center"
|
||||
prop="ybNo"
|
||||
/>
|
||||
</el-table>
|
||||
<!-- <pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from "./api";
|
||||
import {ref, watch} from "vue";
|
||||
import {throttle} from "lodash-es";
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const total = ref(0)
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
purposeLocationId:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
|
||||
});
|
||||
const emit = defineEmits(["selectRow"]);
|
||||
const queryParams = ref({
|
||||
// pageNum: 1,
|
||||
// pageSize: 50,
|
||||
itemType: props.itemType,
|
||||
orgLocationId:props.purposeLocationId,
|
||||
purchaseFlag:0
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
queryParams.value.searchKey = newValue.searchKey;
|
||||
queryParams.value.itemType = newValue.itemType;
|
||||
queryParams.value.orgLocationId=newValue.purposeLocationId;
|
||||
queryParams.value.purchaseFlag = 0
|
||||
throttledGetList();
|
||||
},
|
||||
{ immdiate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
console.log(queryParams.value,"queryParams.value")
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data.records?res.data.records:res.data
|
||||
total.value = res.data.total?res.data.total:medicineList.value.length
|
||||
console.log(medicineList.value,"medicineList.value ")
|
||||
});
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
emit("selectRow", row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
@@ -1,502 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="90px"
|
||||
>
|
||||
<el-form-item label="查询日期:">
|
||||
<el-date-picker
|
||||
v-model="queryTime"
|
||||
type="daterange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 300px; margin-right: 20px"
|
||||
value-format="YYYY-MM-DD"
|
||||
@change="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="结算类型:">
|
||||
<el-select
|
||||
v-model="queryParams.settlementType"
|
||||
placeholder="结算类型"
|
||||
clearable
|
||||
style="width: 150px; margin-right: 30px"
|
||||
>
|
||||
<el-option
|
||||
label="日结"
|
||||
value="daily"
|
||||
/>
|
||||
<el-option
|
||||
label="周结"
|
||||
value="weekly"
|
||||
/>
|
||||
<el-option
|
||||
label="月结"
|
||||
value="monthly"
|
||||
/>
|
||||
</el-select>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Search"
|
||||
@click="handleQuery"
|
||||
>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Printer"
|
||||
@click="handlePrint"
|
||||
>
|
||||
打印
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:add']"
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="handleAdd"
|
||||
>
|
||||
新增
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:edit']"
|
||||
type="success"
|
||||
plain
|
||||
icon="Edit"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
>
|
||||
修改
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:remove']"
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:export']"
|
||||
type="warning"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
>
|
||||
导出
|
||||
</el-button>
|
||||
</el-col>
|
||||
<right-toolbar
|
||||
v-model:show-search="showSearch"
|
||||
@query-table="getList"
|
||||
/>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="dayEndSettlementList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
label="结算单号"
|
||||
align="center"
|
||||
prop="settlementNo"
|
||||
/>
|
||||
<el-table-column
|
||||
label="结算日期"
|
||||
align="center"
|
||||
prop="settlementDate"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.settlementDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="结算类型"
|
||||
align="center"
|
||||
prop="settlementType"
|
||||
/>
|
||||
<el-table-column
|
||||
label="结算状态"
|
||||
align="center"
|
||||
prop="status"
|
||||
>
|
||||
<template #default="scope">
|
||||
<dict-tag
|
||||
:options="sys_normal_disable"
|
||||
:value="scope.row.status"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="总金额"
|
||||
align="center"
|
||||
prop="totalAmount"
|
||||
/>
|
||||
<el-table-column
|
||||
label="操作人"
|
||||
align="center"
|
||||
prop="operator"
|
||||
/>
|
||||
<el-table-column
|
||||
label="操作时间"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:query']"
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
@click="handleView(scope.row)"
|
||||
>
|
||||
查看
|
||||
</el-button>
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:edit']"
|
||||
link
|
||||
type="primary"
|
||||
icon="Edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>
|
||||
修改
|
||||
</el-button>
|
||||
<el-button
|
||||
v-hasPermi="['medication:dayEndSettlement:remove']"
|
||||
link
|
||||
type="primary"
|
||||
icon="Delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@size-change="getList"
|
||||
@current-change="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改日结结算单对话框 -->
|
||||
<el-dialog
|
||||
v-model="open"
|
||||
:title="title"
|
||||
width="500px"
|
||||
append-to-body
|
||||
>
|
||||
<el-form
|
||||
ref="dayEndSettlementRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item
|
||||
label="结算单号"
|
||||
prop="settlementNo"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.settlementNo"
|
||||
placeholder="请输入结算单号"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="结算日期"
|
||||
prop="settlementDate"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="form.settlementDate"
|
||||
clearable
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="请选择结算日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="结算类型"
|
||||
prop="settlementType"
|
||||
>
|
||||
<el-select
|
||||
v-model="form.settlementType"
|
||||
placeholder="请选择结算类型"
|
||||
>
|
||||
<el-option
|
||||
label="日结"
|
||||
value="daily"
|
||||
/>
|
||||
<el-option
|
||||
label="周结"
|
||||
value="weekly"
|
||||
/>
|
||||
<el-option
|
||||
label="月结"
|
||||
value="monthly"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="结算状态"
|
||||
prop="status"
|
||||
>
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio
|
||||
v-for="dict in sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>
|
||||
{{ dict.label }}
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="总金额"
|
||||
prop="totalAmount"
|
||||
>
|
||||
<el-input-number
|
||||
v-model="form.totalAmount"
|
||||
placeholder="请输入总金额"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="备注"
|
||||
prop="remark"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
placeholder="请输入内容"
|
||||
/>
|
||||
</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="DayEndSettlement">
|
||||
import { listDayEndSettlement, getDayEndSettlement, delDayEndSettlement, addDayEndSettlement, updateDayEndSettlement } from "@/api/medicationmanagement/dayEndSettlement";
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
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 open = ref(false);
|
||||
const queryTime = ref([]);
|
||||
|
||||
const dayEndSettlementList = ref([]);
|
||||
const queryFormRef = ref();
|
||||
const dayEndSettlementRef = ref();
|
||||
|
||||
const queryParams = ref({
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
settlementNo: null,
|
||||
settlementDate: null,
|
||||
settlementType: null,
|
||||
status: null
|
||||
});
|
||||
|
||||
const form = ref({});
|
||||
const rules = ref({
|
||||
settlementNo: [
|
||||
{ required: true, message: "结算单号不能为空", trigger: "blur" }
|
||||
],
|
||||
settlementDate: [
|
||||
{ required: true, message: "结算日期不能为空", trigger: "blur" }
|
||||
],
|
||||
settlementType: [
|
||||
{ required: true, message: "结算类型不能为空", trigger: "change" }
|
||||
],
|
||||
totalAmount: [
|
||||
{ required: true, message: "总金额不能为空", trigger: "blur" }
|
||||
]
|
||||
});
|
||||
|
||||
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
|
||||
|
||||
/** 查询日结结算单列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true;
|
||||
try {
|
||||
const response = await listDayEndSettlement(queryParams.value);
|
||||
dayEndSettlementList.value = response.rows;
|
||||
total.value = response.total;
|
||||
} catch (error) {
|
||||
console.error('获取日结结算单列表失败:', error);
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
/** 取消按钮 */
|
||||
const cancel = () => {
|
||||
open.value = false;
|
||||
reset();
|
||||
};
|
||||
|
||||
/** 表单重置 */
|
||||
const reset = () => {
|
||||
form.value = {
|
||||
id: null,
|
||||
settlementNo: null,
|
||||
settlementDate: null,
|
||||
settlementType: null,
|
||||
status: "0",
|
||||
totalAmount: null,
|
||||
remark: null
|
||||
};
|
||||
proxy.resetForm("dayEndSettlementRef");
|
||||
};
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.value.pageNum = 1;
|
||||
getList();
|
||||
};
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryTime.value = [];
|
||||
proxy.resetForm("queryRef");
|
||||
handleQuery();
|
||||
};
|
||||
|
||||
/** 多择框多选 */
|
||||
const handleSelectionChange = (selection) => {
|
||||
ids.value = selection.map(item => item.id);
|
||||
single.value = selection.length !== 1;
|
||||
multiple.value = !selection.length;
|
||||
};
|
||||
|
||||
/** 新增按钮操作 */
|
||||
const handleAdd = () => {
|
||||
reset();
|
||||
open.value = true;
|
||||
title.value = "添加日结结算单";
|
||||
};
|
||||
|
||||
/** 修改按钮操作 */
|
||||
const handleUpdate = (row) => {
|
||||
reset();
|
||||
const settlementId = row.id || ids.value[0];
|
||||
getDayEndSettlement(settlementId).then(response => {
|
||||
form.value = response.data;
|
||||
open.value = true;
|
||||
title.value = "修改日结结算单";
|
||||
});
|
||||
};
|
||||
|
||||
/** 提交按钮 */
|
||||
const submitForm = () => {
|
||||
proxy.$refs["dayEndSettlementRef"].validate(valid => {
|
||||
if (valid) {
|
||||
if (form.value.id != null) {
|
||||
updateDayEndSettlement(form.value).then(response => {
|
||||
proxy.$modal.msgSuccess("修改成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
} else {
|
||||
addDayEndSettlement(form.value).then(response => {
|
||||
proxy.$modal.msgSuccess("新增成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = (row) => {
|
||||
const settlementIds = row.id || ids.value;
|
||||
proxy.$modal.confirm('是否确认删除日结结算单编号为"' + settlementIds + '"的数据项?').then(function() {
|
||||
return delDayEndSettlement(settlementIds);
|
||||
}).then(() => {
|
||||
getList();
|
||||
proxy.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
};
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = () => {
|
||||
proxy.download("medication/dayEndSettlement/export", {
|
||||
...queryParams.value
|
||||
}, `dayEndSettlement_${new Date().getTime()}.xlsx`);
|
||||
};
|
||||
|
||||
/** 打印按钮操作 */
|
||||
const handlePrint = () => {
|
||||
// TODO: 实现打印功能
|
||||
proxy.$modal.msgSuccess("打印功能待实现");
|
||||
};
|
||||
|
||||
/** 查看按钮操作 */
|
||||
const handleView = (row) => {
|
||||
// TODO: 实现查看功能
|
||||
proxy.$modal.msgSuccess("查看功能待实现");
|
||||
};
|
||||
|
||||
/** 初始化数据 */
|
||||
getList();
|
||||
</script>
|
||||
@@ -1,144 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="产品批号"
|
||||
align="center"
|
||||
prop="lotNumber"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="编码"
|
||||
align="center"
|
||||
prop="ybNo"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from "../../lossReporting";
|
||||
import {watch} from "vue";
|
||||
import {throttle} from "lodash-es";
|
||||
|
||||
const route = useRoute();
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
lossLocationId:{
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["selectRow"]);
|
||||
const queryParams = ref({
|
||||
// pageNum: 1,
|
||||
// pageSize: 50,
|
||||
itemType: props.itemType,
|
||||
orgLocationId:props.lossLocationId,
|
||||
purchaseFlag:0
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
console.log(newValue,"newValue")
|
||||
console.log(newValue,"newValue")
|
||||
queryParams.value.searchKey = newValue.searchKey;
|
||||
queryParams.value.itemType = newValue.itemType;
|
||||
queryParams.value.orgLocationId=newValue.lossLocationId;
|
||||
queryParams.value.purchaseFlag = 0
|
||||
throttledGetList();
|
||||
},
|
||||
{ immdiate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
console.log(queryParams.value,"queryParams.value")
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
console.log(row,"row--------------------")
|
||||
emit("selectRow", row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
:deep( .hover_row){
|
||||
width: 100vw!important;
|
||||
}
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,531 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="90px"
|
||||
>
|
||||
<!-- supplyBusNo searchKey-->
|
||||
<el-form-item
|
||||
label="单据号:"
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="单据号:"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item
|
||||
label="审批状态:"
|
||||
prop="statusEnum"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="supplyStatus in supplyStatusOptions"
|
||||
:key="supplyStatus.value"
|
||||
:label="supplyStatus.label"
|
||||
:value="supplyStatus.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="制单人:"
|
||||
prop="applicantId"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.applicantId"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 150px"
|
||||
:disabled="data.isEdit"
|
||||
>
|
||||
<el-option
|
||||
v-for="practitioner in practitionerListOptions"
|
||||
:key="practitioner.value"
|
||||
:label="practitioner.label"
|
||||
:value="practitioner.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="制单日期:">
|
||||
<el-date-picker
|
||||
v-model="occurrenceTime"
|
||||
type="daterange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: auto"
|
||||
value-format="YYYY-MM-DD"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="单据类型:" prop="typeEnum" label-width="100px">
|
||||
<el-select
|
||||
v-model="queryParams.typeEnum"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="supplyStatus in supplyTypeOptions"
|
||||
:key="supplyStatus.value"
|
||||
:label="supplyStatus.label"
|
||||
:value="supplyStatus.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
>
|
||||
<!-- 添加记录 -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="openAddaddTransferProductDialog"
|
||||
>
|
||||
新增报损单
|
||||
</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="openAddaddTransferProducts"
|
||||
v-hasPermi="['system:user:add']"
|
||||
>新增批量调拨单</el-button
|
||||
>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Search"
|
||||
@click="handleQuery"
|
||||
>
|
||||
查询
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="CircleClose"
|
||||
@click="handleClear"
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="purchaseinventoryList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="50"
|
||||
align="center"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
label="药品名称"
|
||||
align="center"
|
||||
key="name"
|
||||
prop="name"
|
||||
:show-overflow-tooltip="true"
|
||||
width="110"
|
||||
/> -->
|
||||
<el-table-column
|
||||
key="supplyBusNo"
|
||||
label="单据号"
|
||||
align="center"
|
||||
prop="supplyBusNo"
|
||||
width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- itemTable -->
|
||||
<el-table-column
|
||||
key="type_enumText"
|
||||
label="单据类型"
|
||||
align="center"
|
||||
prop="type_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="statusEnum_enumText"
|
||||
label="审批状态"
|
||||
align="center"
|
||||
prop="statusEnum_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
label="状态"
|
||||
align="center"
|
||||
key="type_enumText"
|
||||
prop="type_enumText"
|
||||
/> -->
|
||||
<!-- <el-table-column
|
||||
label="当前机构"
|
||||
align="center"
|
||||
key="sourceLocationName"
|
||||
prop="sourceLocationName"
|
||||
:show-overflow-tooltip="true"
|
||||
/> -->
|
||||
<el-table-column
|
||||
key="inventoryLocationName"
|
||||
label="盘点仓库"
|
||||
align="center"
|
||||
prop="inventoryLocationName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="reportedLossAmount"
|
||||
label="报损金额"
|
||||
align="center"
|
||||
prop="reportedLossAmount"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="applicantId_dictText"
|
||||
label="制单人"
|
||||
align="center"
|
||||
prop="applicantId_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="approverId_dictText"
|
||||
label="审核人"
|
||||
align="center"
|
||||
prop="approverId_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="createTime"
|
||||
label="制单日期"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
width="160"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
key="approvalTime"
|
||||
label="审核日期 "
|
||||
align="center"
|
||||
prop="approvalTime"
|
||||
width="160"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.approvalTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column
|
||||
label="备注"
|
||||
align="center"
|
||||
key="purposeLocationNam"
|
||||
prop="purposeLocationNam"
|
||||
:show-overflow-tooltip="true"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
width="230"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
@click="handleUpdate(scope.row,'view')"
|
||||
>
|
||||
详情
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
icon="Edit"
|
||||
:disabled="
|
||||
scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
|
||||
"
|
||||
|
||||
@click="handleUpdate(scope.row)"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'"
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
|
||||
@click="handleSubmitApproval(scope.row)"
|
||||
>
|
||||
提交审批
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:remove']" -->
|
||||
<el-button
|
||||
v-if="scope.row.statusEnum == '2'"
|
||||
link
|
||||
type="primary"
|
||||
icon="View"
|
||||
|
||||
@click="handleWithdrawApproval(scope.row)"
|
||||
>
|
||||
撤销审批
|
||||
</el-button>
|
||||
<!-- v-hasPermi="['system:user:remove']" -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<!-- <Dialog
|
||||
ref="transferProductRef"
|
||||
:supplyTypeOptions="supplyTypeOptions"
|
||||
:purposeTypeListOptions="purposeTypeListOptions"
|
||||
:sourceTypeListOptions="sourceTypeListOptions"
|
||||
:busNoAdd="busNoAdd"
|
||||
:item="currentData"
|
||||
:editRow="editRow"
|
||||
@refresh="getList"
|
||||
/> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="lossReportingList">
|
||||
import {
|
||||
addTransferProduct,
|
||||
delTransferProduct,
|
||||
getBusNoInit,
|
||||
getInit,
|
||||
getTransferProductDetail,
|
||||
getTransferProductList,
|
||||
submitApproval,
|
||||
withdrawApproval,
|
||||
} from "../lossReporting";
|
||||
|
||||
// import Dialog from "./components/Dialog";
|
||||
|
||||
const router = useRouter();
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
const {
|
||||
warehous_type,
|
||||
category_code,
|
||||
service_type_code,
|
||||
specialty_code,
|
||||
purchase_type,
|
||||
} = proxy.useDict(
|
||||
"warehous_type",
|
||||
"category_code",
|
||||
"service_type_code",
|
||||
"specialty_code",
|
||||
"purchase_type"
|
||||
);
|
||||
const purchaseinventoryRef = ref(null); // 初始化 ref
|
||||
const practitionerListOptions = ref([])
|
||||
const purchaseinventoryList = 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 occurrenceTime = ref([]);
|
||||
const busNoAdd = ref(""); // 单据号新增
|
||||
const purposeTypeListOptions = ref(undefined);
|
||||
const sourceTypeListOptions = ref(undefined)
|
||||
const supplyTypeOptions = ref(undefined);
|
||||
const sourceLocationIdListOptions = ref(undefined); // 源仓库
|
||||
const purposeLocationIdListOptions = ref(undefined); //目的仓库
|
||||
const supplyStatusOptions = ref([]);
|
||||
const editRow = ref({});
|
||||
// 使用 ref 定义当前编辑的采购
|
||||
const currentData = ref({});
|
||||
// 是否停用
|
||||
const statusFlagOptions = ref(undefined);
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
searchKey: undefined,
|
||||
// SupplyBusNo: undefined, // 单据号
|
||||
typeEnum:undefined, // 单据类型
|
||||
applicantId: undefined, //制单人
|
||||
sourceLocationId:undefined,
|
||||
purposeLocationId:undefined,
|
||||
// supplierId: undefined,
|
||||
statusEnum: undefined, // 单据状态
|
||||
createTimeSTime:undefined,
|
||||
createTimeETime:undefined,
|
||||
},
|
||||
rules: {},
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
/** 查询下拉树结构 */
|
||||
function getTransferProductTypeList() {
|
||||
getInit().then((response) => {
|
||||
console.log(response,'response',response.data)
|
||||
supplyStatusOptions.value = response.data.supplyStatusOptions
|
||||
practitionerListOptions.value = response.data.applicantListOptions
|
||||
});
|
||||
}
|
||||
function getBusNoInitList() {
|
||||
getBusNoInit().then((response) => {
|
||||
console.log(response,'response',response.data)
|
||||
busNoAdd.value = response.data.SupplyBusNo; // 单据号新增
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/** 查询调拨管理项目列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
// // queryParams.value.statusEnum = +queryParams.value.statusEnum
|
||||
// proxy.addoccurrenceTime(queryParams.value, occurrenceTime.value)
|
||||
getTransferProductList(queryParams.value).then((res) => {
|
||||
console.log(res,"res----------------")
|
||||
loading.value = false;
|
||||
purchaseinventoryList.value = res.data.records;
|
||||
total.value = res.data.total;
|
||||
});
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.createTimeSTime =
|
||||
occurrenceTime.value && occurrenceTime.value.length == 2
|
||||
? occurrenceTime.value[0] + " 00:00:00"
|
||||
: "";
|
||||
queryParams.value.createTimeETime =
|
||||
occurrenceTime.value && occurrenceTime.value.length == 2
|
||||
? occurrenceTime.value[1] + " 23:59:59"
|
||||
: "";
|
||||
queryParams.value.pageNo = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
/** 清空条件按钮操作 */
|
||||
function handleClear() {
|
||||
// 清空查询条件
|
||||
queryParams.value.createTimeSTime = ""
|
||||
queryParams.value.createTimeETime = ""
|
||||
occurrenceTime.value = ""
|
||||
proxy.resetForm("queryRef");
|
||||
getList();
|
||||
}
|
||||
|
||||
/** 选择条数 */
|
||||
function handleSelectionChange(selection) {
|
||||
ids.value = selection.map((item) => item.id);
|
||||
single.value = selection.length != 1;
|
||||
multiple.value = !selection.length;
|
||||
}
|
||||
/** 打开批量新增 */
|
||||
function openAddaddTransferProducts(){
|
||||
router.push({ path: '/medicationmanagement/lossReportingManagement/lossReporting'})
|
||||
}
|
||||
/** 打开新增 */
|
||||
function openAddaddTransferProductDialog() {
|
||||
// getTransferProductTypeList();
|
||||
// getBusNoInitList()
|
||||
// nextTick(() => {
|
||||
// proxy.$refs["transferProductRef"].show();
|
||||
// });
|
||||
const partItem = {partFlg: 'add',rowData: []}
|
||||
// item: JSON.stringify(partItem)
|
||||
// ,query:{item: JSON.stringify(partItem)}
|
||||
router.push({ path: '/medicationmanagement/lossReportingManagement/lossReportingManagement'})
|
||||
}
|
||||
|
||||
/** 修改按钮操作 */
|
||||
function handleUpdate(row,view) {
|
||||
editRow.value = row;
|
||||
if(view){ // 详情
|
||||
router.replace({ path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',query:{supplyBusNo:row.supplyBusNo,view:view}})
|
||||
}else{
|
||||
router.push({ path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',query:{supplyBusNo:editRow.value.supplyBusNo}})
|
||||
}
|
||||
}
|
||||
/** 提交审核按钮 */
|
||||
function handleSubmitApproval(row) {
|
||||
submitApproval(row.supplyBusNo).then((response) => {
|
||||
proxy.$modal.msgSuccess("提交审批成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
|
||||
/** 撤回审批按钮 */
|
||||
function handleWithdrawApproval(row) {
|
||||
withdrawApproval(row.supplyBusNo).then((response) => {
|
||||
proxy.$modal.msgSuccess("撤销审批成功");
|
||||
open.value = false;
|
||||
getList();
|
||||
});
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
function handleDelete(row) {
|
||||
const delId = row.id || ids.value;
|
||||
proxy.$modal
|
||||
.confirm("是否确认删除以上数据?")
|
||||
.then(function () {
|
||||
return delTransferProduct({ ids: delId.join(",") });
|
||||
})
|
||||
.then(() => {
|
||||
getList();
|
||||
proxy.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
getTransferProductTypeList();
|
||||
// getBusNoInitList()
|
||||
getList();
|
||||
</script>
|
||||
<style scoped>
|
||||
.custom-tree-node {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-weight: bold;
|
||||
font-size: large;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,398 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-row :gutter="20">
|
||||
<!--药品目录-->
|
||||
<el-col
|
||||
:span="4"
|
||||
:xs="24"
|
||||
>
|
||||
<div class="head-container">
|
||||
<div class="head-title">
|
||||
医保目录
|
||||
</div>
|
||||
<el-tree
|
||||
ref="medicationTreeRef"
|
||||
:data="medicationOptions"
|
||||
:props="{
|
||||
label: 'info',
|
||||
children: 'children',
|
||||
}"
|
||||
:expand-on-click-node="false"
|
||||
:filter-node-method="filterNode"
|
||||
node-key="value"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
current-node-key="1301"
|
||||
:default-expand-all="true"
|
||||
@node-click="handleNodeClick"
|
||||
>
|
||||
<template #default="{ node, data }">
|
||||
<span :class="{ 'text-light-gray': !data.available }">
|
||||
{{ data.info }}
|
||||
</span>
|
||||
</template>
|
||||
</el-tree>
|
||||
</div>
|
||||
</el-col>
|
||||
<!--药品目录-->
|
||||
<el-col
|
||||
:span="20"
|
||||
:xs="24"
|
||||
>
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
style="margin-bottom: 20px"
|
||||
>
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
style="display: flex; align-items: center; margin: 0"
|
||||
>
|
||||
<el-form-item
|
||||
label="搜索"
|
||||
prop="searchKey"
|
||||
label-width="40"
|
||||
style="margin: 0; margin-right: 10px"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
:placeholder="searchPlaceholder"
|
||||
clearable
|
||||
style="width: 400px"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item
|
||||
label="版本号"
|
||||
prop="versionNumber"
|
||||
label-width="80"
|
||||
style="margin: 0; margin-right: 10px"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.v"
|
||||
placeholder="版本号"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
disabled
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item style="margin: 0 10px">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Search"
|
||||
@click="getList"
|
||||
>
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item style="margin: 0 10px">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Search"
|
||||
@click="handleUpdateCatalog"
|
||||
>
|
||||
更新目录
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="medicationList"
|
||||
style="width: 100%"
|
||||
height="70vh"
|
||||
>
|
||||
<template
|
||||
v-for="(column, index) in currentColumns"
|
||||
:key="index"
|
||||
>
|
||||
<el-table-column
|
||||
:prop="column.prop"
|
||||
:label="column.label"
|
||||
:min-width="calculateColumnWidth(column)"
|
||||
:show-overflow-tooltip="true"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<template v-if="column.type === 'tag'">
|
||||
<el-tag
|
||||
v-if="scope.row[column.prop.split('_')[0]] == 2"
|
||||
type="success"
|
||||
>
|
||||
{{ scope.row[column.prop] }}
|
||||
</el-tag>
|
||||
<el-tag
|
||||
v-else
|
||||
type="error"
|
||||
>
|
||||
{{ scope.row[column.prop] }}
|
||||
</el-tag>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{
|
||||
scope.row[column.prop] === null ||
|
||||
scope.row[column.prop] === '' ||
|
||||
scope.row[column.prop] === undefined ||
|
||||
scope.row[column.prop] === 'null'
|
||||
? '--'
|
||||
: scope.row[column.prop]
|
||||
}}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="Medication">
|
||||
import {getYbCatalog, getYbCatalogResult} from './components/medicine';
|
||||
//字段配置文件
|
||||
import {catalogFieldConfigs} from './components/catalogFields';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
const medicationList = ref([]);
|
||||
const loading = ref(true);
|
||||
const showSearch = ref(true);
|
||||
const total = ref(0);
|
||||
const medicationOptions = ref(undefined);
|
||||
const currentCategoryEnum = ref('1301'); // 默认选中1301
|
||||
const medicationTreeRef = ref(null); // 医保目录树引用
|
||||
const currentColumns = ref([]); // 表格列配置
|
||||
const searchPlaceholder = ref('医疗目录编码/注册名称/批准文号/唯一记录号'); // 默认搜索提示
|
||||
// 定义有数据的catalogType值
|
||||
const availableCatalogTypes = ['1301', '1302', '1305', '1306', '1307', '1308', '1314', '1315'];
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 20,
|
||||
searchKey: undefined, // 搜索关键词(医疗目录编码/注册名称/批准文号/唯一记录号)
|
||||
catalogType: '1301', // 默认使用有数据的目录类型1301
|
||||
v: '0', // 版本号
|
||||
},
|
||||
});
|
||||
|
||||
const { queryParams } = toRefs(data);
|
||||
|
||||
/** 通过条件过滤节点 */
|
||||
const filterNode = (value, data) => {
|
||||
if (!value) return true;
|
||||
return data.info.indexOf(value) !== -1;
|
||||
};
|
||||
|
||||
/** 病种目录分类查询下拉树结构 - 使用前端写死的数据 */
|
||||
function getMedicationCategoryList() {
|
||||
// 直接使用CatalogType枚举值,并为每个选项添加available属性
|
||||
const catalogTypeOptions = [
|
||||
{ info: '西药中成药目录', value: '1301', available: true },
|
||||
{ info: '中药饮片目录', value: '1302', available: true },
|
||||
{ info: '医疗机构制剂目录', value: '1303', available: false },
|
||||
{ info: '民族药品目录', value: '1304', available: false },
|
||||
{ info: '医疗服务项目目录', value: '1305', available: true },
|
||||
{ info: '医用耗材目录', value: '1306', available: true },
|
||||
{ info: '疾病与诊断目录', value: '1307', available: true },
|
||||
{ info: '手术操作目录', value: '1308', available: true },
|
||||
{ info: '门诊慢特病种目录', value: '1309', available: false },
|
||||
{ info: '按病种付费病种目录', value: '1310', available: false },
|
||||
{ info: '日间手术治疗病种', value: '1311', available: false },
|
||||
{ info: '医保目录信息查询', value: '1312', available: false },
|
||||
{ info: '肿瘤形态学目录', value: '1313', available: false },
|
||||
{ info: '中医疾病目录', value: '1314', available: true },
|
||||
{ info: '中医证候目录', value: '1315', available: true },
|
||||
{ info: '医疗目录与医保目录匹配信息', value: '1316', available: false },
|
||||
{ info: '医药机构目录匹配信息', value: '1317', available: false },
|
||||
{ info: '医保目录限价信息', value: '1318', available: false },
|
||||
{ info: '医保目录先自付比例信息', value: '1319', available: false },
|
||||
{ info: '中药配方颗粒目录', value: '1320', available: false },
|
||||
{ info: '医疗服务项目(新)目录', value: '1321', available: false },
|
||||
];
|
||||
|
||||
medicationOptions.value = catalogTypeOptions;
|
||||
// 添加全部选项,但设为不可用
|
||||
medicationOptions.value.unshift({ info: '全部', value: '', available: false });
|
||||
|
||||
// 确保默认选中1301
|
||||
setTimeout(() => {
|
||||
if (medicationTreeRef.value) {
|
||||
medicationTreeRef.value.setCurrentKey('1301');
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
/** 查询病种目录列表 */
|
||||
function handleUpdateCatalog() {
|
||||
// proxy.$message.success('暂未实现目录更新功能');
|
||||
// loading.value = true;
|
||||
// 版本号默认传0
|
||||
getYbCatalog(queryParams.value.catalogType, '0').then((res) => {
|
||||
// loading.value = false;
|
||||
if (res && res.data) {
|
||||
proxy.$message.success('目录更新成功');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/** 查询病种目录列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
getYbCatalogResult(queryParams.value).then((res) => {
|
||||
loading.value = false;
|
||||
if (res && res.data.data && res.data.data.records) {
|
||||
medicationList.value = res.data.data.records;
|
||||
total.value = res.data.data.total || res.data.total || medicationList.value.length;
|
||||
}
|
||||
// 默认空数据
|
||||
else {
|
||||
medicationList.value = [];
|
||||
total.value = 0;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 医保目录节点点击事件
|
||||
function handleNodeClick(data) {
|
||||
if (data.available) {
|
||||
queryParams.value.catalogType = data.value;
|
||||
currentCategoryEnum.value = data.value;
|
||||
// 切换目录类型时清空搜索框的值
|
||||
queryParams.value.searchKey = undefined;
|
||||
// 动态设置表格列配置
|
||||
if (catalogFieldConfigs[data.value]) {
|
||||
console.log('catalogFieldConfigs[data.value]', catalogFieldConfigs[data.value]);
|
||||
currentColumns.value = catalogFieldConfigs[data.value].columns;
|
||||
} else {
|
||||
currentColumns.value = []; // 无配置时显示空列
|
||||
}
|
||||
// 根据当前目录类型设置搜索提示
|
||||
setSearchPlaceholder(data.value);
|
||||
|
||||
handleQuery();
|
||||
}
|
||||
}
|
||||
|
||||
/** 根据目录类型设置搜索提示 */
|
||||
function setSearchPlaceholder(catalogType) {
|
||||
switch (catalogType) {
|
||||
case '1301': // 西药中成药目录
|
||||
searchPlaceholder.value = '医疗目录编码/注册名称/批准文号/唯一记录号';
|
||||
break;
|
||||
case '1302': // 中药饮片目录
|
||||
searchPlaceholder.value = '医疗服务名称/唯一记录号';
|
||||
break;
|
||||
case '1305': // 医疗服务目录
|
||||
searchPlaceholder.value = '医疗目录编码/医疗服务名称/唯一记录号';
|
||||
break;
|
||||
case '1306': // 医用耗材目录
|
||||
searchPlaceholder.value = '医疗目录编码/耗材名称/耗材类别/材质类型/规格';
|
||||
break;
|
||||
case '1307': // 疾病与诊断目录
|
||||
searchPlaceholder.value = '分类名称/子分类名称/章名称/节名称';
|
||||
break;
|
||||
case '1308': // 手术标准目录
|
||||
searchPlaceholder.value = '分类名称/子分类名称/项目名称/手术名称/手术代码';
|
||||
break;
|
||||
case '1314': // 中医疾病目录
|
||||
searchPlaceholder.value = '疾病分类名称/疾病分类代码/唯一记录号';
|
||||
break;
|
||||
case '1315': // 中医证候目录
|
||||
searchPlaceholder.value = '证候类型代码/证候类型名称/唯一记录号';
|
||||
break;
|
||||
default:
|
||||
searchPlaceholder.value = '请输入搜索关键词';
|
||||
}
|
||||
}
|
||||
// 初始化时设置默认列配置和搜索提示
|
||||
function initColumns() {
|
||||
const defaultType = '1301'; // 默认目录类型
|
||||
if (catalogFieldConfigs[defaultType]) {
|
||||
currentColumns.value = catalogFieldConfigs[defaultType].columns;
|
||||
}
|
||||
// 设置默认搜索提示
|
||||
setSearchPlaceholder(defaultType);
|
||||
}
|
||||
|
||||
// 计算列宽度函数
|
||||
function calculateColumnWidth(column) {
|
||||
const baseWidth = 40; // 增加基础边距宽度
|
||||
const charWidth = 16; // 增加每个字符的平均宽度,确保中文能更好地显示
|
||||
const textLength = column.label ? column.label.length : 0;
|
||||
const calculatedWidth = baseWidth + textLength * charWidth;
|
||||
|
||||
// 设置最小宽度,确保即使短文本也有良好的显示效果
|
||||
const minWidth = 120;
|
||||
|
||||
return Math.max(calculatedWidth, minWidth);
|
||||
}
|
||||
|
||||
// 在组件挂载时初始化
|
||||
initColumns();
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.pageNo = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
getMedicationCategoryList();
|
||||
getList();
|
||||
</script>
|
||||
<style scoped>
|
||||
.el-form--inline .el-form-item {
|
||||
display: inline-flex;
|
||||
vertical-align: middle;
|
||||
margin-right: 10px !important;
|
||||
}
|
||||
.el-select {
|
||||
width: 150px !important;
|
||||
}
|
||||
|
||||
/* 确保表格内容完整显示 */
|
||||
.el-table {
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
/* 调整表格列样式,允许内容更好地显示 */
|
||||
.el-table__cell {
|
||||
padding: 12px 8px;
|
||||
}
|
||||
|
||||
/* 确保分页组件完整显示 */
|
||||
.pagination-container {
|
||||
margin-top: 20px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
/* 自定义样式:使不可用的目录类型文字颜色变浅 */
|
||||
.text-light-gray {
|
||||
color: #c0c4cc !important;
|
||||
}
|
||||
|
||||
/* 确保样式能正确应用到树节点 */
|
||||
:deep(.el-tree-node__label) {
|
||||
transition: color 0.3s;
|
||||
}
|
||||
</style>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user