Browse Source

代码修改

LAPTOP-KB9HII50\70708 1 year ago
parent
commit
f8503d442b

+ 85 - 1
common/common-entity/src/db/2023.sql

@ -233,4 +233,88 @@ ADD COLUMN `create_user_name` varchar(50) NULL COMMENT '创建人姓名' AFTER `
ALTER TABLE `base`.`wlyy_patient_rehabilitation_plan`
ADD COLUMN `patient_info_code` varchar(255) NULL AFTER `plan_doctor_name`;
=========================== 康复模块[结束]=================================
=========================== 康复模块[结束]=================================
-- ysj 2023-12-01
CREATE TABLE `base_check_org` (
                                  `id` int(50) NOT NULL AUTO_INCREMENT,
                                  `orgCode` varchar(50) DEFAULT NULL COMMENT '机构code',
                                  `check_Date` varchar(50) DEFAULT NULL COMMENT '考核时间',
                                  `check_file` varchar(255) DEFAULT NULL COMMENT '考核文件',
                                  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='机构考核';
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000001', NULL, 'PROFESSIONAL_STATE', '0', '国家机关、党群组织、企业、事业单位负责人', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000002', NULL, 'PROFESSIONAL_STATE', '1', '专业技术人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000003', NULL, 'PROFESSIONAL_STATE', '2', '办事人员和有关人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000004', NULL, 'PROFESSIONAL_STATE', '3', '商业、服务业人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000005', NULL, 'PROFESSIONAL_STATE', '4', '农、林、牧、渔、水利业生产人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000006', NULL, 'PROFESSIONAL_STATE', '5', '生产、运输设备操作人员及有关人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000007', NULL, 'PROFESSIONAL_STATE', '6', '军人', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('1000000008', NULL, 'PROFESSIONAL_STATE', '7', '不便分类的其他从业人员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('1', '0', '1', '汉族', '1', '', '', 'HZ', 'IY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('2', '0', '2', '蒙古族', '1', '', '', 'MGZ', 'ADY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('3', '0', '3', '回族', '1', '', '', 'HZ', 'LY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('4', '0', '4', '藏族', '1', '', '', 'CZ', 'AY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('5', '0', '5', '维吾尔族', '1', '', '', 'WWEZ', 'XGQY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('6', '0', '6', '苗族', '1', '', '', 'MZ', 'AY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('7', '0', '7', '彝族', '1', '', '', 'YZ', 'XY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('8', '0', '8', '壮族', '1', '', '', 'ZZ', 'UY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('9', '0', '9', '布依族', '1', '', '', 'BYZ', 'DWY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('10', '0', '10', '朝鲜族', '1', '', '', 'CXZ', 'FQY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('11', '0', '11', '满族', '1', '', '', 'MZ', 'IY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('12', '0', '12', '侗族', '1', '', '', 'DZ', 'WY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('13', '0', '13', '瑶族', '1', '', '', 'YZ', 'GY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('14', '0', '14', '白族', '1', '', '', 'BZ', 'RY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('15', '0', '15', '土家族', '1', '', '', 'TJZ', 'FPY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('16', '0', '16', '哈尼族', '1', '', '', 'HNZ', 'KNY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('17', '0', '17', '哈萨克族', '1', '', '', 'HSKZ', 'KADY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('18', '0', '18', '傣族', '1', '', '', 'DZ', 'WY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('19', '0', '19', '黎族', '1', '', '', 'LZ', 'TY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('20', '0', '20', '傈僳族', '1', '', '', 'LSZ', 'WWY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('21', '0', '21', '佤族', '1', '', '', 'WZ', 'WY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('22', '0', '22', '畲族', '1', '', '', 'SZ', 'WY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('23', '0', '23', '高山族', '1', '', '', 'GSZ', 'YMY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('24', '0', '24', '拉祜族', '1', '', '', 'LBZ', 'RPY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('25', '0', '25', '水族', '1', '', '', 'SZ', 'IY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('26', '0', '26', '东乡族', '1', '', '', 'DXZ', 'AXY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('27', '0', '27', '纳西族', '1', '', '', 'NXZ', 'XSY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('28', '0', '28', '景颇族', '1', '', '', 'JPZ', 'JHY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('29', '0', '29', '柯尔克孜族', '1', '', '', 'KEKZZ', 'SQDBY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('30', '0', '30', '土族', '1', '', '', 'TZ', 'FY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('31', '0', '31', '达斡尔族', '1', '', '', 'DHEZ', 'DFQY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('32', '0', '32', '仫佬族', '1', '', '', 'MLZ', 'WWY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('33', '0', '33', '羌族', '1', '', '', 'QZ', 'UY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('34', '0', '34', '布朗族', '1', '', '', 'BLZ', 'DYY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('35', '0', '35', '撒拉族', '1', '', '', 'SLZ', 'RRY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('36', '0', '36', '毛南族', '1', '', '', 'MNZ', 'TFY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('37', '0', '37', '仡佬族', '1', '', '', 'GLZ', 'WWY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('38', '0', '38', '锡伯族', '1', '', '', 'XBZ', 'QWY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('39', '0', '39', '阿昌族', '1', '', '', 'ACZ', 'BJY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('40', '0', '40', '普米族', '1', '', '', 'PMZ', 'UOY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('41', '0', '41', '塔吉克族', '1', '', '', 'TJKZ', 'FFDY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('42', '0', '42', '怒族', '1', '', '', 'NZ', 'VY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('43', '0', '43', '乌孜别克族', '1', '', '', 'WZBKZ', 'QBKDY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('44', '0', '44', '俄罗斯族', '1', '', '', 'ELSZ', 'WLAY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('45', '0', '45', '鄂温克族', '1', '', '', 'EWKZ', 'KIDY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('46', '0', '46', '德昂族', '1', '', '', 'DAZ', 'TJY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('47', '0', '47', '保安族', '1', '', '', 'BAZ', 'WPY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('48', '0', '48', '裕固族', '1', '', '', 'YGZ', 'PLY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('49', '0', '49', '京族', '1', '', '', 'JZ', 'YY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('50', '0', '50', '塔塔尔族', '1', '', '', 'TTEZ', 'FFQY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('51', '0', '51', '独龙族', '1', '', '', 'DLZ', 'QDY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('52', '0', '52', '鄂伦春族', '1', '', '', 'ELCZ', 'KWDY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('53', '0', '53', '赫哲族', '1', '', '', 'HZZ', 'FRY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('54', '0', '54', '门巴族', '1', '', '', 'MBZ', 'UCY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('55', '0', '55', '珞巴族', '1', '', '', 'LBZ', 'CY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('56', '0', '56', '基诺族', '1', '', '', 'JNZ', 'AYY', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('57', '0', '99', '其他', '1', '', '', 'QT', 'AW', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('58', '0', '57', '穿青人', '1', '', '57', 'CQZ', 'CQZ', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('59', '0', '58', 'Turkish', '1', '', '', 'teq', 'Turkish', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('60', '0', '59', 'BRITAIN', '1', '', '', 'BRITISH', 'BRITAIN', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('61', '0', '60', 'AUSTRALIAN', '1', '', '', 'AUSTRALIAN', 'AUSTRALIAN', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('62', '0', '61', '/', '1', '', '', '/', '/', '0', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('63', '0', '63', 'Ukrainian', '1', '', '', 'Ukrainian', 'Ukrainian', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('64', '0', '101', '亻革家人', '1', '', '', 'RGJR', '', '', NULL, '', NULL, '', '');
INSERT INTO `base`.`zy_nation_dict` (`ID`, `ORG_ID`, `NATION_CODE`, `NATION_NAME`, `VALID_FLAG`, `USER_CODE`, `CUSTOM_CODE`, `SPELL_CODE`, `WBZX_CODE`, `SORT_NO`, `CREATE_TIME`, `CREATE_OPERATOR`, `MODIFY_TIME`, `MODIFY_OPERATOR`, `REMARK`) VALUES ('65', '0', '62', '山由族', '1', '', '', 'SYZ', 'MMY', '', NULL, '', NULL, '', '');

+ 24 - 2
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/DoorOrderController.java

@ -62,6 +62,25 @@ public class DoorOrderController extends EnvelopRestEndpoint {
    @Autowired
    JdbcTemplate jdbcTemplate;
    /**
     * 修改工单状态
     * 也将开方状态设置成0
     */
    @PostMapping(value = "updateOrderStatusAndTime")
    @ApiOperation(value = " 修改工单状态")
    public Envelop updateOrderInfo(
            @ApiParam(name = "orderId", value = "orderId", required = true) @RequestParam String orderId,
            @ApiParam(name = "status", value = "status", required = false) @RequestParam String status,
            @ApiParam(name = "doctorArrivingTime", value = "doctorArrivingTime", required = false) @RequestParam String doctorArrivingTime
    ) {
        try {
            wlyyDoorServiceOrderService.updateOrderStatusAndTime(orderId, status, doctorArrivingTime);
            return success("修改成功!");
        } catch (Exception e) {
            e.printStackTrace();
            return failed("修改失败");
        }
    }
    @GetMapping(value = "getOgrById")
    @ApiOperation(value = "服务人员列表(医生列表)")
@ -307,7 +326,8 @@ public class DoorOrderController extends EnvelopRestEndpoint {
                    doctorCode, examPaperStatus, page, pageSize, type, name, serverType);
            return success("获取成功", result);
        } catch (Exception e) {
            return failed(e.getMessage());
            e.printStackTrace();
            return failed("查询失败");
        }
    }
@ -332,7 +352,8 @@ public class DoorOrderController extends EnvelopRestEndpoint {
            }
            return success("保存成功", result.get(ResponseContant.resultMsg));
        } catch (Exception e) {
            return failed(e.getMessage());
            e.printStackTrace();
            return failed("保存失败");
        }
    }
@ -474,6 +495,7 @@ public class DoorOrderController extends EnvelopRestEndpoint {
            doorOrderService.refuseOrder(getUID(), orderId, reason);
            return success("操作成功");
        } catch (Exception e) {
            e.printStackTrace();
            return failed(e.getMessage());
        }

+ 6 - 2
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorOrderService.java

@ -1047,8 +1047,12 @@ public class DoorOrderService {
            object.put("remark", one.get("remark"));
            object.put("serveDesc", one.get("serve_desc"));
            object.put("hosLevel", one.get("hosLevel"));
            Date date = (Date) one.get("service_time");
            object.put("createTime", DateUtil.dateToStr(date, "yyyy-MM-dd"));
            String date = one.get("service_time")+"";
            if(date.length()>=10){
                object.put("createTime", date.substring(0,10));
            }else {
                object.put("createTime", date);
            }
            object.put("examPaperStatus", one.get("examPaperStatus"));
            object.put("serviceStatus", one.get("serviceStatus"));
            //服务人员

+ 1 - 1
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/WlyyDoorServiceOrderService.java

@ -1128,7 +1128,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                " wlyy_door_fee_detail fd " +
                " LEFT JOIN wlyy_door_doctor dd ON fd.order_id = dd.order_id " +
                " WHERE " +
                " fd.order_id = '" + id + "'" +
                " fd.order_id = '" + id + "' and fd.type=1 " +
                " GROUP BY  fd.id";
        List<Map<String, Object>> feeDetailList = new ArrayList<>();
        try {

+ 0 - 4
svr/svr-visit-behind/src/main/resources/application.yml

@ -1457,10 +1457,6 @@ basedb:
base:
  url: http://172.17.110.212:10020/
# ====================================================
sms:
  clientId: EwC0iRSrcP
myFamily: