Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
===================================================================
diff -u -r18166 -r18495
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java	(.../MaintainManagerImpl.java)	(revision 18166)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java	(.../MaintainManagerImpl.java)	(revision 18495)
@@ -8,7 +8,6 @@
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,7 +17,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.ws.rs.OPTIONS;
 
 import net.sf.json.JSONObject;
 
@@ -1005,6 +1003,9 @@
 		case "4.1.9_4.2.0":
 			UpdateData_4_1_9_4_2_0(updateDataContext);
 			break;
+		case "4.8.5_4.8.6":
+			UpdateData_4_8_5_4_8_6(updateDataContext);
+			break;
 		}
 		return false;
 	}
@@ -1347,7 +1348,7 @@
 		String msg = null;
 		msg = String
 				.format("已执行方法(%s.%s)!", MaintainManagerImpl.class.getName(),
-						"UpdateData_4_0_3_5_0_0()");
+						"UpdateData_4_0_5_4_0_6()");
 
 		// 器械包实例的下划线处理,将包实例的下划线中的id取出来，放到单独的列。并且将包名更新为不带下划线
 		String sql = String
@@ -1612,6 +1613,7 @@
 		}
 		dataUpdater.logInfo(msg);
 	}
+	
 	private void UpdateData_4_1_9_4_2_0(UpdateDataContext updateDataContext) {
 		DataUpdater dataUpdater = updateDataContext.getDataUpdater();
 		String msg = null;
@@ -1630,7 +1632,38 @@
 		}
 		dataUpdater.logInfo(msg);
 	}
-
+	private void UpdateData_4_8_5_4_8_6(UpdateDataContext updateDataContext) {
+		DataUpdater dataUpdater = updateDataContext.getDataUpdater();
+		String msg = null;
+		msg = String
+				.format("已执行方法(%s.%s)!", MaintainManagerImpl.class.getName(),
+						"UpdateData_4_8_5_4_8_6()");
+		// 质量监测支持同时录入多个器械包改造数据升级,把材料和器械包信息写到QualityMonitoringGoods这个po类
+		try {
+			List<QualityMonitoringInstance> list = objectDao.findBySql(QualityMonitoringInstance.class.getSimpleName()," where 1=1 order by id");
+			int i = 0;
+			if(CollectionUtils.isNotEmpty(list)){
+				for(QualityMonitoringInstance qmi : list ){
+					if(!Constants.STR_YES.equals(qmi.getIsMoveTousseAndMaterial())){
+						try {
+							// 没有迁移数据，进行迁移
+							qualityMonitoringDataMoveTousseAndMaterial(qmi);
+						}catch (Exception e) {
+							e.printStackTrace();
+							throw e;
+						}
+						i++;
+						if(i % 50 == 0){
+							objectDao.flush();
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		dataUpdater.logInfo(msg);
+	}
 	@Override
 	public void updateForeignTousseInfo() {
 		//外来器械材料定义
Index: forgon-core/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r18479 -r18495
--- forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 18479)
+++ forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 18495)
@@ -21,7 +21,7 @@
 			"4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9",
 			"4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8",
 			"4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7",
-			"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.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"};// 版本列表
 	public final static List<String> SOFTWARE_VERSION_LIST = Arrays
 			.asList(SOFTWARE_VERSION_ARRAY);
 	public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本