diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
index aa53dd04..1a7671de 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
@@ -3,11 +3,11 @@ package com.openhis.web.datadictionary.appservice.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.core.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.core.common.utils.DateUtils;
+import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.ChargeItemDefDetail;
 import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.service.IChargeItemDefDetailService;
@@ -48,9 +48,9 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
             .setStatusEnum(PublicationStatus.ACTIVE.getValue())
             .setInstanceTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
             .setInstanceId(medicationDetail.getMedicationDefId()).setEffectiveStart(DateUtils.getNowDate())
-            //机构ID
-//            .setOrgId(SecurityUtils.getLoginUser().getOrgId())
-            .setOrgId(1l)//todo 没数据先写死
+            // 机构ID
+            // .setOrgId(SecurityUtils.getLoginUser().getOrgId())
+            .setOrgId(1l)// todo 没数据先写死
             // 财务类别
             .setTypeCode(medicationManageUpDto.getMinimalFee())
             // 医保类别
@@ -63,16 +63,16 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
             ChargeItemDefDetail chargeItemDefDetail1 = new ChargeItemDefDetail();
             chargeItemDefDetail1.setDefinitionId(chargeItemDefinition.getId())
                 // 单位+批次（unit,pici） 用,符号拼装
-                .setConditionCode(
-                    medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber())
+                .setConditionCode(StringUtils.joinStrings(
+                    medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()))
                 // 购入价
                 .setAmount(medicationManageUpDto.getPurchasePrice());
 
             ChargeItemDefDetail chargeItemDefDetail2 = new ChargeItemDefDetail();
             chargeItemDefDetail2.setDefinitionId(chargeItemDefinition.getId())
                 // 单位+批次（unit,pici） 用,符号拼装
-                .setConditionCode(
-                    medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber())
+                .setConditionCode(StringUtils.joinStrings(
+                    medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()))
                 // 零售价
                 .setAmount(medicationManageUpDto.getRetailPrice());
 
@@ -81,8 +81,8 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
             ChargeItemDefDetail chargeItemDefDetail3 = new ChargeItemDefDetail();
             chargeItemDefDetail3.setDefinitionId(chargeItemDefinition.getId())
                 // 单位+批次（unit,pici） 用,符号拼装
-                .setConditionCode(
-                    medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber())
+                .setConditionCode(StringUtils.joinStrings(
+                    medicationManageUpDto.getDoseUnitCode_dictText() + "," + medicationManageUpDto.getLotNumber()))
                 // 最高零售价
                 .setAmount(medicationManageUpDto.getMaximumRetailPrice());
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
index cd6488c2..33975e0f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
@@ -180,11 +180,11 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             e.setDomainEnum_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getDomainEnum()));
 
             // 是否自制
-            e.setSelfFlag_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getSelfFlag()));
+            e.setSelfFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSelfFlag()));
             // 是否抗生素
-            e.setAntibioticFlag_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getAntibioticFlag()));
+            e.setAntibioticFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getAntibioticFlag()));
             // 基药标识
-            e.setBasicFlag_enumText(EnumUtils.getInfoByValue(ApplicableScope.class, e.getBasicFlag()));
+            e.setBasicFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getBasicFlag()));
 
 //            // 活动标记
 //             e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
index 8105f4a0..dd976187 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
@@ -53,6 +53,7 @@ public class MedicationManageUpDto {
     private Integer activeFlag;
 
     /** 批次号 */
+    @NotBlank(message = "批次号不能为空")
     private String lotNumber;
 
     /** 生效日期 */
@@ -74,6 +75,7 @@ public class MedicationManageUpDto {
 
     /** 剂量单位 */
     @Dict(dictCode = "unit_code")
+    @NotBlank(message = "剂量单位不能为空")
     private String doseUnitCode;
     private String doseUnitCode_dictText;