From 4e08279485dad80cc5b74581a39e29382bb21b0e Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Thu, 27 Mar 2025 20:01:56 +0800
Subject: [PATCH] up

---
 .../web/datadictionary/dto/MedicationManageDto.java        | 2 +-
 .../web/datadictionary/dto/MedicationManageUpDto.java      | 2 +-
 .../com/openhis/medication/domain/MedicationDetail.java    | 2 +-
 .../medication/service/IMedicationDefinitionService.java   | 7 -------
 .../service/impl/MedicationDefinitionServiceImpl.java      | 5 +----
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
index 8ac5086a..5335cb29 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
+++ b/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;
 
     /** 商品名称 */
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 da09e2b9..c444465c 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
@@ -109,7 +109,7 @@ public class MedicationManageUpDto {
     private String wbStr;
 
     /** 药品分类 */
-    private Integer categoryCode;
+    private String categoryCode;
 
     /** 商品名称 */
     private String merchandiseName;
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
index 088543d2..fbf97544 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
+++ b/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;
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
index f69bf849..0ecd9358 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
+++ b/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);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
index dfc6f12f..e1dbe0b7 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
+++ b/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;
-    }
+
 }
\ No newline at end of file