提交merge1.3

This commit is contained in:
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions

View File

@@ -1,6 +1,10 @@
<<<<<<< HEAD
CREATE TABLE cli_condition_no_definition (
=======
CREATE TABLE PUBLIC.cli_condition_no_definition (
>>>>>>> v1.3
gl_no VARCHAR (255) NULL,
id bigserial NOT NULL,
tenant_id INT8 NULL,
@@ -13,6 +17,7 @@ CREATE TABLE cli_condition_no_definition (
icd10_no VARCHAR (255) NULL,
icd10_name VARCHAR (255) NULL
);
<<<<<<< HEAD
COMMENT ON TABLE cli_condition_no_definition IS '诊断各种编码定义表';
-- Column comments
COMMENT ON COLUMN cli_condition_no_definition.gl_no IS '国临疾病编码';
@@ -26,6 +31,21 @@ 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名称';
=======
COMMENT ON TABLE PUBLIC.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名称';
>>>>>>> v1.3
-- 插入为tmp_activity_device表添加列的迁移记录