```

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

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java

@@ -116,10 +116,10 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
                         .collect(Collectors.toList());
 
         // 发药状态
-        List<DispenseInitDto.DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
+        List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
                 DispenseStatus.IN_PROGRESS.getInfo()));
-        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
                 DispenseStatus.COMPLETED.getInfo()));
 
         initDto.setDepartmentOptions(organizationOptions).setNotPerformedReasonOptions(notPerformedReasonOptions)

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java

@@ -9,7 +9,9 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,13 +28,21 @@ import com.openhis.common.enums.*;
 import com.openhis.common.enums.ybenums.YbInvChgType;
 import com.openhis.medication.domain.MedicationDefinition;
 import com.openhis.medication.domain.MedicationDispense;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.service.IOrganizationService;
 import com.openhis.medication.service.IMedicationDefinitionService;
 import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.impl.MedicationRequestServiceImpl;
 import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
 import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
 import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
+import com.openhis.web.pharmacymanage.appservice.impl.ReturnMedicineAppServiceImpl;
+import com.openhis.web.pharmacymanage.appservice.impl.WesternMedicineDispenseAppServiceImpl;
 import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
+import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
 import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
@@ -85,18 +95,6 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
     @Resource
     private AdviceProcessAppMapper adviceProcessAppMapper;
 
-    @Resource
-    private IInventoryItemService inventoryItemService;
-
-    @Resource
-    private IMedicationDefinitionService medicationDefinitionService;
-
-    @Resource
-    private ReceiptApprovalAppServiceImpl receiptApprovalAppService;
-
-    @Resource
-    private WesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppService;
-
     @Resource
     private MedicationRequestServiceImpl medicationRequestService;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java

@@ -156,10 +156,10 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
                 .toList();
 
         // 发药状态
-        List<DispenseInitDto.DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
+        List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
                 DispenseStatus.IN_PROGRESS.getInfo()));
-        dispenseStatusOptions.add(new DispenseInitDto.DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
                 DispenseStatus.COMPLETED.getInfo()));
 
         initDto.setDepartmentOptions(organizationOptions).setNotPerformedReasonOptions(notPerformedReasonOptions)

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java

@@ -70,16 +70,7 @@ public class DispenseInitDto {
         }
     }
 
-    @Data
-    public static class DispenseStatusOption {
-        private Integer value;
-        private String label;
 
-        public DispenseStatusOption(Integer value, String label) {
-            this.value = value;
-            this.label = label;
-        }
-    }
 
     @Data
     public static class PreparerDoctorOption {
@@ -92,4 +83,30 @@ public class DispenseInitDto {
             this.label = label;
         }
     }
+
+    // 手动添加 setter 方法以确保编译正确
+    public DispenseInitDto setDepartmentOptions(List<DepartmentOption> departmentOptions) {
+        this.departmentOptions = departmentOptions;
+        return this;
+    }
+
+    public DispenseInitDto setNotPerformedReasonOptions(List<NotPerformedReasonOption> notPerformedReasonOptions) {
+        this.notPerformedReasonOptions = notPerformedReasonOptions;
+        return this;
+    }
+
+    public DispenseInitDto setDispenseStatusOptions(List<DispenseStatusOption> dispenseStatusOptions) {
+        this.dispenseStatusOptions = dispenseStatusOptions;
+        return this;
+    }
+
+    public DispenseInitDto setPreparerDoctorOptions(List<PreparerDoctorOption> preparerDoctorOptions) {
+        this.preparerDoctorOptions = preparerDoctorOptions;
+        return this;
+    }
+
+    public DispenseInitDto setEncounterClassOptions(List<EncounterClassOption> encounterClassOptions) {
+        this.encounterClassOptions = encounterClassOptions;
+        return this;
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseStatusOption.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import lombok.Data;
+
+/**
+ * 发药状态选项
+ * 
+ * @author wangyang
+ * @date 2025-03-14
+ */
+@Data
+public class DispenseStatusOption {
+    private Integer value;
+    private String label;
+
+    public DispenseStatusOption(Integer value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java

@@ -1,12 +1,13 @@
 package com.openhis.web.pharmacymanage.dto;
 
 import com.core.common.annotation.Excel;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 发药明细账分页列表 dto
  *
@@ -62,9 +63,8 @@ public class MedDetailedAccountPageDto {
     private String costPriceStr;
 
     /**
-     * 发药人
+     * 发药人ID
      */
-    @JsonSerialize(using = ToStringSerializer.class)
     private String practitionerId;
 
     /**
@@ -165,6 +165,8 @@ public class MedDetailedAccountPageDto {
     private String refundUnitCode;
     private String refundUnitCode_dictText;
 
+
+
     /**
      * 发药时间
      */