Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_sqlserver.sql =================================================================== diff -u -r30268 -r30277 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_sqlserver.sql (.../4.9.62_4.9.63_sqlserver.sql) (revision 30268) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_sqlserver.sql (.../4.9.62_4.9.63_sqlserver.sql) (revision 30277) @@ -1,4 +1,2 @@ update QualityMonitoringDefinition set handleDepart = (select case when departNames like '%;%' then ';' else departNames end from FormDefinition where id = QualityMonitoringDefinition.id), handleDepartCoding = (select case when departCodes like '%;%' then ';' else departCodes end from FormDefinition where id = QualityMonitoringDefinition.id) where handleDepartCoding is null or handleDepart is null; -update QualityMonitoringDefinition set handleDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 1), handleDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 1) where (handleDepart = ';' and handleDepartCoding = ';') or (handleDepartCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (1,2))); -update QualityMonitoringInstance set handleDepart = (select orgUnit from FormInstance where id = QualityMonitoringInstance.id), handleDepartCoding = (select orgUnitCoding from FormInstance where id = QualityMonitoringInstance.id) where handleDepartCoding is null or handleDepart is null; -update QualityMonitoringInstance set handleDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 1), handleDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 1) where handleDepartCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (1,2) ); \ No newline at end of file +update QualityMonitoringDefinition set handleDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 1), handleDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 1) where (handleDepart = ';' and handleDepartCoding = ';') or (handleDepartCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (1,2))); \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java =================================================================== diff -u -r30268 -r30277 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java (.../QualityMonitoringInstance.java) (revision 30268) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java (.../QualityMonitoringInstance.java) (revision 30277) @@ -169,16 +169,6 @@ */ private WashAndDisinfectRecord scanWashAndDisinfectRecord; - /** - * 处理科室部门编码 - */ - private String handleDepartCoding; - - /** - * 处理科室 - */ - private String handleDepart; - @OneToMany(fetch = FetchType.LAZY) @Cascade(value = { org.hibernate.annotations.CascadeType.ALL }) @JoinColumn(name = "qualityMonitoringInstance_id") @@ -522,21 +512,5 @@ WashAndDisinfectRecord scanWashAndDisinfectRecord) { this.scanWashAndDisinfectRecord = scanWashAndDisinfectRecord; } - - public String getHandleDepartCoding() { - return handleDepartCoding; - } - public void setHandleDepartCoding(String handleDepartCoding) { - this.handleDepartCoding = handleDepartCoding; - } - - public String getHandleDepart() { - return handleDepart; - } - - public void setHandleDepart(String handleDepart) { - this.handleDepart = handleDepart; - } - } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_oracle.sql =================================================================== diff -u -r30268 -r30277 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_oracle.sql (.../4.9.62_4.9.63_oracle.sql) (revision 30268) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_oracle.sql (.../4.9.62_4.9.63_oracle.sql) (revision 30277) @@ -1,4 +1,2 @@ update QualityMonitoringDefinition set handleDepart = (select case when departNames like '%;%' then ';' else to_char(departNames) end from FormDefinition where id = QualityMonitoringDefinition.id), handleDepartCoding = (select case when departCodes like '%;%' then ';' else to_char(departCodes) end from FormDefinition where id = QualityMonitoringDefinition.id) where handleDepartCoding is null or handleDepart is null; -update QualityMonitoringDefinition set handleDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 1), handleDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 1) where (handleDepart = ';' and handleDepartCoding = ';') or (handleDepartCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (1,2))); -update QualityMonitoringInstance set handleDepart = (select orgUnit from FormInstance where id = QualityMonitoringInstance.id), handleDepartCoding = (select orgUnitCoding from FormInstance where id = QualityMonitoringInstance.id) where handleDepartCoding is null or handleDepart is null; -update QualityMonitoringInstance set handleDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 1), handleDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 1) where handleDepartCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (1,2) ); \ No newline at end of file +update QualityMonitoringDefinition set handleDepart = (select orgUnitName from SupplyRoomConfig where supplyRoomType = 1), handleDepartCoding = (select orgUnitCoding from SupplyRoomConfig where supplyRoomType = 1) where (handleDepart = ';' and handleDepartCoding = ';') or (handleDepartCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (1,2))); \ No newline at end of file