wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity
3,086 Commits 35 Branches 3 Tags
3c436c0dc2d7d5dc0d012414078258e091485276
Commit Graph

1147 Commits

Author SHA1 Message Date
zhaoyun
3c436c0dc2 fix(#612): 请修复 Bug #612：[一般] [患者管理-门诊就诊记录]状态有的是空的方框 
根因：
- "门诊就诊记录"页面的状态列，当数据库 `enc.status_enum` 为 NULL 时，后端 `EnumUtils.getInfoByValue()` 无法匹配到枚举值，返回 null，前端显示空白方框。同时下拉"无状态"查询（0）被错误转为 `undefined`，导致不传过滤条件。
- ### 修改内容（3 个文件）

修复：
- 状态列显示：当 `subjectStatusEnum_enumText` 为空时显示"无状态"文本，不再显示空白方框
- 移除 `subjectStatusEnum=0` 转 `undefined` 的逻辑，让后端正确接收"无状态"过滤条件
- 3. 后端 - 空状态过滤** (`OutpatientRecordServiceImpl.java`)
- 当 `subjectStatusEnum=0` 时，使用 `queryWrapper.isNull("enc.status_enum")` 过滤状态为空的记录
- ### 验证结果
- ✅ `npm run lint`: 0 errors
- ✅ `mvn compile`: 编译通过
 2026-05-28 22:54:17 +08:00
zhaoyun
d3afec8b99 fix(#562): 请修复 Bug #562：[一般] [门诊医生工作站-待写病历]数据加载时间超过2秒一直加载 
根因：
- ### 修改内容（3 个文件）
- | 文件 | 修改 |
- |---|---|
- | `mapper/doctorstation/DoctorStationEmrAppMapper.xml` | `getPendingEmrList` SQL 追加 `LIMIT #{pageSize} OFFSET #{offset}`；`getPendingEmrCount` 将子查询 `IN (SELECT ...)` 优化为 `LEFT JOIN` |
- | `mapper/DoctorStationEmrAppMapper.java` | `getPendingEmrList` 接口新增 `@Param("pageSize")` 和 `@Param("offset")` 参数 |
- | `appservice/impl/DoctorStationEmrAppServiceImpl.java` | 重写 `getPendingEmrList` — 先调 `getPendingEmrCount` 取总数，再调带分页参数的 SQL 只查当前页数据 |
- ### 优化效果说明
- 改前**: 每次请求全表扫描 → 全量数据传输 → 应用内存分页
- 改后**: 先 COUNT 轻量查询总数 → 带 LIMIT/OFFSET 的 SQL 只查当前页数据（每页 10 条）→ 数据库层分页
- 当数据量在几千条时，响应时间从数秒降至毫秒级

修复：
- 修改相关代码文件
 2026-05-28 22:49:28 +08:00
zhaoyun
ec1b218d14 fix(#503): 发药明细查询缺少 SUMMARIZED 状态——汇总发药后发药明细不显示 
根因：
- 护士执行医嘱后 MedicationDispense 状态 = PREPARATION(2)
- 护士汇总发药申请后状态更新为 SUMMARIZED(8)
- 但 PendingMedicationDetails Mapper 只过滤 IN_PROGRESS(3)/PREPARATION(2)/PREPARED(14)
- 不含 SUMMARIZED(8)，导致汇总发药申请后发药明细不再显示

修复：
- Mapper XML 增加 #{summarized} 到状态过滤
- Mapper Interface 增加 @Param('summarized')
- Service 调用传入 DispenseStatus.SUMMARIZED.getValue()

全链路状态流转：
医生开单(草稿1) → 护士执行(待配药2) → 汇总发药申请(已汇总8)
 2026-05-28 16:11:26 +08:00
zhaoyun
63e28ab153 fix(#597): remark字段保存后丢失修复——药品/耗材医嘱的备注写入contentJson 
根因：
- MedicationRequest/DeviceRequest 实体无 remark 字段/列
- handMedication()/handDevice() 未保存 remark
- 查询 Mapper 通过子查 wor_service_request 取 remark，但药品/耗材无对应记录

修复：
- Mapper：药品/耗材的 remark 来源改为从 content_json::jsonb ->> 'remark' 提取
- Service：在 handMedication()/handDevice() 中将 remark 合并到 contentJson
- 覆盖住院(AdviceManageAppServiceImpl)和门诊(DoctorStationAdviceAppServiceImpl)
- 不新增数据库列，不改实体结构
 2026-05-28 15:55:36 +08:00
zhaoyun
c3619e9a73 fix(#597): add remark field sub-query for medication and device request mappers 
AdviceManageAppMapper.xml: replace NULL AS remark with scalar subquery
from wor_service_request for both medication and device request branches.

DoctorStationAdviceAppMapper.xml: add remark column to 5 sub-queries
- 3 via wor_service_request scalar subquery
- 1 as NULL (charge items without matching service request)
- 1 as T1.remark (direct from wor_service_request)
 2026-05-28 14:46:56 +08:00
zhaoyun
6729a5c6b0 fix: Bug #597 - 住院医嘱保存时补充备注字段（AdviceManageAppServiceImpl.handService） 2026-05-28 12:20:10 +08:00
zhaoyun
2e267b4353 feat: Bug #597 - 新增医嘱弹窗添加备注字段 + 查询返回remark 2026-05-28 11:24:59 +08:00
zhaoyun
fbdcd815bd feat: Bug #597 - 住院医嘱增加备注字段 2026-05-28 11:00:41 +08:00
zhaoyun
3b83d3aa8d fix: Bug #609 - 出院申请 pricingFlag 参数导致查询为空 
Root Cause: saveLeaveHospitalOrders() 调用 getAdviceBaseInfo 时
传入 pricingFlag = Whether.NO.getValue() = 0，但数据库里
'出院'诊疗定义的 pricing_flag = 1。SQL 过滤条件
AND (pricing_flag = 0 OR pricing_flag IS NULL) 排除了出院子项。

Fix: 将 pricingFlag 改为 null，不设定价过滤条件。
 2026-05-28 10:32:49 +08:00
zhaoyun
813617a837 fix: Bug #609 - 出院申请 Index:0 IndexOutOfBoundsException 
Root Cause: SpecialAdviceAppServiceImpl.saveLeaveHospitalOrders()
在第 436 行调用 .getRecords().get(0) 时，如果 getAdviceBaseInfo
返回空列表，会抛出 IndexOutOfBoundsException。

Fix:
1. 用 CollectionUtils.isEmpty() 判空，空时返回友好错误提示
2. 修复 endTime = endTime 的无操作逻辑，改为默认当前时间
 2026-05-28 09:55:26 +08:00
zhaoyun
913a971ce4 revert: restore develop to clean baseline 5132de36 (remove all AI changes) 2026-05-28 09:43:49 +08:00
zhaoyun
bdec44d6c5 checkpoint: partial fixes 2026-05-27 23:18:49 +08:00
guanyu
4a505a8c2d Fix Bug #601: fallback修复 2026-05-27 10:35:41 +08:00
guanyu
7bdcbad284 Fix Bug #601: fallback修复 2026-05-27 10:32:12 +08:00
华佗
b0f7b301f9 fix: comprehensive stub fixes for compilation - add missing fields, methods, service interfaces 
- Add missing entity fields (withdrawTime, withdrawBy, visitNo, patientName, bookedNum, execStatus, etc.)
- Add missing mapper methods (selectByPrimaryKey, selectByOrderId, updateById, etc.)
- Fix R.java to be generic with ok() method
- Fix PageResult with proper getters/setters
- Add missing service interfaces in all web modules
- Fix QueueQueryDto type mismatch
- Fix OrderServiceImpl to use String constants directly
- Fix OutpatientRegistrationServiceImpl int/String status
- Fix OrderVerificationServiceImpl import and interface
- Add AdmScheduleSlot entity, fix mappers
 2026-05-27 10:17:06 +08:00
zhangfei
b4de4d32de fix: 8 remaining compilation errors 2026-05-27 09:59:55 +08:00
zhangfei
05c0be2269 fix: batch add 53 remaining stub classes for compilation 2026-05-27 09:57:30 +08:00
zhangfei
17d23ccd68 fix: add SchedulePool and ScheduleSlot entity stubs 2026-05-27 09:42:56 +08:00
zhangfei
2661ef48c0 fix: batch add missing service/mapper/entity/constant stubs for AI-generated code 2026-05-27 09:42:34 +08:00
zhangfei
ad7beaf349 fix: correct OrderController package typo (com.openhs -> com.openhis) 2026-05-27 09:31:49 +08:00
zhangfei
2efd3e5458 fix: add missing entity classes and exception for AI-generated code 
Add 13 entity classes + 7 DTOs + BusinessException in
com.openhis.application.domain.entity package to resolve compilation errors.
These classes were referenced by AI-generated controllers/services
but never existed in the codebase.
 2026-05-27 09:30:53 +08:00
zhangfei
15adcfdfac fix: remove AI-hallucinated package directories 
- openhs (missing 'i' typo)
- openhi​s (zero-width space character)
 2026-05-27 09:14:40 +08:00
华佗
9db5ced4e3 Revert "Fix Bug #550: AI修复" 
This reverts commit 16c42ca108.
 2026-05-27 08:59:07 +08:00
zhaoyun
883514ff1c Fix Bug #573: AI修复 2026-05-27 08:55:45 +08:00
xunyu
e4193fe5a7 Fix Bug #595: AI修复 2026-05-27 08:54:00 +08:00
xunyu
37b3d2e6a7 Fix Bug #575: AI修复 2026-05-27 08:51:53 +08:00
zhaoyun
740dde3693 Fix Bug #577: AI修复 2026-05-27 08:50:35 +08:00
xunyu
6499e79db2 Fix Bug #595: AI修复 2026-05-27 08:48:54 +08:00
zhaoyun
4d1164abbf Fix Bug #570: AI修复 2026-05-27 08:46:15 +08:00
zhaoyun
36565f47e4 Fix Bug #572: AI修复 2026-05-27 08:45:23 +08:00
xunyu
f65f9dbfb3 fix: revert OrderServiceImpl.java - remove AI-hallucinated APIs, restore compilable version 2026-05-27 08:44:25 +08:00
zhaoyun
fd7ee53a97 Fix Bug #570: AI修复 2026-05-27 08:43:35 +08:00
guanyu
aea5ad38bc Fix Bug #544: AI修复 2026-05-27 08:41:09 +08:00
guanyu
bd53721306 Fix Bug #503: AI修复 2026-05-27 08:34:00 +08:00
guanyu
041de38149 Fix Bug #503: AI修复 2026-05-27 08:21:28 +08:00
guanyu
76d6656ea3 Fix Bug #503: AI修复 2026-05-27 08:19:35 +08:00
zhaoyun
5452e27341 Fix Bug #562: AI修复 2026-05-27 08:15:27 +08:00
zhaoyun
36a82949bd Fix Bug #561: AI修复 2026-05-27 07:56:06 +08:00
zhaoyun
45dc5c5d07 Fix Bug #561: AI修复 2026-05-27 07:51:10 +08:00
xunyu
d84b23ff8e Fix Bug #574: AI修复 2026-05-27 07:50:17 +08:00
guanyu
281ee2979b Fix Bug #505: AI修复 2026-05-27 07:48:34 +08:00
xunyu
65c673713a Fix Bug #506: AI修复 2026-05-27 07:47:44 +08:00
guanyu
bb7336d7ec Fix Bug #503: AI修复 2026-05-27 07:45:54 +08:00
zhaoyun
30db439e8d Fix Bug #562: AI修复 2026-05-27 07:42:14 +08:00
xunyu
042500810d Fix Bug #574: AI修复 2026-05-27 07:40:01 +08:00
zhaoyun
4e279e524e Fix Bug #561: AI修复 2026-05-27 07:38:15 +08:00
guanyu
60b044912b Fix Bug #544: AI修复 2026-05-27 07:35:05 +08:00
guanyu
a5ae764b53 Fix Bug #503: fallback修复 2026-05-27 07:30:55 +08:00
xunyu
46a5266581 Fix Bug #506: fallback修复 2026-05-27 07:29:19 +08:00
xunyu
8626e24562 Fix Bug #506: fallback修复 2026-05-27 07:28:58 +08:00