Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java =================================================================== diff -u -r28063 -r30268 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java (.../QualityMonitoringDefinition.java) (revision 28063) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java (.../QualityMonitoringDefinition.java) (revision 30268) @@ -91,6 +91,16 @@ */ private String recordSterilizatioInformation = Constants.STR_NO; + /** + * 处理科室部门编码 + */ + private String handleDepartCoding; + + /** + * 处理科室 + */ + private String handleDepart; + public String getResponsibilityPart() { return responsibilityPart; } @@ -148,6 +158,22 @@ this.recordSterilizatioInformation = recordSterilizatioInformation; } + 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; + } + /** * 获取责任环节的过滤条件 * @param responsibility Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_sqlserver.sql (revision 30268) @@ -0,0 +1,4 @@ +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 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java =================================================================== diff -u -r27704 -r30268 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java (.../QualityMonitoringInstance.java) (revision 27704) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java (.../QualityMonitoringInstance.java) (revision 30268) @@ -169,6 +169,16 @@ */ private WashAndDisinfectRecord scanWashAndDisinfectRecord; + /** + * 处理科室部门编码 + */ + private String handleDepartCoding; + + /** + * 处理科室 + */ + private String handleDepart; + @OneToMany(fetch = FetchType.LAZY) @Cascade(value = { org.hibernate.annotations.CascadeType.ALL }) @JoinColumn(name = "qualityMonitoringInstance_id") @@ -512,5 +522,21 @@ 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: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r30245 -r30268 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 30245) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 30268) @@ -25,7 +25,8 @@ "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44", - "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61","4.9.62"}; + "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61","4.9.62", + "4.9.63"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.62_4.9.63_oracle.sql (revision 30268) @@ -0,0 +1,4 @@ +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