zhaoyun 31d9098b37 Fix Bug #547: 执行科室配置保存时时间冲突检测范围错误 — 根因：addOrEditOrgLoc 方法使用 getOrgLocListByActivityDefinitionId 跨科室查询同一诊疗的所有配置，导致不同科室间的正常时间重叠被误判为冲突；修复：改为 getOrgLocListByOrgIdAndActivityDefinitionId(orgId, activityDefId) 限定同科室范围；同时优化软删除科室处理，当冲突记录关联的科室已被删除时，使用"科室[ID]已删除"替代静默跳过 ...

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

2026-05-20 10:17:06 +08:00

..

adjustprice

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

administration/controller

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

appointmentmanage

Fix: 门诊预约挂号→签到→退号 slot/pool 状态流转对齐需求

2026-05-19 12:12:16 +08:00

basedatamanage

Fix Bug #547: 执行科室配置保存时时间冲突检测范围错误 — 根因：addOrEditOrgLoc 方法使用 getOrgLocListByActivityDefinitionId 跨科室查询同一诊疗的所有配置，导致不同科室间的正常时间重叠被误判为冲突；修复：改为 getOrgLocListByOrgIdAndActivityDefinitionId(orgId, activityDefId) 限定同科室范围；同时优化软删除科室处理，当冲突记录关联的科室已被删除时，使用"科室[ID]已删除"替代静默跳过

2026-05-20 10:17:06 +08:00

basicmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

basicservice

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

cardmanagement

Fix Bug #524: 报卡详情日期字段回显为空 - 添加@JsonFormat注解确保Jackson正确序列化日期

2026-05-17 21:09:02 +08:00

catalogmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

charge/patientcardrenewal

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

chargemanage

Fix: 门诊预约挂号→签到→退号 slot/pool 状态流转对齐需求

2026-05-19 12:12:16 +08:00

check

Fix: 修复bug：430 门诊医生站-检查申请：实现套餐金额变更与检查部位的金额/检查申请单开立的项目金额实时同步联动

2026-05-09 13:23:58 +08:00

clinicalmanage

Fix Bug #538: [门诊医生站-医嘱/手术申请] 手术申请单删除后级联删除关联医嘱、收费项目、申请单

2026-05-18 11:05:28 +08:00

common

Revert "Merge remote-tracking branch 'origin/develop' into develop"

2026-05-15 09:33:35 +08:00

consultation

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

controller

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

datadictionary

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

debug

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

departmentmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

doctorstation

Merge remote-tracking branch 'origin/develop' into develop

2026-05-20 09:46:29 +08:00

document

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

dto

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

externalintegration

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

inhospitalcharge

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

inhospitalnursestation

Fix Bug 505505 【业务逻辑缺陷】药品医嘱已由药房发药，护士仍能在“医嘱校对”模块执行“退回”操作

2026-05-15 17:34:29 +08:00

inpatientmanage

fix bug434:门诊手术安排：编辑弹窗中“切口类型”字段未正确回显数据

2026-05-14 11:48:22 +08:00

Inspection

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

inventorymanage

bug 514 537 538 540 543

2026-05-18 17:44:15 +08:00

jlau

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

lab

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

materialmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

medicationmanagement/controller

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

nenu

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

outpatientmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

patientmanage

549【住院医生站-临床医嘱-检验】打开“检验申请单”弹窗获取项目列表响应极其缓慢

2026-05-20 09:45:33 +08:00

paymentmanage

506 门诊挂号：门诊诊前退号后，数据库多表状态值变更与 PRD 定义不符

2026-05-11 13:51:47 +08:00

personalization

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

pharmacyDispensarymanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

pharmacymanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

pharmacyWarehousemanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

regdoctorstation

bug 514 537 538 540 543

2026-05-18 17:44:15 +08:00

reportmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

reportManagement

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

service

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

system/controller

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

tencentJH

Fix Bug #401: div_log 表中 pool_id 与 slot_id 存值不符

2026-05-13 23:27:08 +08:00

triageandqueuemanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

ybmanage

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

AGENTS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00