Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java =================================================================== diff -u -r18513 -r18532 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 18513) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 18532) @@ -1006,8 +1006,8 @@ case "4.8.5_4.8.6": UpdateData_4_8_5_4_8_6(updateDataContext); break; - case "4.4.6_4.4.7": - UpdateData_4_4_6_4_4_7(updateDataContext); + case "4.4.5_4.4.6": + UpdateData_4_4_5_4_4_6(updateDataContext); break; } return false; @@ -1668,12 +1668,12 @@ dataUpdater.logInfo(msg); } // 质量监测旧数据迁移 - private void UpdateData_4_4_6_4_4_7(UpdateDataContext updateDataContext) { + private void UpdateData_4_4_5_4_4_6(UpdateDataContext updateDataContext) { DataUpdater dataUpdater = updateDataContext.getDataUpdater(); String msg = null; msg = String .format("已执行方法(%s.%s)!", MaintainManagerImpl.class.getName(), - "UpdateData_4_4_6_4_4_7()"); + "UpdateData_4_4_5_4_4_6()"); try { qualityMonitoringDataMove(); } catch (Exception e) { Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6_oracle.sql (revision 18532) @@ -0,0 +1,42 @@ +execute immediate 'update IDCardDefinition set curIdCardInstanceBarcode=(select max(b.barcode) from IDCardInstance i inner join barcodeDevice b on i.id=b.id where i.idCardDefinitionID=IDCardDefinition.id and i.status=''使用中'' and b.barcode is not null)'; + +declare + i integer; +begin + select count(1) into i from all_tab_columns where table_name='QUALITYMONITORINGCONFIG' and column_name='SHOWSTERNAMEANDFRE'; + if(i<=0) + then + execute immediate ('alter table QUALITYMONITORINGCONFIG add SHOWSTERNAMEANDFRE varchar(255)'); + end if; + + select count(1) into i from all_tab_columns where table_name='QUALITYMONITORING' and column_name='RESPONSIBILITYPART'; + if(i<=0) + then + execute immediate ('alter table QUALITYMONITORING add RESPONSIBILITYPART varchar(255)'); + end if; + + select count(1) into i from all_tab_columns where table_name='QUALITYMONITORING' and column_name='STERILIZERNAME'; + if(i<=0) + then + execute immediate ('alter table QUALITYMONITORING add STERILIZERNAME varchar(255)'); + end if; + + select count(1) into i from all_tab_columns where table_name='QUALITYMONITORING' and column_name='STERILIZERFREQUENCY'; + if(i<=0) + then + execute immediate ('alter table QUALITYMONITORING add STERILIZERFREQUENCY varchar(255)'); + end if; + + select count(1) into i from all_tab_columns where table_name='QUALITYMONITORING' and column_name='POSITIONMSG'; + if(i<=0) + then + execute immediate ('alter table QUALITYMONITORING add POSITIONMSG varchar(255)'); + end if; + + select count(1) into i from all_tab_columns where table_name='QUALITYMONITORING' and column_name='WASHANDDISINFECTRECORDID'; + if(i<=0) + then + execute immediate ('alter table QUALITYMONITORING add WASHANDDISINFECTRECORDID varchar(255)'); + end if; + +end; Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6_sqlserver.sql (revision 18532) @@ -0,0 +1,18 @@ +update IDCardDefinition set curIdCardInstanceBarcode=(select max(b.barcode) from IDCardInstance i inner join barcodeDevice b on i.id=b.id where i.idCardDefinitionID=IDCardDefinition.id and i.status='使用中' and b.barcode is not null); +if not exists (select * from syscolumns where id=object_id('QualityMonitoringConfig') and name='showSterNameAndFre') +alter table [QualityMonitoringConfig] add showSterNameAndFre varchar(255); + +if not exists (select * from syscolumns where id=object_id('QualityMonitoring') and name='responsibilityPart') +alter table [QualityMonitoring] add responsibilityPart varchar(255); + +if not exists (select * from syscolumns where id=object_id('QualityMonitoring') and name='sterilizerName') +alter table [QualityMonitoring] add sterilizerName varchar(255); + +if not exists (select * from syscolumns where id=object_id('QualityMonitoring') and name='sterilizerFrequency') +alter table [QualityMonitoring] add sterilizerFrequency varchar(255); + +if not exists (select * from syscolumns where id=object_id('QualityMonitoring') and name='positionMsg') +alter table [QualityMonitoring] add positionMsg varchar(255); + +if not exists (select * from syscolumns where id=object_id('QualityMonitoring') and name='washAndDisinfectRecordId') +alter table [QualityMonitoring] add washAndDisinfectRecordId varchar(255); \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.6_4.4.7.sql =================================================================== diff -u -r18513 -r18532 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.6_4.4.7.sql (.../4.4.6_4.4.7.sql) (revision 18513) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.6_4.4.7.sql (.../4.4.6_4.4.7.sql) (revision 18532) @@ -1,7 +1 @@ -update PrintInvoiceConfig set mergePrintType = case mergePrint when '否' then '不合并' else '科室' end; -alter table QualityMonitoringConfig add showSterNameAndFre varchar(255); -alter table QualityMonitoring add responsibilityPart varchar(255); -alter table QualityMonitoring add sterilizerName varchar(255); -alter table QualityMonitoring add sterilizerFrequency varchar(255); -alter table QualityMonitoring add positionMsg varchar(255); -alter table qualitymonitoring add washAndDisinfectRecordId varchar(255); \ No newline at end of file +update PrintInvoiceConfig set mergePrintType = case mergePrint when '否' then '不合并' else '科室' end; \ No newline at end of file Fisheye: Tag 18532 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/sqls/4.4.5_4.4.6.sql'. Fisheye: No comparison available. Pass `N' to diff?