fix(watch,consultation,db): 修复达梦数据库兼容性及 SQL 脚本问题

- 将 ArchivesBodyTypeMapper.xml 中的双引号字符串 \"5\" 改为单引号 '5'，修复达梦数据库语法兼容问题
- 更新 ConDoctorMapper.java（具体变更见 diff）
- 更新 consult.sql 数据库脚本

db/xcsql/consult.sql

@@ -14,6 +14,7 @@ DROP TABLE IF EXISTS CON_HOSPITAL_FOLLOW_QH;
 DROP TABLE IF EXISTS CON_MEDICAL_RECORDS_QH;
 DROP TABLE IF EXISTS CON_SESSION_QH;
 
+
 -- 修改表名
 ALTER TABLE CON_COST_LOG RENAME TO QH_CON_COST_LOG;
 ALTER TABLE CON_COST_STATISTICS RENAME TO QH_CON_COST_STAT;
@@ -65,3 +66,5 @@ ALTER TABLE IM_MSG_RECORD_ALL RENAME TO QH_CON_IM_MSG_ALL;
 -- 修改表字段（触发关键字了）
 ALTER TABLE QH_CON_EVALUATE RENAME COLUMN "CONTEXT" TO EVA_CONTEXT;
 ALTER TABLE QH_CON_RESOURCE RENAME COLUMN "LEVEL" TO RESOURCE_LEVEL;
+
+DROP TABLE IF EXISTS QH_CON_HEALTH_CHD;

db/xcsql/watch.sql

@@ -49,4 +49,10 @@ ALTER TABLE "WATCH_STAT_USER_INFO_DAY_STRESS" RENAME TO "QH_WAT_STAT_USER_DAY_ST
 ALTER TABLE "WATCH_STAT_USER_INFO_DAY_TEMP" RENAME TO "QH_WAT_STAT_USER_DAY_TEMP";
 ALTER TABLE "WATCH_STAT_USER_INFO_DAY_WORKOUT" RENAME TO "QH_WAT_STAT_USER_DAY_WORK";
 ALTER TABLE "WATCH_SYN_MAX_ID" RENAME TO "QH_WAT_SYN_MAX_ID";
-ALTER TABLE "WATCH_USER_DATA" RENAME TO "QH_WAT_USER_DATA";
+ALTER TABLE "WATCH_USER_DATA" RENAME TO "QH_WAT_USER_DATA";
+
+
+DROP TABLE "QH_WAT_BIND_HIS_BAK";
+DROP TABLE "QH_WAT_BIND_HIS_COPY1";
+DROP TABLE "QH_WAT_BIND_HIS_COPY2";
+DROP TABLE "QH_WAT_ABNORMAL_RECORD";

db/xcsql/更新表解释.sql

