解决合并冲突

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

@@ -169,7 +169,7 @@ public class CommonConstants {
         /**
          * 身份证号
          */
-        String idCard = "id_card";
+        String IdCard = "id_card";
 
         /**
          * 拼音码
@@ -235,6 +235,7 @@ public class CommonConstants {
          * 请求基于什么的ID
          */
         String BasedOnTable = "based_on_table";
+
         /**
          * 药品id
          */
@@ -253,11 +254,12 @@ public class CommonConstants {
         /**
          * 支付流水
          */
-        String paymentNo = "payment_no";
+        String PaymentNo = "payment_no";
         /**
          * 拼音码
          */
         String PyStr = "py_str";
+
         /**
          * 五笔码
          */
@@ -279,14 +281,15 @@ public class CommonConstants {
         String PrescriptionNo = "prescription_no";
 
         /**
-         * 机构枚举
+         * 项目分类
          */
-        String TYPE_ENUM = "type_enum";
+        String MedCategoryCode = "med_category_code";
 
         /**
          * 门诊号
          */
         String IptOtpNo = "ipt_otp_no";
+
         /**
          * 医保号
          */
@@ -315,35 +318,80 @@ public class CommonConstants {
          * 费用项id
          */
         String ChargeId = "charge_id";
+
         /**
          * 费用项时间
          */
         String ChargeTime = "charge_time";
+
         /**
-         * 采购员
+         * 审批时间
          */
         String ApplicantName = "applicant_name";
+
         /**
          * 病床
          */
         String InpatientBed = "inpatient_bed";
+
         /**
-         * 病床
+         * 预计发药时间
          */
         String PlannedDispenseTime = "planned_dispense_time";
+
         /**
          * 项目id
          */
-        String itemId = "item_id";
+        String ItemId = "item_id";
+
+        /**
+         * 项目所在表
+         */
+        String ItemTable = "item_table";
+
+        /**
+         * 项目名
+         */
+        String ItemName = "item_name";
+
         /**
          * 申请时间
          */
-        String applyTime = "apply_time";
+        String ApplyTime = "apply_time";
 
         /**
          * 校对人Id
          */
         String PerformerCheckId = "performer_check_id";
+        /**
+         * 单位
+         */
+        String UnitCode = "unit_code";
+
+        /**
+         * 住院开始时间
+         */
+        String StartTime = "start_time";
+
+        /**
+         * 数量
+         */
+        String Quantity = "quantity";
+
+        /**
+         * 所在位置
+         */
+        String LocationId = "location_id";
+
+        /**
+         * 供应商
+         */
+        String SupplierId = "supplier_id";
+
+        /**
+         * 过期天数
+         */
+        String RemainingDays = "remaining_days";
     }
 
     /**
@@ -376,6 +424,16 @@ public class CommonConstants {
          */
         String DEFAULT_CONTRACT_NO = "0000";
 
+        /**
+         * 默认合同编码
+         */
+        String DEFAULT_STUDENT_CONTRACT_NO = "STUDENT0000";
+
+        /**
+         * 默认合同编码
+         */
+        String CONTRACT_STUDENT = "STUDENT";
+
         /**
          * 皮试检查
          */

openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java

@@ -253,4 +253,20 @@ public class PromptMsgConstant {
         String M00002 = "apl.report.M00002";
 
     }
+
+    /**
+     * 修改价格
+     */
+    public interface AdjustPrice {
+
+        /**
+         * 数据异常
+         */
+        String M00001 = "apl.adjustPrice.M00001";
+        /**
+         * 已经提交过正在审核中
+         */
+        String M00002 = "apl.adjustPrice.M00002";
+
+    }
 }