chengyao 4 лет назад
Родитель
Сommit
bfa246fa95

+ 8 - 32
doc/031.20210326v2.0.2/qc_initv2.0.2.sql

@@ -179,13 +179,14 @@ CREATE TABLE `med_management_info` (
 -- ----------------------------
 -- Records of med_management_info
 -- ----------------------------
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '1', '2020-06-01 00:00:00', '2020-06-30 00:00:00', '15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '3', '2021-05-01 00:00:00', '2021-05-31 00:00:00', '12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '2', '2021-05-01 00:00:00', '2021-05-31 00:00:00', '10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '2', '2020-06-01 00:00:00', '2020-06-30 00:00:00', '4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '1', '2020-04-01 00:00:00', '2020-04-30 00:00:00', '17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '2', '2020-12-01 00:00:00', '2020-12-31 00:00:00', '19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '1', '2020-07-17 00:00:00', '2020-07-31 00:00:00', '15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- -- 测试数据
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '1', '2020-06-01 00:00:00', '2020-06-30 00:00:00', '15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '3', '2021-05-01 00:00:00', '2021-05-31 00:00:00', '12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '2', '2021-05-01 00:00:00', '2021-05-31 00:00:00', '10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '2', '2020-06-01 00:00:00', '2020-06-30 00:00:00', '4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '1', '2020-04-01 00:00:00', '2020-04-30 00:00:00', '17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '2', '2020-12-01 00:00:00', '2020-12-31 00:00:00', '19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
+-- INSERT INTO `med_management_info` ( `hospital_id`, `position_id`, `start_date`, `end_date`, `work_person`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`) VALUES ( '4', '1', '2020-07-17 00:00:00', '2020-07-31 00:00:00', '15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
 
 
 
@@ -238,31 +239,6 @@ CREATE TABLE `med_outpatient_info` (
 -- ----------------------------
 -- Records of med_outpatient_info
 -- ----------------------------
-INSERT INTO `med_outpatient_info` VALUES ('200630106000153', '4', '项洪桥', '女', '1993-08-05 11:00:00', '', '0', '12', '九西病区', '180', '胃肠疝血管科', '', '', '', '', '2020-06-30 11:21:36', '2020-07-05 00:57:04', '2021-04-18 12:17:08', '1', '', '', '', '', '1592', '', '1592', '', '1', '2020-07-05 00:57:04', null, 'N', '2020-10-15 02:55:51', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000001', '4', '杨茜', '女', '1999-02-16 10:00:00', '', '0', '3', '产后病区', '48', '产科住院', '', '', '', '', '2020-06-30 15:00:00', '2020-07-05 21:04:12', '2020-07-02 00:57:04', '', '', '', '', '', '1947', '', '392', '', '1', '2020-07-05 21:04:12', null, 'N', '2020-10-15 02:55:55', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000003', '4', '王水芝', '男', '1948-02-21 10:00:00', '', '0', '19', '十二东病区', '94', '肛肠科', '', '', '', '', '2020-06-30 19:17:30', '2020-07-04 20:44:04', '2020-07-02 00:57:04', '', '', '', '', '', '357', '', '357', '', '1', '2020-07-04 20:44:04', null, 'N', '2020-10-15 02:53:48', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000004', '4', '王乐乐', '女', '2016-12-24 10:00:00', '', '0', '5', '儿科病区', '49', '儿科', '', '', '', '', '2020-06-30 19:39:09', '2020-07-08 20:25:28', '2020-07-06 00:57:04', '', '', '', '', '', '309', '', '48', '', '1', '2020-07-08 20:25:28', null, 'N', '2020-10-15 02:53:52', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000005', '4', '史龙英', '女', '1952-12-31 10:00:00', '', '0', '19', '十二东病区', '94', '肛肠科', '', '', '', '', '2020-06-01 19:16:53', '2020-07-01 21:32:20', '2020-06-02 00:57:04', '', '', '', '', '', '357', '', '357', '', '1', '2020-07-01 21:32:20', null, 'N', '2020-10-15 02:53:55', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000006', '4', '李益平', '男', '1982-09-04 11:00:00', '', '0', '19', '十二东病区', '94', '肛肠科', '', '', '', '', '2020-06-30 19:23:07', '2020-07-11 20:20:31', '2020-07-06 00:57:04', '', '', '', '', '', '357', '', '357', '', '1', '2020-07-11 20:20:31', null, 'N', '2020-10-15 02:53:57', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000008', '4', '朱志宝', '男', '1933-05-07 11:00:00', '', '0', '11', '九东病区', '66', '神经内科', '', '', '', '', '2020-06-30 20:02:53', '2020-07-17 20:52:33', '2020-07-06 00:57:04', '', '', '', '', '', '1552', '', '510', '', '1', '2020-07-17 20:52:33', null, 'N', '2020-10-15 02:56:35', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000009', '4', '査小琴', '女', '1972-02-19 10:00:00', '', '0', '2', '四西病区', '46', '妇科住院', '', '', '', '', '2020-06-30 21:17:37', '2020-07-04 19:57:55', '2020-07-02 00:57:04', '', '', '', '', '', '1274', '', '', '', '1', '2020-07-04 19:57:55', null, 'N', '2020-10-15 02:54:36', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000010', '4', '王清梅', '女', '1985-03-24 10:00:00', '', '0', '2', '四西病区', '46', '妇科住院', '', '', '', '', '2020-06-30 19:31:55', '2020-07-04 20:13:36', '2021-04-18 12:17:09', '1', '', '', '', '', '1274', '', '', '', '1', '2020-07-04 20:13:36', null, 'N', '2020-10-15 02:56:43', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000011', '4', '严明光', '男', '1953-12-28 10:00:00', '', '0', '10', '八西病区', '180', '胃肠疝血管科', '', '', '', '', '2020-06-30 19:41:20', '2020-07-15 20:50:09', '2020-07-06 00:57:04', '', '', '', '', '', '1592', '', '', '', '1', '2020-07-15 20:50:09', null, 'N', '2020-10-15 02:54:41', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000012', '4', '周建蓉', '女', '1977-05-19 11:00:00', '', '0', '12', '九西病区', '97', '耳鼻喉科', '', '', '', '', '2020-06-30 19:39:32', '2020-07-05 20:30:29', '2020-07-02 00:57:04', '', '', '', '', '', '1591', '', '', '', '1', '2020-07-05 20:30:29', null, 'N', '2020-10-15 02:56:49', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000013', '4', '张春芝', '女', '1960-08-26 11:00:00', '', '0', '15', '十一西病区', '75', '血液肿瘤科', '', '', '', '', '2020-06-30 19:59:03', '2020-07-25 21:43:03', '2020-07-06 00:57:04', '', '', '', '', '', '1013', '', '270', '', '1', '2020-07-25 21:43:03', null, 'N', '2020-10-15 02:54:47', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000014', '4', '郭爱明', '女', '1971-02-01 10:00:00', '', '0', '20', '十一东病区', '91', '泌尿外科', '', '', '', '', '2020-06-30 19:40:05', '2020-07-11 20:44:02', '2020-07-02 00:57:04', '', '', '', '', '', '13', '', '', '', '1', '2020-07-11 20:44:02', null, 'N', '2020-10-15 02:55:02', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000015', '4', '邱赛良', '男', '1964-11-15 10:00:00', '', '0', '1', '三西病区', '59', '肾内科', '', '', '', '', '2020-06-30 19:41:11', '2020-07-06 19:38:01', '2021-04-18 12:17:10', '1', '', '', '', '', '2214', '', '', '', '1', '2020-07-06 19:38:01', null, 'N', '2020-10-15 02:55:08', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000017', '4', '杨苗', '女', '1983-10-17 11:00:00', '', '0', '2', '四西病区', '46', '妇科住院', '', '', '', '', '2020-06-30 20:05:15', '2020-07-06 20:13:52', '2020-07-04 00:57:04', '', '', '', '', '', '1408', '', '', '', '1', '2020-07-06 20:13:52', null, 'N', '2020-10-15 02:55:19', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000018', '4', '蔡旭波', '男', '1982-10-08 11:00:00', '', '0', '16', '感染二病区', '53', '肝病-感染科', '', '', '', '', '2020-06-30 20:08:56', '2020-07-05 20:05:47', '2020-07-02 00:57:04', '', '', '', '', '', '672', '', '672', '', '1', '2020-07-05 20:05:47', null, 'N', '2020-10-15 02:55:24', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000019', '4', '黄立群', '男', '1964-11-01 10:00:00', '', '0', '14', '十西病区', '72', '心血管科', '', '', '', '', '2020-06-30 20:18:45', '2020-07-04 19:24:17', '2020-07-02 00:57:04', '', '', '', '', '', '1648', '', '15', '', '1', '2020-07-04 19:24:17', null, 'N', '2020-10-15 02:55:34', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000020', '4', '王元菊', '女', '1967-05-22 11:00:00', '', '0', '12', '九西病区', '97', '耳鼻喉科', '', '', '', '', '2020-06-30 20:01:27', '2020-07-06 19:59:34', '2020-07-04 00:57:04', '', '', '', '', '', '2207', '', '', '', '1', '2020-07-06 19:59:34', null, 'N', '2020-10-15 02:55:38', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000023', '4', '夏才国', '男', '1954-07-13 11:00:00', '', '0', '1', '三西病区', '59', '肾内科', '', '', '', '', '2020-06-30 20:20:00', '2020-07-08 20:56:25', '2020-07-02 00:57:04', '', '', '', '', '', '2056', '', '', '', '1', '2020-07-08 20:56:25', null, 'N', '2020-10-15 02:56:56', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000024', '4', '章兆品', '男', '1934-11-14 10:00:00', '', '0', '14', '十西病区', '72', '心血管科', '', '', '', '', '2020-06-30 20:26:27', '2020-07-07 20:45:37', '2021-04-18 12:17:10', '1', '', '', '', '', '1648', '', '15', '', '1', '2020-07-07 20:45:37', null, 'N', '2020-10-15 02:47:56', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000025', '4', '杜利别', '男', '1947-09-14 10:00:00', '', '0', '15', '十一西病区', '91', '泌尿外科', '', '', '', '', '2020-06-30 20:24:53', '2020-07-11 21:56:28', '2020-07-04 00:57:04', '', '', '', '', '', '517', '', '13', '', '1', '2020-07-11 21:56:28', null, 'N', '2020-10-15 02:57:32', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000026', '4', '叶爱勋', '男', '1970-06-20 11:00:00', '', '0', '14', '十西病区', '72', '心血管科', '', '', '', '', '2020-06-30 20:19:53', '2020-07-04 19:57:49', '2020-07-02 00:57:04', '', '', '', '', '', '1179', '', '30', '', '1', '2020-07-04 19:57:49', null, 'N', '2020-10-15 02:48:05', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000027', '4', '胡美云', '女', '1954-02-03 10:00:00', '', '0', '11', '九东病区', '66', '神经内科', '', '', '', '', '2020-06-30 20:24:38', '2020-07-15 20:00:07', '2020-07-02 00:57:04', '', '', '', '', '', '641', '', '', '', '1', '2020-07-15 20:00:07', null, 'N', '2020-10-15 02:57:38', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000028', '4', '李银娟', '女', '1966-01-13 10:00:00', '', '0', '12', '九西病区', '97', '耳鼻喉科', '', '', '', '', '2020-06-30 20:29:25', '2020-07-05 20:51:39', '2021-04-18 12:17:13', '1', '', '', '', '', '2207', '', '', '', '1', '2020-07-05 20:51:39', null, 'N', '2020-10-15 02:57:44', '1970-01-01 12:00:00', '0', '0');
-INSERT INTO `med_outpatient_info` VALUES ('200701106000029', '4', '马立站', '男', '1972-05-21 11:00:00', '', '0', '9', '八东病区', '63', '消化内科', '', '', '', '', '2020-06-30 20:24:55', '2020-07-05 21:41:48', '2020-07-04 00:57:04', '', '', '', '', '', '524', '', '', '', '1', '2020-07-05 21:41:48', null, 'N', '2020-10-15 02:48:09', '1970-01-01 12:00:00', '0', '0');
 
 
 --  菜单添加

+ 1 - 0
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -649,6 +649,7 @@ public class ConsoleFacade {
          * ================================保存数据-标示线========================================
          */
         MedIndexFilterVO timeVo = new MedIndexFilterVO();
+        BeanUtils.copyProperties(filterVO,timeVo);
         timeTrans(timeVo);
         Map<String, Object> baseIndex = behospitalInfoFacade.getBaseIndex(timeVo);
         //指标二十七