@@ -0,0 +1,436 @@
+-- 咨询相关表
+COMMENT ON TABLE QH_CON_COST_LOG IS '咨询消费日志表';
+COMMENT ON TABLE QH_CON_COST_STAT IS '资金明细表';
+COMMENT ON TABLE QH_CON_DEPT IS '科室表';
+COMMENT ON TABLE QH_CON_DOCTOR IS '医生信息表';
+COMMENT ON TABLE QH_CON_DOC_CARD IS '专家银行卡表';
+COMMENT ON TABLE QH_CON_DOC_CHG_LOG IS '专家信息更改日志表';
+COMMENT ON TABLE QH_CON_DOC_FOLLOW IS '关注专家信息表';
+COMMENT ON TABLE QH_CON_DOC_SATISFY IS '专家评价信息表';
+COMMENT ON TABLE QH_CON_DOC_SCHD IS '专家排版信息表';
+COMMENT ON TABLE QH_CON_DOC_SCHD_DT IS '专家调度信息表';
+COMMENT ON TABLE QH_CON_EVALUATE IS '评价表';
+COMMENT ON TABLE QH_CON_FAMMEM IS '家庭成员信息表';
+COMMENT ON TABLE QH_CON_HABIT_PARM IS '生活习惯参数表';
+COMMENT ON TABLE QH_CON_HEALTH IS '健康信息表';
+COMMENT ON TABLE QH_CON_HEALTH_ANS IS '健康信息答案表';
+COMMENT ON TABLE QH_CON_HELPER IS '小助手表';
+COMMENT ON TABLE QH_CON_HELPER_ONLN IS '小助手班次';
+COMMENT ON TABLE QH_CON_HELPER_REST IS '小助手休息时间表';
+COMMENT ON TABLE QH_CON_HELPER_SCHD IS '小助手排班表';
+COMMENT ON TABLE QH_CON_HELPER_SCHD_HIS IS '小助手排班历史';
+COMMENT ON TABLE QH_CON_HOSP_DEPT IS '医院关联科室表';
+COMMENT ON TABLE QH_CON_HOSP_FOLLOW IS '关注医院信息表';
+COMMENT ON TABLE QH_CON_IM_GRP_SYNC IS '群组消息同步表';
+COMMENT ON TABLE QH_CON_IM_MSG_ALL IS 'IM消息表';
+COMMENT ON TABLE QH_CON_IM_MSG_RDLOG IS 'IM消息已读日志';
+COMMENT ON TABLE QH_CON_KNOW IS '知识库表';
+COMMENT ON TABLE QH_CON_KNOW_CATE IS '知识库分类';
+COMMENT ON TABLE QH_CON_MEDREC IS '病历档案表';
+COMMENT ON TABLE QH_CON_NOTICE IS '咨询须知';
+COMMENT ON TABLE QH_CON_PAUSE_SRVC IS '停诊表';
+COMMENT ON TABLE QH_CON_PHRASES IS '常用语表';
+COMMENT ON TABLE QH_CON_PROPOSE IS '建议反馈表';
+COMMENT ON TABLE QH_CON_RESOURCE IS '医院信息表';
+COMMENT ON TABLE QH_CON_SCHD IS '排班表';
+COMMENT ON TABLE QH_CON_SESSION IS '会话信息表';
+COMMENT ON TABLE QH_CON_SESS_RESV_DT IS '咨询预约时间';
+COMMENT ON TABLE QH_CON_SESS_VID IS '音视频咨询信息表';
+COMMENT ON TABLE QH_CON_SICKS IS '疾病信息表';
+COMMENT ON TABLE QH_CON_SRVC IS '停诊表';
+COMMENT ON TABLE QH_CON_STL_CFG_COST IS '结算费用配置表';
+COMMENT ON TABLE QH_CON_STL_CFG_PRD IS '结算周期配置表';
+COMMENT ON TABLE QH_CON_STL_MAIN IS '结算主表';
+COMMENT ON TABLE QH_CON_STL_RSLT IS '结算结果汇总表';
+COMMENT ON TABLE QH_CON_STL_RSLT_ITM IS '结算订单明细表';
+COMMENT ON TABLE QH_CON_STL_RSLT_PRD IS '结算结果月明细表';
+
+-- 应急相关表
+COMMENT ON TABLE QH_EME_AED IS '应急资源表';
+COMMENT ON TABLE QH_EME_AED_EQUIP_MAINTAIN IS 'aed设备维护表';
+COMMENT ON TABLE QH_EME_AED_EQUIP_MANGER IS '应急资源表';
+COMMENT ON TABLE QH_EME_AED_EQUIP_RETRAIN IS 'aed复训记录表';
+COMMENT ON TABLE QH_EME_AED_EQUIP_TRAIN IS 'aed设备现场培训、演练表';
+COMMENT ON TABLE QH_EME_AED_LATEST IS '最新AED信息';
+COMMENT ON TABLE QH_EME_AED_LOC_EQUIP IS 'aed设备布点位置表';
+COMMENT ON TABLE QH_EME_AED_USE_RECORD IS 'aed应用记录表';
+COMMENT ON TABLE QH_EME_AED_WARN_INFO IS 'AED告警信息';
+COMMENT ON TABLE QH_EME_AMBUL_DATA IS '紫云救护车数据表';
+COMMENT ON TABLE QH_EME_CENTER IS '应急中心列表';
+COMMENT ON TABLE QH_EME_CENTER_ADMIN IS '管理员/大屏管理员表';
+COMMENT ON TABLE QH_EME_CENTER_OPEN_TIME IS '应急中心工作时间配置';
+COMMENT ON TABLE QH_EME_CENTER_RESOUR IS '应急中心资源';
+COMMENT ON TABLE QH_EME_GROUPED IS '分组管理表';
+COMMENT ON TABLE QH_EME_HEALTH_ROOM IS '健康小屋信息';
+COMMENT ON TABLE QH_EME_NEW_SCHEDULES IS '排班表';
+COMMENT ON TABLE QH_EME_NOTIF_SMS_PHONE IS '通知短信接收配置';
+COMMENT ON TABLE QH_EME_ORDER IS '应急单基础表';
+COMMENT ON TABLE QH_EME_ORDER_DETAIL IS '应急单详情表';
+COMMENT ON TABLE QH_EME_ORDER_INTERVENE IS '应急单基础表';
+COMMENT ON TABLE QH_EME_ORDER_OPERATOR IS '应急单处理信息表';
+COMMENT ON TABLE QH_EME_ORDER_SEND_REC IS '派单记录表';
+COMMENT ON TABLE QH_EME_PROFESS_USER IS '专业人员信息表';
+COMMENT ON TABLE QH_EME_QIMO_NOTICE IS '容联七陌通知信息';
+COMMENT ON TABLE QH_EME_RESOURCE IS '应急资源表';
+COMMENT ON TABLE QH_EME_SCHED_CUSTOM IS '自定义排班表';
+COMMENT ON TABLE QH_EME_SCHED_DEFAULT IS '默认排班表';
+COMMENT ON TABLE QH_EME_SCHED_NEW_ITEM IS '排班分表';
+COMMENT ON TABLE QH_EME_SCHED_RECORD IS '自定义排班表';
+COMMENT ON TABLE QH_EME_SCRN_ANIMAT IS '应急大屏开屏动画';
+COMMENT ON TABLE QH_EME_SCRN_DATA IS '应急大屏数据配置';
+COMMENT ON TABLE QH_EME_SERIOUS_DIS IS '大病就医';
+COMMENT ON TABLE QH_EME_USER_HELP IS '用户求助信息';
+COMMENT ON TABLE QH_EME_XJ_AED IS '新疆AED信息';
+
+-- 通用导入导出
+COMMENT ON TABLE QH_COM_EXPORTS_INFO IS '通用导入导出主表';
+COMMENT ON TABLE QH_COM_EXPORTS_ITEM IS '通用导入导出子表';
+COMMENT ON TABLE QH_COM_IMPORTS IS '导入文件信息';
+COMMENT ON TABLE QH_COM_IMPORTS_DETAIL IS '导入文件详细';
+
+-- 健康/医院扩展表
+COMMENT ON TABLE QH_HLT_CONSULT_RESOURCE IS '医院信息表';
+COMMENT ON TABLE QH_HLT_DOCTOR_EX IS '专家信息表';
+COMMENT ON TABLE QH_HLT_HOLIDAY IS '法定假期信息';
+COMMENT ON TABLE QH_HLT_USER_EMPLOYEE_EX IS '员工信息表';
+COMMENT ON TABLE QH_HLT_USER_OPERATOR_EX IS '(操作/专业)人员库扩展信息表';
+
+-- 系统表（注意：QH_SYS_LOG 出现多次，只保留一次）
+COMMENT ON TABLE QH_SYS_ANNOUNCEMENT IS '系统通告表';
+COMMENT ON TABLE QH_SYS_ANNOUNCEMENT_SEND IS '用户通告阅读标记表';
+COMMENT ON TABLE QH_SYS_BANNER IS '轮播图信息';
+COMMENT ON TABLE QH_SYS_CATEGORY IS '分类字典信息';
+COMMENT ON TABLE QH_SYS_CHECK_RULE IS '检查规则信息';
+COMMENT ON TABLE QH_SYS_COMMENT IS '系统评论回复表';
+COMMENT ON TABLE QH_SYS_CONFIG IS '参数配置表';
+COMMENT ON TABLE QH_SYS_DATA_LOG IS '数据日志';
+COMMENT ON TABLE QH_SYS_DATA_SOURCE IS '数据源信息';
+COMMENT ON TABLE QH_SYS_DEPART IS '组织机构表';
+COMMENT ON TABLE QH_SYS_DEPART_GPS IS '部门位置信息';
+COMMENT ON TABLE QH_SYS_DEPART_PERMISSION IS '部门权限表';
+COMMENT ON TABLE QH_SYS_DEPART_ROLE IS '部门角色表';
+COMMENT ON TABLE QH_SYS_DEPART_ROLE_USER IS '部门角色用户表';
+COMMENT ON TABLE QH_SYS_DEPT_CHG_APPLY IS '员工转部门申请表';
+COMMENT ON TABLE QH_SYS_DEPT_ROLE_PERM IS '部门角色权限表';
+COMMENT ON TABLE QH_SYS_DICT IS '字典信息表';
+COMMENT ON TABLE QH_SYS_DICT_ITEM IS '字典信息子表';
+COMMENT ON TABLE QH_SYS_FILES IS '知识库-文档管理';
+COMMENT ON TABLE QH_SYS_FILL_RULE IS '填值规则信息';
+COMMENT ON TABLE QH_SYS_GATEWAY_ROUTE IS '网关路由信息';
+COMMENT ON TABLE QH_SYS_LOG IS '系统日志表';
+COMMENT ON TABLE QH_SYS_MSG_NOTICE IS '消息通知表';
+COMMENT ON TABLE QH_SYS_MSG_NOTICE_SCOPE IS '消息通知范围表';
+COMMENT ON TABLE QH_SYS_MSG_REMIND IS '消息公告信息';
+COMMENT ON TABLE QH_SYS_NOTICE IS '通知表';
+COMMENT ON TABLE QH_SYS_NOTICE_READ_RECORD IS '公告已读记录表';
+COMMENT ON TABLE QH_SYS_PERMISSION IS '菜单权限表';
+COMMENT ON TABLE QH_SYS_PERM_DATA_RULE IS '数据权限表';
+COMMENT ON TABLE QH_SYS_POSITION IS '用户岗位信息表';
+COMMENT ON TABLE QH_SYS_POSITION_CLASSIFY IS '岗位分类信息表';
+COMMENT ON TABLE QH_SYS_QUARTZ_JOB IS '任务信息表';
+COMMENT ON TABLE QH_SYS_ROLE IS '角色表';
+COMMENT ON TABLE QH_SYS_ROLE_INDEX IS '角色首页表';
+COMMENT ON TABLE QH_SYS_ROLE_PERMISSION IS '角色权限表';
+COMMENT ON TABLE QH_SYS_SMS IS '短信信息';
+COMMENT ON TABLE QH_SYS_SMS_TEMPLATE IS '短信模板信息';
+COMMENT ON TABLE QH_SYS_TENANT IS '多租户信息表';
+COMMENT ON TABLE QH_SYS_USER IS '用户表';
+COMMENT ON TABLE QH_SYS_USER_AGENT IS '用户代理人设置';
+COMMENT ON TABLE QH_SYS_USER_DEPART IS '用户单位信息';
+COMMENT ON TABLE QH_SYS_USER_DEVICE IS '用户设备信息';
+COMMENT ON TABLE QH_SYS_USER_POST IS '用户岗位信息';
+COMMENT ON TABLE QH_SYS_USER_ROLE IS '用户角色表';
+COMMENT ON TABLE QH_SYS_USER_TENANT IS '用户租户关系表';
+COMMENT ON TABLE QH_SYS_USR_EMERG_CONTACT IS '紧急联系人表';
+COMMENT ON TABLE QH_SYS_USR_FAMILY_MBR IS '用户家庭成员关系表';
+COMMENT ON TABLE QH_SYS_VERSION_APP IS 'APP版本信息';
+COMMENT ON TABLE QH_SYS_VERSION_INFO IS 'APP版本详情';
+
+-- 可穿戴设备（手表）相关表
+COMMENT ON TABLE QH_WAT_ARCHIVES_BODY_TYPE IS '用户体格信息';
+COMMENT ON TABLE QH_WAT_BIND_HIS IS '设备绑定历史';
+COMMENT ON TABLE QH_WAT_DATA IS '设备监测数据';
+COMMENT ON TABLE QH_WAT_DATA_CALORIE IS '卡路里数据';
+COMMENT ON TABLE QH_WAT_DATA_DAY IS '日数据统计信息';
+COMMENT ON TABLE QH_WAT_DATA_DETAIL IS '监测数据详细';
+COMMENT ON TABLE QH_WAT_DATA_DISTANCE IS '距离数据信息';
+COMMENT ON TABLE QH_WAT_DATA_ECG IS '手表心电数据';
+COMMENT ON TABLE QH_WAT_DATA_EXERCISE IS '运动强度数据信息';
+COMMENT ON TABLE QH_WAT_DATA_GPS IS '位置监测信息';
+COMMENT ON TABLE QH_WAT_DATA_HEART_RATE IS '心率数据信息';
+COMMENT ON TABLE QH_WAT_DATA_SLEEP IS '睡眠数据信息';
+COMMENT ON TABLE QH_WAT_DATA_SLEEP_NEW IS '科学睡眠数据信息';
+COMMENT ON TABLE QH_WAT_DATA_SLEEP_NEW_DAY IS '科学睡眠日数据信息';
+COMMENT ON TABLE QH_WAT_DATA_SLEEP_NEW_ERR IS '科学睡眠错误数据信息';
+COMMENT ON TABLE QH_WAT_DATA_SLEEP_NEW_MIN IS '科学睡眠详细数据信息';
+COMMENT ON TABLE QH_WAT_DATA_SPO2 IS '血氧数据信息';
+COMMENT ON TABLE QH_WAT_DATA_STEPS IS '步数数据信息';
+COMMENT ON TABLE QH_WAT_DATA_STEPS_HF IS '步数同步数据信息';
+COMMENT ON TABLE QH_WAT_DATA_STRESS IS '压力数据信息';
+COMMENT ON TABLE QH_WAT_DATA_TEMP IS '体温数据信息';
+COMMENT ON TABLE QH_WAT_DATA_WORKOUT IS '运动数据信息';
+COMMENT ON TABLE QH_WAT_DATA_WORKOUT_TRACE IS '运动轨迹数据信息';
+COMMENT ON TABLE QH_WAT_DEPART_REPORT IS '部门报告记录表';
+COMMENT ON TABLE QH_WAT_DEPT_STAT_DATA IS '部门统计数据信息';
+COMMENT ON TABLE QH_WAT_DEVICE IS '监测设备信息';
+COMMENT ON TABLE QH_WAT_DEVICE_SWITCH IS '监测设备开关信息';
+COMMENT ON TABLE QH_WAT_KEY_USER IS '监测设备用户键值';
+COMMENT ON TABLE QH_WAT_MONITOR_DATA IS '告警监测数据信息';
+COMMENT ON TABLE QH_WAT_MONITOR_MOBILE IS '告警监测短信配置';
+COMMENT ON TABLE QH_WAT_MQTT_NOTICE IS 'MQTT消息通知信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_HR IS '用户日心率统计信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_SDC IS '用户日步数统计信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_SLE IS '用户日睡眠统计信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_SPO2 IS '用户日血氧统计信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_STRE IS '用户日压力统计信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_TEMP IS '用户日体温统计信息';
+COMMENT ON TABLE QH_WAT_STAT_USER_DAY_WORK IS '用户日运动统计信息';
+COMMENT ON TABLE QH_WAT_SYN_MAX_ID IS '监测数据同步最大值信息';
+COMMENT ON TABLE QH_WAT_USER_DATA IS '用户监测数据信息';
+COMMENT ON TABLE QH_WAT_USER_REC_SPORT_DAY IS '用户自主记录运动数据日汇总表';
+COMMENT ON TABLE QH_WAT_USER_REC_SPORT_INF IS '用户自主记录运动数据明细表';
+COMMENT ON TABLE QH_WAT_USER_WECH_SPO_DAY IS '用户其他运动日统计信息';
+
+
+
+-- 手表数据相关表（QH_DAT_WATCH_*）
+COMMENT ON TABLE QH_DAT_WATCH_EXERCISE IS '手表运动强度数据';
+COMMENT ON TABLE QH_DAT_WATCH_GPS IS '手表GPS数据';
+COMMENT ON TABLE QH_DAT_WATCH_LOG IS '手表数据日志';
+COMMENT ON TABLE QH_DAT_WATCH_SLEEP_NEWDAY IS '手表睡眠日数据';
+COMMENT ON TABLE QH_DAT_WATCH_SLEEP_NEWMIN IS '手表睡眠分钟数据';
+COMMENT ON TABLE QH_DAT_WATCH_SDC_ITEM IS '手表步数距离卡路里数据明细';
+COMMENT ON TABLE QH_DAT_WATCH_SLEEP_NEW IS '手表睡眠数据';
+COMMENT ON TABLE QH_DAT_WATCH_STEP_NEW IS '步数信息表NEW';
+COMMENT ON TABLE QH_DAT_WATCH_SLEEP IS '手表睡眠数据(旧版)';
+COMMENT ON TABLE QH_DAT_WATCH_WORKOUT_TRAC IS '手表运动轨迹数据';
+COMMENT ON TABLE QH_DAT_WATCH_EME_MOBILE IS '手表应急电话信息';
+COMMENT ON TABLE QH_DAT_WATCH_STEP IS '步数信息表';
+COMMENT ON TABLE QH_DAT_WATCH_DEVICE_SWIT IS '手表开关信息';
+COMMENT ON TABLE QH_DAT_WATCH_ERROR_LOG IS '手表错误日志上传信息';
+COMMENT ON TABLE QH_DAT_WATCH_TASKS_CYCLE IS '手表测量频率配置';
+COMMENT ON TABLE QH_DAT_WATCH_STAT_MAX_ID IS '手表各类型数据同步位点记录表';
+COMMENT ON TABLE QH_DAT_WATCH_STAT_TODAY IS '手表每日数据统计表';
+COMMENT ON TABLE QH_DAT_WATCH_TASK IS '手表任务配置信息';
+COMMENT ON TABLE QH_DAT_WATCH_NOTIFY IS '手表异步通知配置';
+COMMENT ON TABLE QH_DAT_WATCH_DEVICE IS '手表基础数据';
+COMMENT ON TABLE QH_DAT_WATCH_VERSION_HIS IS '手表固件版本历史信息';
+COMMENT ON TABLE QH_DAT_WATCH_SET_INFO IS '设备当前设置值';
+COMMENT ON TABLE QH_DAT_WATCH_MONITOR_STRE IS 'watch5压力告警信息';
+COMMENT ON TABLE QH_DAT_WATCH_PERIOD IS '手表阈值默认设置';
+COMMENT ON TABLE QH_DAT_WATCH_WARN_FLAG IS '预警开关默认表';
+COMMENT ON TABLE QH_DAT_WATCH_TASKS_PRI IS '上传频次设置表';
+COMMENT ON TABLE QH_DAT_WATCH_TASKS IS '手表定时任务配置表';
+COMMENT ON TABLE QH_DAT_WATCH_WORKOUT IS '手表运动数据';
+COMMENT ON TABLE QH_DAT_WATCH_PERIOD_PRI IS '手表阈值个性化设置';
+COMMENT ON TABLE QH_DAT_WATCH_MONITOR_SPO2 IS 'watch5血氧告警信息';
+COMMENT ON TABLE QH_DAT_WATCH_NET_TYPE_LOG IS '网络切换日志';
+COMMENT ON TABLE QH_DAT_WATCH_WARN_PRI IS '预警开关个性话配置表';
+COMMENT ON TABLE QH_DAT_WATCH_ECG IS '手表心电数据';
+COMMENT ON TABLE QH_DAT_WATCH_ECG_ITEM IS '手表心电数据明细表';
+COMMENT ON TABLE QH_DAT_WATCH_MQTT_LOG IS '手表MQTT数据日志';
+COMMENT ON TABLE QH_DAT_WATCH5_SLEEP IS 'watch5睡眠数据';
+COMMENT ON TABLE QH_DAT_WATCH_MONITOR_TEMP IS 'watch5体温告警信息';
+COMMENT ON TABLE QH_DAT_WATCH_SDC_JSON IS '手表步数距离卡路里详细数据';
+COMMENT ON TABLE QH_DAT_WATCH_SLEEP_NEWERR IS '手表睡眠数据错误数据';
+COMMENT ON TABLE QH_DAT_WATCH_MONITOR_HR IS 'watch5心率告警信息';
+COMMENT ON TABLE QH_DAT_WATCH_SDC IS '手表步数距离卡路里日数据';
+COMMENT ON TABLE QH_DAT_WATCH_MONITOR IS '手表异常监听数据';
+COMMENT ON TABLE QH_DAT_WATCH_STAT_ALL IS '手表全量累计统计数据表';
+COMMENT ON TABLE QH_DAT_WATCH_NOTIFY_LOG IS '手表异步通知历史';
+COMMENT ON TABLE QH_DAT_WATCH5_SLEEP_DETA IS 'watch5睡眠数据详细';
+COMMENT ON TABLE QH_DAT_WATCH_STRESS IS '手表压力数据';
+COMMENT ON TABLE QH_DAT_WATCH_SPO2 IS '手表血氧数据';
+COMMENT ON TABLE QH_DAT_WATCH_TEMPERATURE IS '手表体温数据';
+COMMENT ON TABLE QH_DAT_WATCH_HEART_RATE IS '手表心率数据';
+
+-- SYW 系统模块表（可能是另一个子系统）
+COMMENT ON TABLE QH_SYW_DATA_LOG IS '数据日志';
+COMMENT ON TABLE QH_SYW_DEPART_PERMISSION IS '部门权限表';
+COMMENT ON TABLE QH_SYW_DEPART_ROLE IS '部门角色表';
+COMMENT ON TABLE QH_SYW_DEPART_ROLE_PERM IS '部门角色权限表';
+COMMENT ON TABLE QH_SYW_DEPART_ROLE_USER IS '部门角色用户表';
+COMMENT ON TABLE QH_SYW_PERMISSION_DRULE IS '菜单数据权限信息';
+COMMENT ON TABLE QH_SYW_USER_POSITION IS '用户职务信息表';
+COMMENT ON TABLE QH_SYW_ROLE_INDEX IS '角色首页表';
+COMMENT ON TABLE QH_SYW_DEPART IS '组织机构表';
+COMMENT ON TABLE QH_SYW_POSITION IS '职务信息表';
+COMMENT ON TABLE QH_SYW_FILL_RULE IS '数据规则信息表';
+COMMENT ON TABLE QH_SYW_ROLE IS '角色表';
+COMMENT ON TABLE QH_SYW_USER_DEPART IS '用户部门关联表';
+COMMENT ON TABLE QH_SYW_USER IS '用户表';
+COMMENT ON TABLE QH_SYW_GATEWAY_ROUTE IS '网关信息表';
+COMMENT ON TABLE QH_SYW_USER_ROLE IS '用户角色表';
+COMMENT ON TABLE QH_SYW_SMS_TEMPLATE IS '短信模板表';
+COMMENT ON TABLE QH_SYW_SMS IS '短信信息表';
+COMMENT ON TABLE QH_SYW_ANNOUNCEMENT_SEND IS '用户通告阅读标记表';
+COMMENT ON TABLE QH_SYW_ANNOUNCEMENT IS '系统通告表';
+COMMENT ON TABLE QH_SYW_CATEGORY IS '分类信息';
+COMMENT ON TABLE QH_SYW_DICT IS '数据字典';
+COMMENT ON TABLE QH_SYW_DICT_ITEM IS '数据字典子表';
+COMMENT ON TABLE QH_SYW_ROLE_PERMISSION IS '角色权限表';
+COMMENT ON TABLE QH_SYW_PERMISSION IS '菜单权限表';
+COMMENT ON TABLE QH_SYW_LOG IS '系统日志表';
+
+
+-- 表列更新
+COMMENT ON COLUMN "QH_COM_EXPORTS_INFO"."HANDLE_MSG" IS '处理详情';
+COMMENT ON COLUMN "QH_COM_EXPORTS_INFO"."EXPORT_MSG" IS '导出提示信息';
+COMMENT ON COLUMN "QH_COM_EXPORTS_ITEM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_COM_IMPORTS_DETAIL"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_DOC_CHG_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_DOC_FOLLOW"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_DOC_FOLLOW"."USER_ID" IS '用户ID';
+COMMENT ON COLUMN "QH_CON_DOC_FOLLOW"."DOCTOR_ID" IS '专家ID';
+COMMENT ON COLUMN "QH_CON_DOC_SATISFY"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_DOC_SATISFY"."SHOW_SCORE" IS '分数';
+COMMENT ON COLUMN "QH_CON_DOC_SCHD"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_DOC_SCHD"."WEEK" IS '周';
+COMMENT ON COLUMN "QH_CON_DOC_SCHD_DT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_EVALUATE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_HABIT_PARM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_HEALTH_ANS"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_HEALTH_ANS"."NAME" IS '问题名称';
+COMMENT ON COLUMN "QH_CON_HELPER_REST"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_HOSP_DEPT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_HOSP_DEPT"."DEPARTMENT_ID" IS '科室ID';
+COMMENT ON COLUMN "QH_CON_HOSP_DEPT"."HOSPITAL_ID" IS '医院ID';
+COMMENT ON COLUMN "QH_CON_HOSP_DEPT"."SORT" IS '排序序号';
+COMMENT ON COLUMN "QH_CON_HOSP_FOLLOW"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_IM_MSG_ALL"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_KNOW_CATE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_KNOW_CATE"."NAME" IS '分类名称';
+COMMENT ON COLUMN "QH_CON_KNOW_CATE"."SORT" IS '排序序号';
+COMMENT ON COLUMN "QH_CON_MEDREC"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_NOTICE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_NOTICE"."CONTENT" IS '内容';
+COMMENT ON COLUMN "QH_CON_PAUSE_SRVC"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_SCHD"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_SESSION"."DOCTOR_JOB" IS '职称';
+COMMENT ON COLUMN "QH_CON_SESSION"."DOCTOR_TYPE" IS '专家类型';
+COMMENT ON COLUMN "QH_CON_SESSION"."DOCTOR_STATUS" IS '专家状态';
+COMMENT ON COLUMN "QH_CON_SESS_RESV_DT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_SESS_RESV_DT"."SESSION_ID" IS 'session主键';
+COMMENT ON COLUMN "QH_CON_SESS_RESV_DT"."START_TIME" IS '咨询开始时间';
+COMMENT ON COLUMN "QH_CON_SESS_RESV_DT"."END_TIME" IS '咨询结束时间';
+COMMENT ON COLUMN "QH_CON_SESS_VID"."ID" IS '主键';
+COMMENT ON COLUMN "QH_CON_SESS_VID"."SESSION_ID" IS 'session主键';
+COMMENT ON COLUMN "QH_CON_SESS_VID"."IM_ID" IS 'IM主键';
+COMMENT ON COLUMN "QH_DAT_WATCH5_SLEEP"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH5_SLEEP_DETA"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_DEVICE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_DEVICE_SWIT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_ECG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_ECG_ITEM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_EME_MOBILE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_ERROR_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_EXERCISE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_GPS"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_HEART_RATE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_MONITOR"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_MONITOR"."WARN_TIME" IS '告警时间';
+COMMENT ON COLUMN "QH_DAT_WATCH_MONITOR_HR"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_MONITOR_SPO2"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_MONITOR_STRE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_MONITOR_TEMP"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_MQTT_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_NET_TYPE_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_NOTIFY"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_NOTIFY_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_PERIOD"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_PERIOD_PRI"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SDC"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SDC_ITEM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SDC_JSON"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SET_INFO"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SLEEP"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SLEEP_NEW"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SLEEP_NEWDAY"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SLEEP_NEWERR"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SLEEP_NEWMIN"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_SPO2"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_STAT_TODAY"."DATA_DATE" IS '数据日期';
+COMMENT ON COLUMN "QH_DAT_WATCH_STEP"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_STEP_NEW"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_STRESS"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_TASK"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_TASKS"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_TASKS_CYCLE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_TASKS_PRI"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_TEMPERATURE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_VERSION_HIS"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_WARN_FLAG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_WARN_PRI"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_WORKOUT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_DAT_WATCH_WORKOUT_TRAC"."ID" IS '主键';
+COMMENT ON COLUMN "QH_EME_CENTER_RESOUR"."ID" IS '主键';
+COMMENT ON COLUMN "QH_EME_QIMO_NOTICE"."RINGING_TIMESTAMP" IS '响铃时间戳';
+COMMENT ON COLUMN "QH_HLT_USER_EMPLOYEE_EX"."EMP_JOB" IS '员工职务';
+COMMENT ON COLUMN "QH_HLT_USER_EMPLOYEE_EX"."MEDICAL_HAZARD_FACTOR_OTHER" IS '其他接害因素';
+COMMENT ON COLUMN "QH_HLT_USER_EMPLOYEE_EX"."MEDICAL_WORK_TYPE_OTHER" IS '其他工种';
+COMMENT ON COLUMN "QH_SYS_ANNOUNCEMENT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_ANNOUNCEMENT_SEND"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_BANNER"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_CATEGORY"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_COMMENT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DATA_SOURCE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DEPART_PERMISSION"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DEPART_ROLE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DEPT_ROLE_PERM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DICT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DICT_ITEM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_DICT_ITEM"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "QH_SYS_DICT_ITEM"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "QH_SYS_DICT_ITEM"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "QH_SYS_DICT_ITEM"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "QH_SYS_GATEWAY_ROUTE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_PERM_DATA_RULE"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "QH_SYS_POSITION"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_QUARTZ_JOB"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_ROLE_INDEX"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_ROLE_PERMISSION"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYS_SMS"."ES_RECEIVER" IS '接收人';
+COMMENT ON COLUMN "QH_SYS_SMS"."REMARK" IS '备注';
+COMMENT ON COLUMN "QH_SYS_SMS"."NOTICE_ID" IS '公告ID';
+COMMENT ON COLUMN "QH_SYS_SMS"."TEMPLATE_CODE" IS '模板编码';
+COMMENT ON COLUMN "QH_SYS_USER_DEVICE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_ANNOUNCEMENT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_ANNOUNCEMENT_SEND"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_CATEGORY"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_DATA_LOG"."CREATE_NAME" IS '创建人';
+COMMENT ON COLUMN "QH_SYW_DEPART_PERMISSION"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_DEPART_ROLE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_DEPART_ROLE_PERM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_DICT"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_DICT_ITEM"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_DICT_ITEM"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "QH_SYW_DICT_ITEM"."CREATE_TIME" IS '创建时间';
+COMMENT ON COLUMN "QH_SYW_DICT_ITEM"."UPDATE_BY" IS '更新人';
+COMMENT ON COLUMN "QH_SYW_DICT_ITEM"."UPDATE_TIME" IS '更新时间';
+COMMENT ON COLUMN "QH_SYW_DICT_ITEM"."ITEM_COLOR" IS '字典项颜色';
+COMMENT ON COLUMN "QH_SYW_GATEWAY_ROUTE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_LOG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_PERMISSION_DRULE"."CREATE_BY" IS '创建人';
+COMMENT ON COLUMN "QH_SYW_POSITION"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_ROLE_INDEX"."ID" IS '主键';
+COMMENT ON COLUMN "QH_SYW_ROLE_PERMISSION"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DATA_ECG"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DATA_SLEEP_NEW"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DATA_SLEEP_NEW_DAY"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DATA_SLEEP_NEW_ERR"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DATA_SLEEP_NEW_MIN"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DATA_SLEEP_NEW_MIN"."SLEEP_TYPE" IS '睡眠类型';
+COMMENT ON COLUMN "QH_WAT_DATA_WORKOUT_TRACE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_DEVICE_SWITCH"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_MONITOR_MOBILE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_HR"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_SDC"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_SLE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_SPO2"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_STRE"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_TEMP"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_STAT_USER_DAY_WORK"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_SYN_MAX_ID"."ID" IS '主键';
+COMMENT ON COLUMN "QH_WAT_USER_DATA"."ID" IS '主键';

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorMapper.java

@@ -195,21 +195,21 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
     Boolean insertConDoctorSatisfyQhByDoctorNew(ConDoctorSatisfy conDoctorSatisfy);
 
 
-    @Update("update qh_con_doctor_satisfy set reply_num = reply_num + 1 WHERE id = #{id}")
+    @Update("update QH_CON_DOC_SATISFY set reply_num = reply_num + 1 WHERE id = #{id}")
     int addDoctorReplyNumBackUp(String id);
 
 
     @Update("update ${tableName} set reply_num = reply_num + 1 WHERE id = #{id}")
     int addDoctorReplyNumNotQh(String id,String tableName);
 
-    @Update("update qh_con_doctor_satisfy set user_score_num = user_score_num +1 ,user_score = user_score + #{userScore} WHERE id = #{doctorId}")
+    @Update("update QH_CON_DOC_SATISFY set user_score_num = user_score_num +1 ,user_score = user_score + #{userScore} WHERE id = #{doctorId}")
     public int updateDoctorScoreAnfNumQh(String userScore, String doctorId);
 
 
-    @Update("update qh_con_doctor_satisfy set show_score = show_score + #{showScore} WHERE id = #{doctorId}")
+    @Update("update QH_CON_DOC_SATISFY set show_score = show_score + #{showScore} WHERE id = #{doctorId}")
     public int updateDoctorShowScoreAnfNumQh(String showScore, String doctorId);
 
