后端最新版本同步

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java

@@ -8,9 +8,106 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ActivityDefCategory implements HisEnumInterface {
-    MEDICAL_SERVICE_ITEM(1, "medical_service_item", "医疗服务项"),
 
-    TREATMENT_SURGERY(2, "treatment_surgery", "手术与治疗");
+    /**
+     * 治疗
+     */
+    TREATMENT(21, "21", "治疗"),
+
+    /**
+     * 检验
+     */
+    PROOF(22, "22", "检验"),
+
+    /**
+     * 检查
+     */
+    TEST(23, "23", "检查"),
+
+    /**
+     * 手术
+     */
+    PROCEDURE(24, "24", "手术"),
+
+    /**
+     * 麻醉
+     */
+    ANESTHESIA(25, "25", "麻醉"),
+
+    /**
+     * 护理
+     */
+    NURSING(26, "26", "护理"),
+
+    /**
+     * 膳食
+     */
+    DIET(27, "27", "膳食"),
+
+    /**
+     * 输血
+     */
+    METACHYSIS(28, "28", "输血"),
+
+    /**
+     * 输氧
+     */
+    OXYGEN_THERAPY(29, "29", "输氧"),
+
+    /**
+     * 转科
+     */
+    TRANSFER(32, "32", "转科"),
+
+    /**
+     * 术后
+     */
+    POSTOPERATIVE(33, "33", "术后"),
+
+    /**
+     * 出院
+     */
+    DISCHARGE(34, "34", "出院"),
+
+    /**
+     * 转院
+     */
+    TRANSFER_HOSPITAL(35, "35", "转院"),
+
+    /**
+     * 死亡
+     */
+    death(36, "36", "死亡"),
+
+    /**
+     * 产后
+     */
+    POSTPARTUM(37, "37", "产后"),
+
+    /**
+     * 病情
+     */
+    CONDITION(38, "38", "病情"),
+
+    /**
+     * 护理常规
+     */
+    NURSING_ROUTINE(39, "39", "护理常规"),
+
+    /**
+     * 体位
+     */
+    POSITION(40, "40", "体位"),
+
+    /**
+     * 陪护
+     */
+    COMPANION_CARE(41, "41", "陪护"),
+
+    /**
+     * 隔离等级
+     */
+    ISOLATION_LEVEL(42, "42", "隔离等级");
 
     @EnumValue
     private final Integer value;

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java

@@ -6,7 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 诊断绑定类型
+ * 绑定类型
  */
 @Getter
 @AllArgsConstructor
@@ -14,7 +14,7 @@ public enum BindingType implements HisEnumInterface {
 
     PERSONAL(1, "personal", "个人"),
 
-    DEFINITION(2, "definition", "科室"),
+    ORGANIZATION(2, "organization", "科室"),
 
     HOSPITAL(3, "hospital", "全院");
 

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java

@@ -7,7 +7,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum EncounterLocationStatus implements HisEnumInterface {
+public enum EncounterActivityStatus implements HisEnumInterface {
     PLANNED(1, "planned", "已安排"),
 
     ACTIVE(2, "active", "使用中"),
@@ -21,11 +21,11 @@ public enum EncounterLocationStatus implements HisEnumInterface {
     private final String code;
     private final String info;
 
-    public static EncounterLocationStatus getByValue(Integer value) {
+    public static EncounterActivityStatus getByValue(Integer value) {
         if (value == null) {
             return null;
         }
-        for (EncounterLocationStatus val : values()) {
+        for (EncounterActivityStatus val : values()) {
             if (val.getValue().equals(value)) {
                 return val;
             }

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java

@@ -26,9 +26,9 @@ public enum RequestStatus implements HisEnumInterface {
     ACTIVE(2, "active", "已发送"),
 
     /**
-     * 已校对
+     * 已完成
      */
-    COMPLETED(3, "completed", "已校对"),
+    COMPLETED(3, "completed", "已完成"),
 
     /**
      * 暂停

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java

@@ -215,7 +215,7 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 库存明细
      */
-    INVENTORY_PRODUCT(44, "44", "库存明细");
+    INVENTORY_PRODUCT(45, "45", "库存明细");
 
     private Integer value;
     private String code;

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/medCategoryCode.java

@@ -9,7 +9,6 @@ package com.openhis.common.enums;
 
 import com.github.pagehelper.util.StringUtil;
 
-import com.openhis.common.enums.ybenums.YbDrugMedWay;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -21,7 +20,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum medCategoryCode {
+public enum MedCategoryCode {
 
     TRADITIONAL_CHINESE_MEDICINE("1", "中成药"),
 
@@ -36,11 +35,11 @@ public enum medCategoryCode {
     private String value;
     private String description;
 
-    public static medCategoryCode getByValue(String value) {
+    public static MedCategoryCode getByValue(String value) {
         if (StringUtil.isEmpty(value)) {
             return null;
         }
-        for (medCategoryCode code : values()) {
+        for (MedCategoryCode code : values()) {
             if (code.getValue().equals(value)) {
                 return code;
             }