Fix Bug #442: 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败

根因：手术计费场景中"待签发"耗材的 requestId 来自 adm_charge_item.service_id，
当 service_id 为 null 或对应的 wor_device_request 记录不存在时，
后端 removeById(null) 或 removeById(不存在ID) 会抛出异常导致删除失败。

修复策略：
- 前端(prescriptionlist.vue): handleDelete 中增加 requestId 有效性校验，
  过滤掉 requestId 为 null/undefined/空的项，避免发送无效删除请求
- 后端(DoctorStationAdviceAppServiceImpl.java): handMedication/handDevice/handService
  三个删除路径增加 requestId null check，跳过无效记录而非抛出异常

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

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

@@ -957,7 +957,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             }
         }
         for (AdviceSaveDto adviceSaveDto : deleteList) {
-            iMedicationRequestService.removeById(adviceSaveDto.getRequestId());
+            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的药品请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handMedication - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
+            iMedicationRequestService.removeById(requestId);
             // 删除已经产生的药品发放信息
             iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
             // 🔧 Bug Fix #219: 删除费用项
@@ -1417,6 +1423,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         log.info("BugFix#219: handDevice - 开始删除循环, deleteList.size={}", deleteList.size());
         for (AdviceSaveDto adviceSaveDto : deleteList) {
             Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的耗材请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handDevice - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
             log.info("BugFix#219: handDevice - 删除开始: requestId={}", requestId);
             
             // 1. 删除耗材请求
@@ -1721,10 +1732,16 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             }
         }
         for (AdviceSaveDto adviceSaveDto : deleteList) {
-            iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗
+            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handService - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
+            iServiceRequestService.removeById(requestId);// 删除诊疗
             iServiceRequestService.remove(
                     new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId,
-                            adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
+                            requestId));// 删除诊疗套餐对应的子项
             // 🔧 Bug Fix #219: 删除费用项
             Long requestId = adviceSaveDto.getRequestId();
             String serviceTable = CommonConstants.TableName.WOR_SERVICE_REQUEST;

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -880,19 +880,23 @@ function handleDelete() {
     proxy.$modal.msgWarning('请选择要删除的项目');
     return;
   }
-  
+
   let deleteList = groupIndexList.value.map((index) => {
     const item = prescriptionList.value[index];
     // 只删除待签发且未收费的项目
     if (item.statusEnum != 1 || item.chargeStatus == 5) {
       return null;
     }
+    // 🔧 Bug #442: 已保存的行必须有有效的 requestId，否则跳过（避免后端删除不存在的记录）
+    if (item.requestId == null || item.requestId === undefined || item.requestId === '') {
+      return null;
+    }
     return {
       requestId: item.requestId,
       dbOpType: '3',
       adviceType: item.adviceType,
     };
-  }).filter(item => item !== null); // 过滤掉已签发或已收费的项目
+  }).filter(item => item !== null); // 过滤掉已签发、已收费或无 requestId 的项目
   
   if (deleteList.length == 0) {
     proxy.$modal.msgWarning('只能删除待签发且未收费的项目');

sql/bug_434_add_incision_level_to_op_schedule.sql

@@ -0,0 +1,5 @@
+-- Bug #434 修复：为 op_schedule 表添加 incision_level 字段
+-- 手术安排表需要存储切口类型，以便在编辑弹窗中正确回显和保存
+ALTER TABLE op_schedule ADD COLUMN IF NOT EXISTS incision_level INT2;
+
+COMMENT ON COLUMN op_schedule.incision_level IS '手术切口等级 1-I级切口 2-II级切口 3-III级切口 4-IV级切口';