From a2537c02973b7b1a55889f76ab753303c9763700 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 15 Apr 2021 11:48:05 +0800
Subject: [PATCH] 修改医生模板,修改页面的bug

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/template/imageServer_template.sql |  148 +++++++++++++++++++++++-------------------------
 1 files changed, 71 insertions(+), 77 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/template/imageServer_template.sql b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/template/imageServer_template.sql
index 9848bbc..00dfba6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/template/imageServer_template.sql
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/template/imageServer_template.sql
@@ -1,13 +1,13 @@
 CREATE TABLE `bonect`  (
   `UUID` char(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '唯一标识',
-  `OriginName` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '光片名称',
+  `OriginName` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '光片名称',
   `Sex` bit(1) NULL DEFAULT NULL COMMENT '性别。0:男,1:女',
   `Seged` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否分割。0:未分割,1:已分割',
   `AiStatus` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'AI分析结果。0:未分析,-1:无效光片,21:分析完成',
   `CreateTime` timestamp(0) NOT NULL DEFAULT current_timestamp(0) COMMENT '创建时间',
-  `ReturnTime` timestamp(0) NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '结果返回时间',
+  `ReturnTime` timestamp(0)  NULL  COMMENT '结果返回时间',
   `Returned` bit(1) NOT NULL DEFAULT b'0' COMMENT '结果是否返回。0:未返回,1:已返回',
-  `CompleteTime` timestamp(0) NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'AI分析完成时间',
+  `CompleteTime` timestamp(0)  NULL  COMMENT 'AI分析完成时间',
   `RGT1` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '-1',
   `RGT2` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '-1',
   `RGT3` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '-1',
@@ -143,7 +143,7 @@
   `Message` tinyint(4) NOT NULL DEFAULT 0 COMMENT '失败原因',
   `Source` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '来源',
   PRIMARY KEY (`UUID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'AI骨等级分析记录表' ROW_FORMAT = DYNAMIC;
+)  COMMENT = 'AI骨等级分析记录表' ;
 
 CREATE TABLE `child_info`  (
   `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '孩子唯一标识',
@@ -165,8 +165,7 @@
   `update_user_id` bigint(20) NULL COMMENT '更新数据的账号的唯一标识',
   `update_user_name` varchar(8) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新数据的用户的姓名',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `pk_id`(`id`) USING BTREE COMMENT '主键唯一索引',
-  INDEX `idx_name_birthday`(`child_name`, `child_birthday`) USING BTREE COMMENT '孩子名字和出生日的普通索引'
+  UNIQUE INDEX `pk_id`(`id`) USING BTREE COMMENT '主键唯一索引'
 ) COMMENT = '孩子档案信息表';
 
 CREATE TABLE `diagnose_record`  (
@@ -177,7 +176,7 @@
   `child_id` varchar(36) NULL COMMENT '儿童档案ID',
   `diagnose_time` date NULL COMMENT '诊断日期',
   `life_age` decimal(4, 2) NULL COMMENT '诊断时的生活年龄',
-  `xray_name` varchar(200) NULL COMMENT '光片名称',
+  `xray_name` varchar(255) NULL COMMENT '光片名称',
   `ai_id` varchar(36) NULL COMMENT 'AI业务处理ID',
   `evaluation_status` tinyint(2) NULL DEFAULT 0 COMMENT '评价状态(1:提交AI分析;2:AI分析失败;3:AI分析成功;4:提交高级分析;5:高级分析失败:6:高级分析成功;7:自主分析;8:报告采用)',
   `generate_report` tinyint(1) NULL DEFAULT 0 COMMENT '是否生成报告(0:未生成;1:已生成)',
@@ -310,80 +309,74 @@
   PRIMARY KEY (`id`)
 ) COMMENT = '合作商信息表';
 
-CREATE TABLE `product_order`  (
-  `id` bigint(20) NOT NULL COMMENT '充值记录ID',
+CREATE TABLE `order_detail`  (
+  `id` bigint(20) NOT NULL COMMENT '订单明细ID',
+  `order_id` bigint(20) NOT NULL COMMENT '订单id',
+  `product_id` bigint(20) NOT NULL COMMENT '产品ID',
+  `product_type` tinyint(1) NOT NULL COMMENT '产品类型(0:试用;1:正式)',
+  `product_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品名称',
+  `reading_count` int(6) NOT NULL DEFAULT 0 COMMENT '读片量',
+  `report_count` int(6) NOT NULL COMMENT '报告量',
+  `product_begintime` datetime(0) NULL DEFAULT NULL COMMENT '有效的开始时间',
+  `product_endtime` datetime(0) NULL DEFAULT NULL COMMENT '有效的结束时间',
+  `is_share` bit(1) NOT NULL COMMENT '是否共享 0否 1是',
+  `used_reading_count` int(6) NOT NULL DEFAULT 0 COMMENT '已用读片量',
+  `used_report_count` int(6) NULL DEFAULT 0 COMMENT '已生成报告量',
+  `validate_key` varchar(500) NULL COMMENT '服务验证串',
+  `is_del` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除,1删除,0未删除',
+  `enabled` bit(1) NULL DEFAULT b'1' COMMENT '状态,1启用,0停用',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `create_user_id` bigint(20) NOT NULL COMMENT '创建人ID',
+  `create_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人账号',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人ID',
+  `update_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人账号',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_sumption_other`(`product_id`, `order_id`) USING BTREE
+)  COMMENT = '订单(充值)明细表' ;
+
+CREATE TABLE `doctor_daily_statistics`  (
+  `id` bigint(20) NOT NULL COMMENT 'ID',
+  `hospital_id` bigint(20) NOT NULL COMMENT '医院ID',
+  `department_id` bigint(20) NOT NULL COMMENT '科室ID',
+  `doctor_id` bigint(20) NOT NULL COMMENT '医生ID',
+  `item_code` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '统计项目编码(1201:报告数量;1301:读片数量)',
+  `item_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统计项目名称',
+  `collect_date` date NOT NULL COMMENT '统计日期',
+  `item_value` bigint(20) NULL DEFAULT NULL COMMENT '统计项目数值',
+  `is_del` bit(1) NULL DEFAULT b'0' COMMENT '是否删除(0:未删除;1:已删除)',
+  `enable` bit(1) NULL DEFAULT b'1' COMMENT '是否启用(0:未启用;1:已启用)',
+  `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID',
+  `create_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者账号',
+  `create_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+  `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '更新者ID',
+  `update_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者账号',
+  `update_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) COMMENT = '医生日服务统计表';
+
+CREATE TABLE `order_record`  (
+  `id` bigint(20) NOT NULL COMMENT '订单记录ID',
   `hospital_id` bigint(20) NOT NULL COMMENT '医院标识id',
   `hospital_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '医院名称',
   `department_id` bigint(20) NOT NULL COMMENT '科室ID',
   `department_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '科室名称',
-  `contract_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同编号',
-  `contract_title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同名称',
-  `contract_begin_time` datetime(0) NULL DEFAULT NULL COMMENT '合同开始时间',
-  `contract_end_time` datetime(0) NULL DEFAULT NULL COMMENT '合同结束时间',
-  `contract_time` datetime(0) NULL DEFAULT NULL COMMENT '合同签订日期',
+  `contract_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单编号',
+  `contract_title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单名称',
+  `contract_begin_time` datetime(0) NULL DEFAULT NULL COMMENT '订单开始日期',
+  `contract_end_time` datetime(0) NULL DEFAULT NULL COMMENT '订单结束日期',
+  `contract_time` datetime(0) NULL DEFAULT NULL COMMENT '订单签订时间',
   `is_del` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除,1删除,0未删除',
   `enabled` bit(1) NULL DEFAULT b'1' COMMENT '状态,1启用,0停用',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `create_user_id` bigint(20) NOT NULL COMMENT '创建人ID',
   `create_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人账号',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人ID',
   `update_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人账号',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '租户字段',
-  `create_user_org_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者的部门',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_sumption_other`(`hospital_id`, `department_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '产品的充值记录-订单' ROW_FORMAT = DYNAMIC;
-
-CREATE TABLE `product_order_detail`  (
-  `id` bigint(20) NOT NULL COMMENT '充值订单明细ID',
-  `order_id` bigint(20) NOT NULL COMMENT '对应product_order表中的id',
-  `pro_id` bigint(20) NOT NULL COMMENT '产品/明细ID',
-  `pro_type` tinyint(1) NOT NULL COMMENT '产品类型0试用1正式',
-  `pro_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品/明细名称',
-  `is_share` bit(1) NOT NULL COMMENT '是否共享 0否 1是',
-  `is_del` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除,1删除,0未删除',
-  `ailight_count` int(6) NOT NULL DEFAULT 0 COMMENT '读片量',
-  `record_count` int(6) NOT NULL COMMENT '报告量',
-  `pro_begintime` datetime(0) NULL DEFAULT NULL COMMENT '有效的开始时间',
-  `pro_endtime` datetime(0) NULL DEFAULT NULL COMMENT '有效的结束时间',
-  `enabled` bit(1) NULL DEFAULT b'1' COMMENT '状态,1启用,0停用',
-  `create_user_id` bigint(20) NOT NULL COMMENT '创建人ID',
-  `create_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人账号',
-  `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人ID',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `update_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人账号',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '租户字段',
-  `create_user_org_code` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建者的部门',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `idx_sumption_other`(`pro_id`, `order_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '账户明细' ROW_FORMAT = DYNAMIC;
-
-CREATE TABLE `product_order_record`  (
-  `id` bigint(20) NOT NULL COMMENT '充值订单明细ID',
-  `order_id` bigint(20) NOT NULL COMMENT '对应product_order表中的id',
-  `pro_id` bigint(20) NOT NULL COMMENT '产品/明细ID',
-  `pro_type` tinyint(1) NOT NULL COMMENT '产品类型0试用1正式',
-  `pro_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品/明细名称',
-  `is_share` bit(1) NOT NULL COMMENT '是否共享 0否 1是',
-  `is_del` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除,1删除,0未删除',
-  `ailight_count` int(6) NOT NULL DEFAULT 0 COMMENT '读片量',
-  `record_count` int(6) NOT NULL COMMENT '报告量',
-  `pro_begintime` datetime(0) NULL DEFAULT NULL COMMENT '有效的开始时间',
-  `pro_endtime` datetime(0) NULL DEFAULT NULL COMMENT '有效的结束时间',
-  `enabled` bit(1) NULL DEFAULT b'1' COMMENT '状态,1启用,0停用',
-  `create_user_id` bigint(20) NOT NULL COMMENT '创建人ID',
-  `create_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人账号',
-  `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '更新人ID',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `update_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人账号',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '租户字段',
-  `create_user_org_code` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建者的部门',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `idx_sumption_other`(`pro_id`, `order_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '产品/明显的充值记录' ROW_FORMAT = DYNAMIC;
+)  COMMENT = '订单(充值)记录' ;
 
 CREATE TABLE `report_content`  (
   `id` bigint(20) NOT NULL COMMENT '唯一ID',
@@ -411,6 +404,7 @@
   `rus_bone_age` decimal(4, 2) NULL COMMENT '掌指骨骨龄',
   `rus_bone_age_twelve` varchar(50) NULL COMMENT '十二进制掌指骨骨龄',
   `rus_bone_age_percentile` varchar(8) NULL COMMENT '掌指骨骨龄百分位',
+  `rus_bone_age_score` decimal(4, 0) NULL COMMENT '掌指骨骨龄成熟度得分',
   `rg_level` varchar(5) NULL COMMENT '桡骨等级',
   `cg_level` varchar(5) NULL COMMENT '尺骨等级',
   `zgi_level` varchar(5) NULL COMMENT '掌骨I等级',
@@ -427,6 +421,7 @@
   `carpal_evaluation_method` varchar(20) NULL COMMENT '腕骨评价方法',
   `carpal_bone_age` decimal(4, 2) NULL COMMENT '腕骨骨龄',
   `carpal_bone_age_percentile` varchar(8) NULL COMMENT '腕骨骨龄百分位',
+  `carpal_bone_age_score` decimal(4, 0) NULL COMMENT '腕骨骨龄成熟度得分',
   `rus_age_resuce_capal_age_sds` varchar(8) NULL COMMENT '掌指骨骨龄减腕骨骨龄SDS',
   `tzg_level` varchar(5) NULL COMMENT '头状骨等级',
   `gg_level` varchar(5) NULL COMMENT '钩骨等级',
@@ -448,7 +443,7 @@
   PRIMARY KEY (`id`)
 ) COMMENT = '报告内容表';
 
-CREATE TABLE `server_Info`  (
+CREATE TABLE `server_info`  (
   `id` bigint(20) NOT NULL COMMENT 'ID',
   `partner_id` bigint(20) NULL COMMENT '合作商ID',
   `hospital_id` bigint(20) NULL COMMENT '医院ID',
@@ -460,7 +455,7 @@
   `machine_guid` varchar(100) NULL COMMENT '主机GUID',
   `network_card_mac` varchar(100) NULL COMMENT '网卡MAC地址',
   `hard_disk_sn` varchar(100) NULL COMMENT '硬盘序列号',
-  `application_system_unique_code` varchar(50) NULL COMMENT '应用系统唯一标识符',
+  `application_system_unique_code` varchar(500) NULL COMMENT '应用系统唯一标识符',
   `is_del` bit(1) NULL DEFAULT b'0' COMMENT '是否删除,1删除,0未删除',
   `enabled` bit(1) NULL DEFAULT b'1' COMMENT '状态,1启用,0停用 ',
   `create_user_id` bigint(20) NOT NULL COMMENT '创建人ID',
@@ -487,7 +482,7 @@
   `accounts_count` smallint(2) NOT NULL COMMENT '帐号数量 默认6',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_dep_other`(`department_name`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '科室表' ROW_FORMAT = DYNAMIC;
+) COMMENT = '科室表' ;
 
 CREATE TABLE `sys_doctor`  (
   `id` bigint(20) NOT NULL COMMENT '医生ID',
@@ -496,7 +491,7 @@
   `department_id` bigint(20) NOT NULL COMMENT '科室ID',
   `department_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '科室名称',
   `doctor_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '医生姓名',
-  `doctor_logo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'image/touxiang.png' COMMENT '医生的头像',
+  `doctor_logo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '医生的头像',
   `doctor_ccie` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '医生资质证书',
   `doctor_tel` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '医生联系方式',
   `doctor_password` varchar(50) NULL COMMENT '登录密码',
@@ -518,7 +513,7 @@
   `is_admin_user` bit(1) NULL DEFAULT b'0' COMMENT '是否管理帐号 0否1是',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_doctor_other`(`hospital_id`, `doctor_name`, `doctor_tel`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+) COMMENT = '医生信息表' ;
 
 CREATE TABLE `sys_hospital`  (
   `id` bigint(20) NOT NULL COMMENT '医院ID',
@@ -551,7 +546,6 @@
   `update_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人账号',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `idx_hospital_other`(`hospital_name`, `hospital_area`, `is_screen`, `tenant_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '医院基础信息表' ROW_FORMAT = DYNAMIC;
+  PRIMARY KEY (`id`)
+)  COMMENT = '医院基础信息表' ;
 

--
Gitblit v1.8.0