-    @Update("update qh_con_doctor_satisfy set message_num = message_num + 1 WHERE id = #{id}")
+    @Update("update QH_CON_DOC_SATISFY set message_num = message_num + 1 WHERE id = #{id}")
     int addDoctorMessageNumQh(String id);
 
     List<ConDoctor> selectRecommendDoctorNewAnother(IPage<ConDoctor> page);

health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/xml/ArchivesBodyTypeMapper.xml

@@ -11,7 +11,7 @@
                     SELECT
                         userid AS userId,
                         data_value AS dataValue,
-                        "5" AS dataSource,
+                        '5' AS dataSource,
                         type AS type,
                         last_update_time AS createDate
                     FROM
@@ -19,18 +19,6 @@
                     WHERE
                         userid = #{userId}
                       AND type = 1 
-                    UNION ALL
-                    SELECT
-                        user_id AS userId,
-                        data_value AS dataValue,
-                        data_source AS dataSource,
-                        type AS type,
-                        create_date AS createDate
-                    FROM
-                        QH_WAT_ARCHIVES_BODY_TYPE
-                    WHERE
-                        user_id = #{userId}
-                      AND type = 1
                 ) temp
             ORDER BY
                 temp.createDate DESC
@@ -44,24 +32,13 @@
                 SELECT
                     userid AS userId,
                     data_value AS dataValue,
