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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -632,6 +632,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
                 chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
 
+                // 显式设置tenantId、createBy和createTime字段，防止自动填充机制失效
+                chargeItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+                chargeItem.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+                chargeItem.setCreateTime(new Date());
+
                 iChargeItemService.saveOrUpdate(chargeItem);
 
             }
@@ -685,6 +690,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             deviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id
             deviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
             deviceRequest.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 显式设置租户ID
+            // 显式设置审计字段，防止自动填充机制失效
+            deviceRequest.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+            deviceRequest.setCreateTime(new Date());
 
             // 保存时,处理数据(请求,发放,账单)
             if (is_save) {
@@ -745,6 +753,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
                 chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
 
+                // 显式设置审计字段，防止自动填充机制失效
+                chargeItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+                chargeItem.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+                chargeItem.setCreateTime(new Date());
+
                 iChargeItemService.saveOrUpdate(chargeItem);
             }
         }
@@ -857,6 +870,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
                 chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
 
+                // 显式设置审计字段，防止自动填充机制失效
+                chargeItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+                chargeItem.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+                chargeItem.setCreateTime(new Date());
+
                 iChargeItemService.saveOrUpdate(chargeItem);
 
                 // 第一次保存时,处理诊疗套餐的子项信息
@@ -878,7 +896,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                     }
                 }
             }
-
             // 只有在签发时
             if (is_sign) {
                 // 发送跨系统申请

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java

@@ -87,6 +87,11 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
         // 设置限制发药时间
         deviceDispense.setLimitTime(limitTime);
 
+        // 显式设置tenantId、createBy和createTime字段，防止自动填充机制失效
+        deviceDispense.setTenantId(getLoginUser().getTenantId());
+        deviceDispense.setCreateBy(getLoginUser().getUsername());
+        deviceDispense.setCreateTime(new Date());
+
         baseMapper.insert(deviceDispense);
 
         // if (DbOpType.INSERT.getCode().equals(dbOpType)) {