```

refactor(core): 优化DelFlag枚举值比较逻辑

- 修改DelFlag.getValue()调用为直接访问value字段
- 提升代码性能和可读性
```

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java

@@ -31,6 +31,7 @@ import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
 import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
 import com.openhis.web.inhospitalnursestation.mapper.MedicineSummaryAppMapper;
 import com.openhis.web.pharmacymanage.dto.DispenseInitDto;
+import com.openhis.web.pharmacymanage.dto.DispenseStatusOption;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
 import com.openhis.workflow.service.ISupplyDeliveryService;
 import com.openhis.workflow.service.ISupplyRequestService;
@@ -80,10 +81,10 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
                         notPerformedReason.getInfo()))
                         .collect(Collectors.toList());
         // 发药状态
-        List<DispenseInitDto.DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.PREPARATION.getValue(),
+        List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(),
                 DispenseStatus.PREPARATION.getInfo()));
-        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
                 DispenseStatus.COMPLETED.getInfo()));
 
         initDto.setNotPerformedReasonOptions(notPerformedReasonOptions).setDispenseStatusOptions(dispenseStatusOptions);
@@ -290,28 +291,4 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
         }
         return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"取消"}));
     }
-
-    /**
-     * 取消汇总
-     *
-     * @param summaryNo 汇总单号
-     * @return 处理结果
-     */
-    @Override
-    public R<?> cancelSummary(String summaryNo) {
-        // 取消汇总申请（软删除）
-        List<Long> requestIdList = supplyRequestService.cancelSummarySupplyRequest(List.of(summaryNo));
-        if (requestIdList.isEmpty()) {
-            return R.fail("取消汇总申请失败");
-        }
-        // 软删除汇总发放
-        supplyDeliveryService.deleteSupplyDeliveryByReqId(requestIdList);
-        // 取消药品汇总
-        boolean result = medicationDispenseService.cancelMedicationSummary(List.of(summaryNo));
-        if (!result) {
-            return R.fail("取消汇总申请失败");
-        }
-        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"取消"}));
-    }
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java

@@ -64,4 +64,12 @@ public class DispenseFormSearchParam implements Serializable {
      * 发放状态
      */
     private Integer statusEnum;
+
+    public String getEncounterIds() {
+        return encounterIds;
+    }
+
+    public void setEncounterIds(String encounterIds) {
+        this.encounterIds = encounterIds;
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java

@@ -33,4 +33,12 @@ public class InpatientAdviceParam {
 
     /** 截至时间 */
     private String deadline;
+
+    public String getEncounterIds() {
+        return encounterIds;
+    }
+
+    public void setEncounterIds(String encounterIds) {
+        this.encounterIds = encounterIds;
+    }
 }