up

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java

@@ -131,7 +131,7 @@ public class MedicationManageDto {
 
     /** 药品分类 */
     @Dict(dictCode = "med_category_code")
-    private Integer categoryCode;
+    private String categoryCode;
     private String categoryCode_dictText;
 
     /** 商品名称 */

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java

@@ -109,7 +109,7 @@ public class MedicationManageUpDto {
     private String wbStr;
 
     /** 药品分类 */
-    private Integer categoryCode;
+    private String categoryCode;
 
     /** 商品名称 */
     private String merchandiseName;

openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java

@@ -99,7 +99,7 @@ public class MedicationDetail extends HisBaseEntity {
     private String wbStr;
 
     /** 药品分类 */
-    private Integer categoryCode;
+    private String categoryCode;
 
     /** 商品名称 */
     private String merchandiseName;

openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java

@@ -20,11 +20,4 @@ public interface IMedicationDefinitionService extends IService<MedicationDefinit
      */
     boolean addMedication(MedicationDetail medicationDetail);
 
-    /**
-     * 新增医保药品目录
-     * 
-     * @param medicationDetail
-     * @return
-     */
-    boolean addYbMedicatione(MedicationDetail medicationDetail);
 }

openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java

@@ -60,8 +60,5 @@ public class MedicationDefinitionServiceImpl extends ServiceImpl<MedicationDefin
         return true;
     }
 
-    @Override
-    public boolean addYbMedicatione(MedicationDetail medicationDetail) {
-        return false;
-    }
+
 }