合并分支

This commit is contained in:
2025-12-10 15:22:25 +08:00
parent b863c14f2b
commit b0eb9861b9
27 changed files with 192 additions and 193 deletions

View File

@@ -66,4 +66,6 @@ public class SysTenantOption implements Serializable {
@TableField(fill = FieldFill.UPDATE)
private Date updateTime;
}

View File

@@ -102,13 +102,10 @@ public class PaymentReconciliation extends HisBaseEntity {
private String ybSettleIds;// 记录医保结算id
/** 医保清算标志 */
<<<<<<< HEAD
private Integer ybClearFlag;//默认值0 未清算
/** 退号/退费原因 */
@TableField("refund_reason")
private String refundReason;
=======
private Integer ybClearFlag;// 默认值0 未清算
>>>>>>> upstream/develop
}

View File

@@ -7,7 +7,7 @@
CACHE 1;
CREATE TABLE "public"."tmp_orders_group_package" (
CREATE TABLE "tmp_orders_group_package" (
"id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_id_seq'::regclass),
"name" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
"package_type_enum" int4 NOT NULL,
@@ -23,32 +23,32 @@ CREATE TABLE "public"."tmp_orders_group_package" (
)
;
ALTER TABLE "public"."tmp_orders_group_package"
ALTER TABLE "tmp_orders_group_package"
OWNER TO "postgres";
COMMENT ON COLUMN "public"."tmp_orders_group_package"."id" IS 'ID';
COMMENT ON COLUMN "tmp_orders_group_package"."id" IS 'ID';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."name" IS '名称';
COMMENT ON COLUMN "tmp_orders_group_package"."name" IS '名称';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."package_type_enum" IS '组套包类型';
COMMENT ON COLUMN "tmp_orders_group_package"."package_type_enum" IS '组套包类型';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."organization_id" IS '科室id';
COMMENT ON COLUMN "tmp_orders_group_package"."organization_id" IS '科室id';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."practitioner_id" IS '参与者id';
COMMENT ON COLUMN "tmp_orders_group_package"."practitioner_id" IS '参与者id';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "tmp_orders_group_package"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "tmp_orders_group_package"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_by" IS '创建人';
COMMENT ON COLUMN "tmp_orders_group_package"."create_by" IS '创建人';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_time" IS '创建时间';
COMMENT ON COLUMN "tmp_orders_group_package"."create_time" IS '创建时间';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_by" IS '更新人';
COMMENT ON COLUMN "tmp_orders_group_package"."update_by" IS '更新人';
COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_time" IS '更新时间';
COMMENT ON COLUMN "tmp_orders_group_package"."update_time" IS '更新时间';
COMMENT ON TABLE "public"."tmp_orders_group_package" IS '医嘱组合套餐';
COMMENT ON TABLE "tmp_orders_group_package" IS '医嘱组合套餐';
-- 插入添加临时订单分组包表的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -7,7 +7,7 @@
CACHE 1;
CREATE TABLE "public"."tmp_orders_group_package_detail" (
CREATE TABLE "tmp_orders_group_package_detail" (
"id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_detail_id_seq'::regclass),
"group_package_id" int8 NOT NULL,
"order_definition_id" int8 NOT NULL,
@@ -24,34 +24,34 @@ CREATE TABLE "public"."tmp_orders_group_package_detail" (
)
;
ALTER TABLE "public"."tmp_orders_group_package_detail"
ALTER TABLE "tmp_orders_group_package_detail"
OWNER TO "postgres";
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."id" IS 'ID';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."id" IS 'ID';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."group_package_id" IS '组合套餐id';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."group_package_id" IS '组合套餐id';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_id" IS '医嘱定义id';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."order_definition_id" IS '医嘱定义id';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_table" IS '医嘱定义表名';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."order_definition_table" IS '医嘱定义表名';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."quantity" IS '数量';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."quantity" IS '数量';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."unit_code" IS '单位编码';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."unit_code" IS '单位编码';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_by" IS '创建人';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."create_by" IS '创建人';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_time" IS '创建时间';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."create_time" IS '创建时间';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_by" IS '更新人';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."update_by" IS '更新人';
COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_time" IS '更新时间';
COMMENT ON COLUMN "tmp_orders_group_package_detail"."update_time" IS '更新时间';
COMMENT ON TABLE "public"."tmp_orders_group_package_detail" IS '医嘱组合套餐明细';
COMMENT ON TABLE "tmp_orders_group_package_detail" IS '医嘱组合套餐明细';
-- 插入添加临时订单分组包详情表的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -1,6 +1,6 @@
ALTER TABLE "public"."adm_practitioner"
ALTER TABLE "adm_practitioner"
ADD COLUMN "signature" text COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
COMMENT ON COLUMN "public"."adm_practitioner"."signature" IS '签名图片';
COMMENT ON COLUMN "adm_practitioner"."signature" IS '签名图片';
-- 插入为adm_practitioner表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -1,7 +1,7 @@
ALTER TABLE "public"."wor_service_request"
ALTER TABLE "wor_service_request"
ADD COLUMN "parent_id" int8 DEFAULT NULL;
COMMENT ON COLUMN "public"."wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
COMMENT ON COLUMN "wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
-- 插入为wor_service_request表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -1,7 +1,7 @@
ALTER TABLE "public"."cli_reservation_record"
ALTER TABLE "cli_reservation_record"
ADD COLUMN "tooth_position" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
COMMENT ON COLUMN "public"."cli_reservation_record"."tooth_position" IS '牙位';
COMMENT ON COLUMN "cli_reservation_record"."tooth_position" IS '牙位';
-- 插入为cli_reservation_record表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -1,6 +1,6 @@
ALTER TABLE "public"."tmp_activity_device"
ALTER TABLE "tmp_activity_device"
ADD COLUMN "unit_code" varchar(3) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
COMMENT ON COLUMN "public"."tmp_activity_device"."unit_code" IS '单位';
COMMENT ON COLUMN "tmp_activity_device"."unit_code" IS '单位';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -9,7 +9,7 @@
CACHE 1;
CREATE TABLE "public"."nd_review_prescription_records" (
CREATE TABLE "nd_review_prescription_records" (
"id" int8 NOT NULL DEFAULT nextval('nd_review_prescription_records_id_seq'::regclass),
"prescription_no" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
"encounter_id" int8 DEFAULT NULL,
@@ -27,36 +27,36 @@ CREATE TABLE "public"."nd_review_prescription_records" (
)
;
ALTER TABLE "public"."nd_review_prescription_records"
ALTER TABLE "nd_review_prescription_records"
OWNER TO "postgres";
COMMENT ON COLUMN "public"."nd_review_prescription_records"."id" IS 'ID';
COMMENT ON COLUMN "nd_review_prescription_records"."id" IS 'ID';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."prescription_no" IS '处方号';
COMMENT ON COLUMN "nd_review_prescription_records"."prescription_no" IS '处方号';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."encounter_id" IS '就诊id';
COMMENT ON COLUMN "nd_review_prescription_records"."encounter_id" IS '就诊id';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."med_request_ids" IS '药品请求ids';
COMMENT ON COLUMN "nd_review_prescription_records"."med_request_ids" IS '药品请求ids';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."pass_flag" IS '通过标识';
COMMENT ON COLUMN "nd_review_prescription_records"."pass_flag" IS '通过标识';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."reason_text" IS '原因';
COMMENT ON COLUMN "nd_review_prescription_records"."reason_text" IS '原因';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."practitioner_id" IS '审方人id';
COMMENT ON COLUMN "nd_review_prescription_records"."practitioner_id" IS '审方人id';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "nd_review_prescription_records"."tenant_id" IS '租户ID';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "nd_review_prescription_records"."delete_flag" IS '删除状态';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."create_by" IS '创建人';
COMMENT ON COLUMN "nd_review_prescription_records"."create_by" IS '创建人';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."create_time" IS '创建时间';
COMMENT ON COLUMN "nd_review_prescription_records"."create_time" IS '创建时间';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."update_by" IS '更新人';
COMMENT ON COLUMN "nd_review_prescription_records"."update_by" IS '更新人';
COMMENT ON COLUMN "public"."nd_review_prescription_records"."update_time" IS '更新时间';
COMMENT ON COLUMN "nd_review_prescription_records"."update_time" IS '更新时间';
COMMENT ON TABLE "public"."nd_review_prescription_records" IS '农大审方记录';
COMMENT ON TABLE "nd_review_prescription_records" IS '农大审方记录';

View File

@@ -1,10 +1,10 @@
ALTER TABLE "public"."doc_statistics_definition"
ALTER TABLE "doc_statistics_definition"
ADD COLUMN "dict_name" varchar(50),
ADD COLUMN "dict_type" varchar(50);
COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_name" IS '字典名称';
COMMENT ON COLUMN "doc_statistics_definition"."dict_name" IS '字典名称';
COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_type" IS '字典类型';
COMMENT ON COLUMN "doc_statistics_definition"."dict_type" IS '字典类型';

View File

@@ -1,10 +1,10 @@
ALTER TABLE "public"."elep_medication_request"
ALTER TABLE "elep_medication_request"
ADD COLUMN "condition_def_id" int8,
ADD COLUMN "opsp_dise_code" varchar(255);
COMMENT ON COLUMN "public"."elep_medication_request"."condition_def_id" IS '诊断定义id';
COMMENT ON COLUMN "elep_medication_request"."condition_def_id" IS '诊断定义id';
COMMENT ON COLUMN "public"."elep_medication_request"."opsp_dise_code" IS '慢病编码';
COMMENT ON COLUMN "elep_medication_request"."opsp_dise_code" IS '慢病编码';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,5 +1,5 @@
ALTER TABLE public.adm_charge_item ADD procedure_id int8 NULL;
COMMENT ON COLUMN public.adm_charge_item.procedure_id IS '执行id';
ALTER TABLE adm_charge_item ADD procedure_id int8 NULL;
COMMENT ON COLUMN adm_charge_item.procedure_id IS '执行id';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,20 +1,20 @@
ALTER TABLE public.wor_device_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN public.wor_device_request.based_on_table IS '请求基于什么';
ALTER TABLE wor_device_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN wor_device_request.based_on_table IS '请求基于什么';
ALTER TABLE public.wor_device_request ADD based_on_id int8 NULL;
COMMENT ON COLUMN public.wor_device_request.based_on_id IS '请求基于什么的ID';
ALTER TABLE wor_device_request ADD based_on_id int8 NULL;
COMMENT ON COLUMN wor_device_request.based_on_id IS '请求基于什么的ID';
ALTER TABLE public.wor_device_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN public.wor_device_dispense.procedure_id IS '执行id';
ALTER TABLE wor_device_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN wor_device_dispense.procedure_id IS '执行id';
ALTER TABLE public.med_medication_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN public.med_medication_request.based_on_table IS '请求基于什么';
ALTER TABLE med_medication_request ADD based_on_table varchar(255) NULL;
COMMENT ON COLUMN med_medication_request.based_on_table IS '请求基于什么';
ALTER TABLE public.med_medication_request ADD based_on_id int8 NULL;
COMMENT ON COLUMN public.med_medication_request.based_on_id IS '请求基于什么的ID';
ALTER TABLE med_medication_request ADD based_on_id int8 NULL;
COMMENT ON COLUMN med_medication_request.based_on_id IS '请求基于什么的ID';
ALTER TABLE public.med_medication_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN public.med_medication_dispense.procedure_id IS '执行id';
ALTER TABLE med_medication_dispense ADD procedure_id int8 NULL;
COMMENT ON COLUMN med_medication_dispense.procedure_id IS '执行id';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,6 +1,6 @@
CREATE TABLE PUBLIC.cli_condition_no_definition (
CREATE TABLE cli_condition_no_definition (
gl_no VARCHAR (255) NULL,
id bigserial NOT NULL,
tenant_id INT8 NULL,
@@ -13,19 +13,19 @@ CREATE TABLE PUBLIC.cli_condition_no_definition (
icd10_no VARCHAR (255) NULL,
icd10_name VARCHAR (255) NULL
);
COMMENT ON TABLE PUBLIC.cli_condition_no_definition IS '诊断各种编码定义表';
COMMENT ON TABLE cli_condition_no_definition IS '诊断各种编码定义表';
-- Column comments
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_no IS '国临疾病编码';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.id IS 'ID';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.tenant_id IS '租户id';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.delete_flag IS '删除状态';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_by IS '创建人';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_time IS '创建时间';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_by IS '更新人';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_time IS '更新时间';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_name IS '国临疾病名称';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_no IS 'icd10编码';
COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_name IS 'icd10名称';
COMMENT ON COLUMN cli_condition_no_definition.gl_no IS '国临疾病编码';
COMMENT ON COLUMN cli_condition_no_definition.id IS 'ID';
COMMENT ON COLUMN cli_condition_no_definition.tenant_id IS '租户id';
COMMENT ON COLUMN cli_condition_no_definition.delete_flag IS '删除状态';
COMMENT ON COLUMN cli_condition_no_definition.create_by IS '创建人';
COMMENT ON COLUMN cli_condition_no_definition.create_time IS '创建时间';
COMMENT ON COLUMN cli_condition_no_definition.update_by IS '更新人';
COMMENT ON COLUMN cli_condition_no_definition.update_time IS '更新时间';
COMMENT ON COLUMN cli_condition_no_definition.gl_name IS '国临疾病名称';
COMMENT ON COLUMN cli_condition_no_definition.icd10_no IS 'icd10编码';
COMMENT ON COLUMN cli_condition_no_definition.icd10_name IS 'icd10名称';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,18 +1,18 @@
ALTER TABLE public.tmp_orders_group_package_detail ADD dose numeric(20,6) NULL;
COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose IS '单次剂量';
ALTER TABLE tmp_orders_group_package_detail ADD dose numeric(20,6) NULL;
COMMENT ON COLUMN tmp_orders_group_package_detail.dose IS '单次剂量';
ALTER TABLE public.tmp_orders_group_package_detail ADD rate_code varchar(255) NULL;
COMMENT ON COLUMN public.tmp_orders_group_package_detail.rate_code IS '用药频次';
ALTER TABLE tmp_orders_group_package_detail ADD rate_code varchar(255) NULL;
COMMENT ON COLUMN tmp_orders_group_package_detail.rate_code IS '用药频次';
ALTER TABLE public.tmp_orders_group_package_detail ADD dispense_per_duration int4 NULL;
COMMENT ON COLUMN public.tmp_orders_group_package_detail.dispense_per_duration IS '用药天数';
ALTER TABLE tmp_orders_group_package_detail ADD dispense_per_duration int4 NULL;
COMMENT ON COLUMN tmp_orders_group_package_detail.dispense_per_duration IS '用药天数';
ALTER TABLE public.tmp_orders_group_package_detail ADD method_code varchar(255) NULL;
COMMENT ON COLUMN public.tmp_orders_group_package_detail.method_code IS '给药途径';
ALTER TABLE tmp_orders_group_package_detail ADD method_code varchar(255) NULL;
COMMENT ON COLUMN tmp_orders_group_package_detail.method_code IS '给药途径';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,5 +1,5 @@
ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
ALTER TABLE med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
COMMENT ON COLUMN med_medication_dispense.summary_no IS '汇总编号';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,5 +1,5 @@
ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
ALTER TABLE med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
COMMENT ON COLUMN med_medication_dispense.summary_no IS '汇总编号';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,4 +1,4 @@
ALTER TABLE public.wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
ALTER TABLE wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,5 +1,5 @@
ALTER TABLE public.tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
ALTER TABLE tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
COMMENT ON COLUMN tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,9 +1,9 @@
ALTER TABLE public.med_medication_definition ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN public.med_medication_definition.dosage_instruction IS '用药说明';
ALTER TABLE med_medication_definition ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN med_medication_definition.dosage_instruction IS '用药说明';
ALTER TABLE public.med_medication_request ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN public.med_medication_request.dosage_instruction IS '用药说明';
ALTER TABLE med_medication_request ADD dosage_instruction varchar(255) NULL;
COMMENT ON COLUMN med_medication_request.dosage_instruction IS '用药说明';
-- 插入为tmp_activity_device表添加列的迁移记录

View File

@@ -1,11 +1,11 @@
ALTER TABLE public.med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN public.med_medication_request.generate_source_enum IS '生成来源';
ALTER TABLE med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN med_medication_request.generate_source_enum IS '生成来源';
ALTER TABLE public.wor_device_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN public.wor_device_request.generate_source_enum IS '生成来源';
ALTER TABLE wor_device_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN wor_device_request.generate_source_enum IS '生成来源';
ALTER TABLE public.wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN public.wor_service_request.generate_source_enum IS '生成来源';
ALTER TABLE wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
COMMENT ON COLUMN wor_service_request.generate_source_enum IS '生成来源';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)

View File

@@ -1,7 +1,7 @@
ALTER TABLE "public"."adm_practitioner"
ALTER TABLE "adm_practitioner"
ADD COLUMN "pos_no" varchar(255) DEFAULT '';
COMMENT ON COLUMN "public"."adm_practitioner"."pos_no" IS 'pos机编号';
COMMENT ON COLUMN "adm_practitioner"."pos_no" IS 'pos机编号';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202510281101 add_column_adm_practitioner', '1.0.0');

View File

@@ -1,7 +1,7 @@
ALTER TABLE "public"."adm_healthcare_service"
ALTER TABLE "adm_healthcare_service"
ADD COLUMN "bus_no" varchar(255);
COMMENT ON COLUMN "public"."adm_healthcare_service"."bus_no" IS '编码';
COMMENT ON COLUMN "adm_healthcare_service"."bus_no" IS '编码';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202510301113 add_column adm_healthcare_service', '1.0.0');

View File

@@ -1,5 +1,5 @@
ALTER TABLE public.tmp_orders_group_package_detail ADD group_id int8 NULL;
COMMENT ON COLUMN public.tmp_orders_group_package_detail.group_id IS '组号';
ALTER TABLE tmp_orders_group_package_detail ADD group_id int8 NULL;
COMMENT ON COLUMN tmp_orders_group_package_detail.group_id IS '组号';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202511031415 add_column tmp_orders_group_package_detail', '1.0.0');

View File

@@ -1,8 +1,8 @@
ALTER TABLE public.adm_charge_item ADD dispense_table varchar(255) DEFAULT ''::character varying NULL;
COMMENT ON COLUMN public.adm_charge_item.dispense_table IS '发放所在表';
ALTER TABLE adm_charge_item ADD dispense_table varchar(255) DEFAULT ''::character varying NULL;
COMMENT ON COLUMN adm_charge_item.dispense_table IS '发放所在表';
ALTER TABLE public.adm_charge_item ADD dispense_id int8 NULL;
COMMENT ON COLUMN public.adm_charge_item.dispense_id IS '发放ID';
ALTER TABLE adm_charge_item ADD dispense_id int8 NULL;
COMMENT ON COLUMN adm_charge_item.dispense_id IS '发放ID';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202511031515 add_column adm_charge_item', '1.0.0');

View File

@@ -1,50 +1,50 @@
-- public.doc_inventory_item_static definition
-- doc_inventory_item_static definition
-- Drop table
-- DROP TABLE public.doc_inventory_item_static;
-- DROP TABLE doc_inventory_item_static;
CREATE TABLE public.doc_inventory_item_static ( id bigserial NOT NULL, category_code varchar(255) DEFAULT '0'::character varying NOT NULL, "name" varchar(255) DEFAULT ''::character varying NOT NULL, inventory_status_enum int4 DEFAULT 0 NOT NULL, supplier_id int8 NOT NULL, description_text varchar(2000) NULL, unit_code varchar(255) DEFAULT ''::character varying NOT NULL, quantity numeric(20, 6) DEFAULT 0 NOT NULL, lot_number varchar(255) DEFAULT ''::character varying NOT NULL, production_date timestamptz(6) NULL, expiration_date timestamptz(6) NULL, location_store_id int8 NULL, location_id int8 NOT NULL, trace_no varchar(50000) DEFAULT ''::character varying NOT NULL, packaging_levels int4 DEFAULT 1 NOT NULL, tenant_id int8 NOT NULL, delete_flag int4 DEFAULT 0 NOT NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar(32) NULL, update_time timestamptz(6) NULL, item_table varchar(255) DEFAULT ''::character varying NOT NULL, item_id int8 NOT NULL, price numeric(20, 6) NULL, sale_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NOT NULL, min_unit_code varchar(255) DEFAULT ''::character varying NOT NULL, part_percent numeric(20, 6) DEFAULT 0 NOT NULL, supplier_name varchar(255) DEFAULT ''::character varying NOT NULL, location_name varchar(255) DEFAULT ''::character varying NOT NULL, location_store_name varchar(255) DEFAULT ''::character varying NOT NULL, manufacturer_text varchar(2000) NULL, chrgitm_lv int4 DEFAULT 3 NOT NULL, total_volume varchar(255) DEFAULT ''::character varying NOT NULL, py_str varchar(255) DEFAULT ''::character varying NOT NULL, wb_str varchar(255) DEFAULT ''::character varying NOT NULL, CONSTRAINT doc_inventory_item_static_pkey PRIMARY KEY (id));
COMMENT ON TABLE public.doc_inventory_item_static IS '库存项目管理';
CREATE TABLE doc_inventory_item_static ( id bigserial NOT NULL, category_code varchar(255) DEFAULT '0'::character varying NOT NULL, "name" varchar(255) DEFAULT ''::character varying NOT NULL, inventory_status_enum int4 DEFAULT 0 NOT NULL, supplier_id int8 NOT NULL, description_text varchar(2000) NULL, unit_code varchar(255) DEFAULT ''::character varying NOT NULL, quantity numeric(20, 6) DEFAULT 0 NOT NULL, lot_number varchar(255) DEFAULT ''::character varying NOT NULL, production_date timestamptz(6) NULL, expiration_date timestamptz(6) NULL, location_store_id int8 NULL, location_id int8 NOT NULL, trace_no varchar(50000) DEFAULT ''::character varying NOT NULL, packaging_levels int4 DEFAULT 1 NOT NULL, tenant_id int8 NOT NULL, delete_flag int4 DEFAULT 0 NOT NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar(32) NULL, update_time timestamptz(6) NULL, item_table varchar(255) DEFAULT ''::character varying NOT NULL, item_id int8 NOT NULL, price numeric(20, 6) NULL, sale_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NOT NULL, min_unit_code varchar(255) DEFAULT ''::character varying NOT NULL, part_percent numeric(20, 6) DEFAULT 0 NOT NULL, supplier_name varchar(255) DEFAULT ''::character varying NOT NULL, location_name varchar(255) DEFAULT ''::character varying NOT NULL, location_store_name varchar(255) DEFAULT ''::character varying NOT NULL, manufacturer_text varchar(2000) NULL, chrgitm_lv int4 DEFAULT 3 NOT NULL, total_volume varchar(255) DEFAULT ''::character varying NOT NULL, py_str varchar(255) DEFAULT ''::character varying NOT NULL, wb_str varchar(255) DEFAULT ''::character varying NOT NULL, CONSTRAINT doc_inventory_item_static_pkey PRIMARY KEY (id));
COMMENT ON TABLE doc_inventory_item_static IS '库存项目管理';
-- Column comments
COMMENT ON COLUMN public.doc_inventory_item_static.id IS 'ID';
COMMENT ON COLUMN public.doc_inventory_item_static.category_code IS '物品类别';
COMMENT ON COLUMN public.doc_inventory_item_static."name" IS '名称';
COMMENT ON COLUMN public.doc_inventory_item_static.inventory_status_enum IS '库存状态';
COMMENT ON COLUMN public.doc_inventory_item_static.supplier_id IS '供应商id';
COMMENT ON COLUMN public.doc_inventory_item_static.description_text IS '说明书';
COMMENT ON COLUMN public.doc_inventory_item_static.unit_code IS '最小单位';
COMMENT ON COLUMN public.doc_inventory_item_static.quantity IS '当前库存数量(最小单位数量)';
COMMENT ON COLUMN public.doc_inventory_item_static.lot_number IS '产品批号';
COMMENT ON COLUMN public.doc_inventory_item_static.production_date IS '生产日期';
COMMENT ON COLUMN public.doc_inventory_item_static.expiration_date IS '失效日期';
COMMENT ON COLUMN public.doc_inventory_item_static.location_store_id IS '库位';
COMMENT ON COLUMN public.doc_inventory_item_static.location_id IS '仓库';
COMMENT ON COLUMN public.doc_inventory_item_static.trace_no IS '追溯码';
COMMENT ON COLUMN public.doc_inventory_item_static.packaging_levels IS '追溯码包装层级';
COMMENT ON COLUMN public.doc_inventory_item_static.tenant_id IS '租户ID';
COMMENT ON COLUMN public.doc_inventory_item_static.delete_flag IS '删除状态';
COMMENT ON COLUMN public.doc_inventory_item_static.create_by IS '创建人';
COMMENT ON COLUMN public.doc_inventory_item_static.create_time IS '创建时间';
COMMENT ON COLUMN public.doc_inventory_item_static.update_by IS '更新人';
COMMENT ON COLUMN public.doc_inventory_item_static.update_time IS '更新时间';
COMMENT ON COLUMN public.doc_inventory_item_static.item_table IS '项目';
COMMENT ON COLUMN public.doc_inventory_item_static.item_id IS '物品编码';
COMMENT ON COLUMN public.doc_inventory_item_static.price IS '采购单价(包装单位)';
COMMENT ON COLUMN public.doc_inventory_item_static.sale_price IS '销售单价(包装单位)';
COMMENT ON COLUMN public.doc_inventory_item_static.bus_no IS '项目编号';
COMMENT ON COLUMN public.doc_inventory_item_static.min_unit_code IS '最小单位';
COMMENT ON COLUMN public.doc_inventory_item_static.part_percent IS '拆零比';
COMMENT ON COLUMN public.doc_inventory_item_static.supplier_name IS '供应商名称';
COMMENT ON COLUMN public.doc_inventory_item_static.location_name IS '库房名称';
COMMENT ON COLUMN public.doc_inventory_item_static.location_store_name IS '货位名称';
COMMENT ON COLUMN public.doc_inventory_item_static.manufacturer_text IS '生产厂商文本';
COMMENT ON COLUMN public.doc_inventory_item_static.chrgitm_lv IS '医保等级';
COMMENT ON COLUMN public.doc_inventory_item_static.total_volume IS '规格';
COMMENT ON COLUMN public.doc_inventory_item_static.py_str IS '药品名称拼音码';
COMMENT ON COLUMN public.doc_inventory_item_static.wb_str IS '药品五笔码';
COMMENT ON COLUMN doc_inventory_item_static.id IS 'ID';
COMMENT ON COLUMN doc_inventory_item_static.category_code IS '物品类别';
COMMENT ON COLUMN doc_inventory_item_static."name" IS '名称';
COMMENT ON COLUMN doc_inventory_item_static.inventory_status_enum IS '库存状态';
COMMENT ON COLUMN doc_inventory_item_static.supplier_id IS '供应商id';
COMMENT ON COLUMN doc_inventory_item_static.description_text IS '说明书';
COMMENT ON COLUMN doc_inventory_item_static.unit_code IS '最小单位';
COMMENT ON COLUMN doc_inventory_item_static.quantity IS '当前库存数量(最小单位数量)';
COMMENT ON COLUMN doc_inventory_item_static.lot_number IS '产品批号';
COMMENT ON COLUMN doc_inventory_item_static.production_date IS '生产日期';
COMMENT ON COLUMN doc_inventory_item_static.expiration_date IS '失效日期';
COMMENT ON COLUMN doc_inventory_item_static.location_store_id IS '库位';
COMMENT ON COLUMN doc_inventory_item_static.location_id IS '仓库';
COMMENT ON COLUMN doc_inventory_item_static.trace_no IS '追溯码';
COMMENT ON COLUMN doc_inventory_item_static.packaging_levels IS '追溯码包装层级';
COMMENT ON COLUMN doc_inventory_item_static.tenant_id IS '租户ID';
COMMENT ON COLUMN doc_inventory_item_static.delete_flag IS '删除状态';
COMMENT ON COLUMN doc_inventory_item_static.create_by IS '创建人';
COMMENT ON COLUMN doc_inventory_item_static.create_time IS '创建时间';
COMMENT ON COLUMN doc_inventory_item_static.update_by IS '更新人';
COMMENT ON COLUMN doc_inventory_item_static.update_time IS '更新时间';
COMMENT ON COLUMN doc_inventory_item_static.item_table IS '项目';
COMMENT ON COLUMN doc_inventory_item_static.item_id IS '物品编码';
COMMENT ON COLUMN doc_inventory_item_static.price IS '采购单价(包装单位)';
COMMENT ON COLUMN doc_inventory_item_static.sale_price IS '销售单价(包装单位)';
COMMENT ON COLUMN doc_inventory_item_static.bus_no IS '项目编号';
COMMENT ON COLUMN doc_inventory_item_static.min_unit_code IS '最小单位';
COMMENT ON COLUMN doc_inventory_item_static.part_percent IS '拆零比';
COMMENT ON COLUMN doc_inventory_item_static.supplier_name IS '供应商名称';
COMMENT ON COLUMN doc_inventory_item_static.location_name IS '库房名称';
COMMENT ON COLUMN doc_inventory_item_static.location_store_name IS '货位名称';
COMMENT ON COLUMN doc_inventory_item_static.manufacturer_text IS '生产厂商文本';
COMMENT ON COLUMN doc_inventory_item_static.chrgitm_lv IS '医保等级';
COMMENT ON COLUMN doc_inventory_item_static.total_volume IS '规格';
COMMENT ON COLUMN doc_inventory_item_static.py_str IS '药品名称拼音码';
COMMENT ON COLUMN doc_inventory_item_static.wb_str IS '药品五笔码';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202511041214 add_table doc_inventory_item_static', '1.0.0');

View File

@@ -1,38 +1,38 @@
-- public.adm_change_price_record definition
-- adm_change_price_record definition
-- Drop table
-- DROP TABLE public.adm_change_price_record;
-- DROP TABLE adm_change_price_record;
CREATE TABLE public.adm_change_price_record ( id bigserial NOT NULL, location_id int8 NULL, applicant_id int8 NULL, item_category_enum int4 NULL, item_id int8 NULL, origin_buying_price numeric(20, 6) NULL, origin_retail_price numeric(20, 6) NULL, approver_id int8 NULL, approval_time timestamptz(6) NULL, tenant_id int8 NULL, delete_flag bpchar(1) DEFAULT '0' NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar NULL, update_time timestamptz(6) NULL, item_quantity numeric(20, 6) NULL, difference_retail_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NULL, description varchar(255) NULL, applicant_time timestamptz NULL, item_table varchar(50) DEFAULT ''::character varying NULL, new_buying_price numeric(20, 6) NULL, new_retail_price numeric(20, 6) NULL, unit_code varchar(255) DEFAULT ''::character varying NULL, status_enum int4 DEFAULT 0 NULL, lot_number varchar(255) DEFAULT ''::character varying NULL, reason varchar(2000) NULL, difference_buying_price numeric(20, 6) NULL, CONSTRAINT adm_change_price_record_pkey PRIMARY KEY (id));
COMMENT ON TABLE public.adm_change_price_record IS '修改价格记录表';
CREATE TABLE adm_change_price_record ( id bigserial NOT NULL, location_id int8 NULL, applicant_id int8 NULL, item_category_enum int4 NULL, item_id int8 NULL, origin_buying_price numeric(20, 6) NULL, origin_retail_price numeric(20, 6) NULL, approver_id int8 NULL, approval_time timestamptz(6) NULL, tenant_id int8 NULL, delete_flag bpchar(1) DEFAULT '0' NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar NULL, update_time timestamptz(6) NULL, item_quantity numeric(20, 6) NULL, difference_retail_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NULL, description varchar(255) NULL, applicant_time timestamptz NULL, item_table varchar(50) DEFAULT ''::character varying NULL, new_buying_price numeric(20, 6) NULL, new_retail_price numeric(20, 6) NULL, unit_code varchar(255) DEFAULT ''::character varying NULL, status_enum int4 DEFAULT 0 NULL, lot_number varchar(255) DEFAULT ''::character varying NULL, reason varchar(2000) NULL, difference_buying_price numeric(20, 6) NULL, CONSTRAINT adm_change_price_record_pkey PRIMARY KEY (id));
COMMENT ON TABLE adm_change_price_record IS '修改价格记录表';
-- Column comments
COMMENT ON COLUMN public.adm_change_price_record.id IS '本表id';
COMMENT ON COLUMN public.adm_change_price_record.location_id IS '批次号';
COMMENT ON COLUMN public.adm_change_price_record.applicant_id IS '改价申请人id';
COMMENT ON COLUMN public.adm_change_price_record.item_category_enum IS '目标枚举 药品、耗材、诊疗、挂号';
COMMENT ON COLUMN public.adm_change_price_record.item_id IS '药品ID、耗材ID、诊疗ID、挂号ID';
COMMENT ON COLUMN public.adm_change_price_record.origin_buying_price IS '原进货价';
COMMENT ON COLUMN public.adm_change_price_record.origin_retail_price IS '原新价格';
COMMENT ON COLUMN public.adm_change_price_record.approver_id IS '审批人ID';
COMMENT ON COLUMN public.adm_change_price_record.approval_time IS '审批时间';
COMMENT ON COLUMN public.adm_change_price_record.tenant_id IS '租户ID';
COMMENT ON COLUMN public.adm_change_price_record.delete_flag IS '删除标识 默认 0 未删除';
COMMENT ON COLUMN public.adm_change_price_record.item_quantity IS '当前品库存量';
COMMENT ON COLUMN public.adm_change_price_record.difference_retail_price IS '零售价盈负差';
COMMENT ON COLUMN public.adm_change_price_record.bus_no IS '当前业务批次号';
COMMENT ON COLUMN public.adm_change_price_record.description IS '改价原因';
COMMENT ON COLUMN public.adm_change_price_record.applicant_time IS '改价申请时间';
COMMENT ON COLUMN public.adm_change_price_record.item_table IS '业务表名药品、耗材、诊疗、挂号';
COMMENT ON COLUMN public.adm_change_price_record.new_buying_price IS '新进货价';
COMMENT ON COLUMN public.adm_change_price_record.new_retail_price IS '新零售价';
COMMENT ON COLUMN public.adm_change_price_record.unit_code IS '物品计量单位';
COMMENT ON COLUMN public.adm_change_price_record.status_enum IS '审批状态';
COMMENT ON COLUMN public.adm_change_price_record.lot_number IS '批次号';
COMMENT ON COLUMN public.adm_change_price_record.reason IS '条件理由';
COMMENT ON COLUMN public.adm_change_price_record.difference_buying_price IS '进货价盈负差';
COMMENT ON COLUMN adm_change_price_record.id IS '本表id';
COMMENT ON COLUMN adm_change_price_record.location_id IS '批次号';
COMMENT ON COLUMN adm_change_price_record.applicant_id IS '改价申请人id';
COMMENT ON COLUMN adm_change_price_record.item_category_enum IS '目标枚举 药品、耗材、诊疗、挂号';
COMMENT ON COLUMN adm_change_price_record.item_id IS '药品ID、耗材ID、诊疗ID、挂号ID';
COMMENT ON COLUMN adm_change_price_record.origin_buying_price IS '原进货价';
COMMENT ON COLUMN adm_change_price_record.origin_retail_price IS '原新价格';
COMMENT ON COLUMN adm_change_price_record.approver_id IS '审批人ID';
COMMENT ON COLUMN adm_change_price_record.approval_time IS '审批时间';
COMMENT ON COLUMN adm_change_price_record.tenant_id IS '租户ID';
COMMENT ON COLUMN adm_change_price_record.delete_flag IS '删除标识 默认 0 未删除';
COMMENT ON COLUMN adm_change_price_record.item_quantity IS '当前品库存量';
COMMENT ON COLUMN adm_change_price_record.difference_retail_price IS '零售价盈负差';
COMMENT ON COLUMN adm_change_price_record.bus_no IS '当前业务批次号';
COMMENT ON COLUMN adm_change_price_record.description IS '改价原因';
COMMENT ON COLUMN adm_change_price_record.applicant_time IS '改价申请时间';
COMMENT ON COLUMN adm_change_price_record.item_table IS '业务表名药品、耗材、诊疗、挂号';
COMMENT ON COLUMN adm_change_price_record.new_buying_price IS '新进货价';
COMMENT ON COLUMN adm_change_price_record.new_retail_price IS '新零售价';
COMMENT ON COLUMN adm_change_price_record.unit_code IS '物品计量单位';
COMMENT ON COLUMN adm_change_price_record.status_enum IS '审批状态';
COMMENT ON COLUMN adm_change_price_record.lot_number IS '批次号';
COMMENT ON COLUMN adm_change_price_record.reason IS '条件理由';
COMMENT ON COLUMN adm_change_price_record.difference_buying_price IS '进货价盈负差';
-- 插入为tmp_activity_device表添加列的迁移记录
INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
VALUES ('202511051215 add_table adm_change_price_record', '1.0.0');