Browse Source

Merge branch 'dev/20200618_1.3.6' into debug

zhoutg 5 years atrás
parent
commit
4ee7013956

+ 8 - 1
doc/010.20200618v1.3.6/qc_initv1.3.6.sql

@@ -18,4 +18,11 @@ INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creato
 INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '96', NULL);
 INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '97', NULL);
 INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '98', NULL);
-INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '99', NULL);
+INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '99', NULL);
+
+
+-- 再次同步
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_hospital_id` (`hospital_id`) USING BTREE;
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE;
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_is_deleted` (`is_deleted`) USING BTREE;
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_mix` (`hospital_id`,`behospital_code`,`is_deleted`) USING BTREE;

+ 1 - 1
src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -149,7 +149,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 new QueryWrapper<QcresultInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", analyzeVO.getHospitalId())
-                        .eq("behospital_code", analyzeVO.getBehospitalCode()));
+                        .eq("behospital_code", analyzeVO.getBehospitalCode()), false);
         if (null == qcresultInfo) {
             qcresultInfo = new QcresultInfo();
         } else {