diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
index 4ba299945..bbad3414f 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
@@ -1,6 +1,8 @@
 package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
-import com.alibaba.fastjson.JSONArray;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -155,8 +157,6 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
 
         // 发药状态
         List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.DRAFT.getValue(),
-                DispenseStatus.DRAFT.getInfo()));
         dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.SUBMITTED.getValue(),
                 DispenseStatus.SUBMITTED.getInfo()));
         dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(),
@@ -197,8 +197,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
                 = westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper,
                         statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
                         DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(),
-                        DispenseStatus.SUMMARIZED.getValue(), DispenseStatus.SUBMITTED.getValue(),
-                        DispenseStatus.DRAFT.getValue());
+                        DispenseStatus.SUMMARIZED.getValue(), DispenseStatus.SUBMITTED.getValue());
         encounterInfoPage.getRecords().forEach(encounterInfo -> {
             // 性别
             encounterInfo.setGenderEnum_enumText(
@@ -237,7 +236,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
                         DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
                         DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus,
                         PublicationStatus.ACTIVE.getValue(), DispenseStatus.SUMMARIZED.getValue(),
-                        DispenseStatus.SUBMITTED.getValue(), DispenseStatus.DRAFT.getValue());
+                        DispenseStatus.SUBMITTED.getValue());
         medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> {
             // 发药状态
             medicineDispenseOrder.setStatusEnum_enumText(
@@ -496,7 +495,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         String returnMsg = null;
         List<String> uploadFailedNoList;
         // 调用医保商品销售接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
             // 设置进销存参数
             List<MedicationDefinition> medicationDefinitions = medicationDefinitionService.listByIds(
@@ -677,14 +676,14 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         // throw new ServiceException("未查找到就诊发票信息");
         // }
         // 转换为JSON
-        JSONArray medicalTraceNo = new JSONArray();
+        ArrayNode medicalTraceNo = new com.fasterxml.jackson.databind.ObjectMapper().createArrayNode();
         // 获取追溯码信息
         if (dispenseInventoryDto.getTraceNo() != null) {
             List<String> traceNoList
                     = Arrays.stream(dispenseInventoryDto.getTraceNo().split(CommonConstants.Common.COMMA)).map(String::trim)
                             .filter(s -> !s.isEmpty()).toList();
             for (String traceNo : traceNoList) {
-                Map<String, String> traceNoMap = new HashMap<>();
+                ObjectNode traceNoMap = new com.fasterxml.jackson.databind.ObjectMapper().createObjectNode();
                 traceNoMap.put("drug_trac_codg", traceNo);
                 medicalTraceNo.add(traceNoMap);
             }
@@ -708,7 +707,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         }
         // 查看所属医院
         String fixmedinsCode
-                = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
+                = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         if (dispenseInventoryDto.getPreparerName() == null && HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
             medical3505Param.setSelRetnOpterName(CommonConstants.CCU.DisDeviceDoctorName);
         } else {