Merge remote-tracking branch 'origin/master'

openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java

@@ -189,9 +189,13 @@ public class CommonConstants {
      */
     public interface DictName {
         /**
-         * 药品分类
+         * 器材
          */
         String MED_CATEGORY_CODE = "med_category_code";
+        /**
+         * 药品分类
+         */
+        String DEVICE_CATEGORY_CODE = "device_category_code";
 
     }
 

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java

@@ -49,7 +49,12 @@ public enum AssignSeqEnum {
     /**
      * 费用项目编码
      */
-    CHARGE_ITEM_NO("8", "费用项目编码", "CI");
+    CHARGE_ITEM_NO("8", "费用项目编码", "CI"),
+
+    /**
+     * 药品项目编码
+     */
+    MEDICATION_NUM("8", "药品项目编码", "MD");
 
     private final String code;
     private final String info;