-                    "5" AS dataSource,
+                    '5' AS dataSource,
                     type AS type,
                     last_update_time AS createDate
                 FROM
                     QH_WAT_DATA
                 WHERE
                     userid = #{userId}
-                  AND type = 5 UNION ALL
-                SELECT
-                    user_id AS userId,
-                    data_value AS dataValue,
-                    data_source AS dataSource,
-                    type AS type,
-                    create_date AS createDate
-                FROM
-                    QH_WAT_ARCHIVES_BODY_TYPE
-                WHERE
-                    user_id = #{userId}
                   AND type = 5
             ) temp
         WHERE ROWNUM = 1
@@ -75,7 +52,7 @@
         SELECT
         userid AS userId,
         data_value AS dataValue,
-        "5" AS dataSource,
+        '5' AS dataSource,
         type AS type,
         last_update_time AS createDate
         FROM
@@ -86,21 +63,6 @@
         <if test="dto.startTime != null and dto.endTime != null">
             AND last_update_time BETWEEN #{dto.startTime} AND #{dto.endTime}
         </if>
-        UNION ALL
-        SELECT
-        user_id AS userId,
-        data_value AS dataValue,
-        data_source AS dataSource,
-        type AS type,
-        create_date AS createDate
-        FROM
-        QH_WAT_ARCHIVES_BODY_TYPE
-        WHERE
-        user_id = #{dto.userId}
-        AND type = 1
-        <if test="dto.startTime != null and dto.endTime != null">
-            AND create_date BETWEEN #{dto.startTime} AND #{dto.endTime}
-        </if>
         ) temp
         ORDER BY
         temp.createDate
@@ -112,7 +74,7 @@
         SELECT
         userid AS userId,
         data_value AS dataValue,
-        "5" AS dataSource,
+        '5' AS dataSource,
         type AS type,
         last_update_time AS createDate
         FROM
@@ -123,21 +85,7 @@
         <if test="dto.startTime != null and dto.endTime != null">
             AND last_update_time BETWEEN #{dto.startTime} AND #{dto.endTime}
         </if>
-        UNION ALL
+
-        SELECT
-        user_id AS userId,
-        data_value AS dataValue,
-        data_source AS dataSource,
-        type AS type,
-        create_date AS createDate
-        FROM
-        QH_WAT_ARCHIVES_BODY_TYPE
-        WHERE
-        user_id = #{dto.userId}
-        AND type = 5
-        <if test="dto.startTime != null and dto.endTime != null">
-            AND create_date BETWEEN #{dto.startTime} AND #{dto.endTime}
-        </if>
         ) temp
         ORDER BY
         temp.createDate