Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r16059 -r16062
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 16059)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 16062)
@@ -770,15 +770,6 @@
 												String tousseName = tousseInstance1.getTousseName();
 												String myTousseType = tousseInstance1.getTousseDefinition().getTousseType();
 														
-														
-												if (TousseDefinition.PACKAGE_TYPE_FOREIGN
-														.equals(myTousseType)
-														|| TousseDefinition.PACKAGE_TYPE_STERILIZATION
-														.equals(myTousseType)
-														|| TousseDefinition.PACKAGE_TYPE_CUSTOM
-														.equals(myTousseType)) {
-	
-												}
 												result += (","
 														+ tousseInstance1.getBarcode()
 														+ ":" + tousseName
@@ -802,51 +793,30 @@
 											result = "failure,-1,加载完毕或者没有需要灭菌的包！";
 										}
 									} else {  // 需要追溯的器械包
-										Integer includeImplant = tousseDefinition
-												.getIncludeImplant();
-										// 外来器械包去掉下划线ID
-										String tousseName = tousseInstance
-												.getTousseName();
-										if (TousseDefinition.PACKAGE_TYPE_FOREIGN
-												.equals(tousseType)
-												|| TousseDefinition.PACKAGE_TYPE_DISINFECTION
-												.equals(tousseType)
-												|| TousseDefinition.PACKAGE_TYPE_STERILIZATION
-												.equals(tousseType)
-												|| TousseDefinition.PACKAGE_TYPE_CUSTOM
-												.equals(tousseType)) {
-										}
-	
+										Integer includeImplant = tousseDefinition.getIncludeImplant();
+										String tousseName = tousseInstance.getTousseName();  // 外来器械包去掉下划线ID
+												
 										result = "success,0," + tousseName
-												+ ","
-												+ tousseInstance.getSterilingType() + "," + StringUtils.defaultString(tousseInstance.getDepart()," ");
+												+ "," + tousseInstance.getSterilingType()
+												+ "," + StringUtils.defaultString(tousseInstance.getDepart()," ");
 	
 										// 超大、超重拆分器械包要用特定的灭菌方式
-										if (TousseDefinition.PACKAGE_TYPE_SPLIT
-												.equals(tousseType)
-												&& TousseDefinition.BIG_PACKAGE_TRUE
-												.equals(tousseDefinition
-														.getIsBigPackage())) {
+										if (TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tousseType)
+												&& TousseDefinition.BIG_PACKAGE_TRUE.equals(tousseDefinition.getIsBigPackage())) {
 											result += ",true";
-											String bigPackageSterileType = supplyRoomConfigManager
-													.getSystemParamsObj()
-													.getBigPackageSterilizerType();
+											String bigPackageSterileType = supplyRoomConfigManager.getSystemParamsObj().getBigPackageSterilizerType();
 											if (StringUtils.isNotBlank(bigPackageSterileType)) {
 												result += ("," + bigPackageSterileType);
 											} else {
 												result += ",false,";
 											}
-	
 										} else {
 											result += ",false,";
-	
 										}
 	
-										// 外来器械包有植入物的话要做生物监测
-										if ((TousseDefinition.PACKAGE_TYPE_FOREIGN
-												.equals(tousseType) || TousseDefinition.PACKAGE_TYPE_SPLIT
-												.equals(tousseType))
-												&& TousseDefinition.INCLUDE_IMPLANT == includeImplant) {
+										if ((TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tousseType)
+												|| TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tousseType))
+												&& TousseDefinition.INCLUDE_IMPLANT == includeImplant) {  //外来器械包有植入物的话要做生物监测
 											result += ",是";
 										} else {
 											result += ",否";
@@ -856,9 +826,8 @@
 									result = "failure,-1,无法添加，因为器械包已放入篮筐，请通过扫描篮筐进行添加";
 								}
 	
-								// 检查代理灭菌是否已录入代理灭菌单
+								//检查代理灭菌是否已录入代理灭菌单
 								String checkProxyDisinfection = StrutsParamUtils.getPraramValue("checkProxyDisinfection", "");
-										
 								if (StringUtils.isNotBlank(checkProxyDisinfection)) {
 									String userOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
 									if (tousseInstance.getOrgUnitCoding() != null
@@ -875,23 +844,19 @@
 							&& barcodeDevice instanceof Container) {
 						// TODO 当篮筐正在灭菌中，还是能够读取到的bug
 						Container container = (Container) barcodeDevice;
-						if (container.getContainerType().equals(
-								Container.CONTAINERTYPE_BASKET)) {
-							// 是否要加载篮筐里的器械包名称//
-							String loadTousseNamesInBasket = StrutsParamUtils
-									.getPraramValue("loadTousseNamesInBasket", "");
-							result = "success,1,"
-									+ container.getContainerName();
+						if (container.getContainerType().equals(Container.CONTAINERTYPE_BASKET)) {
+							//是否要加载篮筐里的器械包名称
+							String loadTousseNamesInBasket = StrutsParamUtils.getPraramValue("loadTousseNamesInBasket", "");
+							result = "success,1," + container.getContainerName();
+									
 							if (StringUtils.isNotBlank(loadTousseNamesInBasket)) {
 								Set<TousseInstance> toussesInBasket = null;
 								//如果为灭菌筐,按原有方式查询
 								if(Container.CONTAINER_PURPOSE_DISINFECTION.equals(container.getPurpose())){
-									toussesInBasket = tousseInstanceManager
-											.getReviewedTousseInstanceByBasket(barcode);
+									toussesInBasket = tousseInstanceManager.getReviewedTousseInstanceByBasket(barcode);
 								}else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){
 									//如果为虚拟篮筐,则按范围区间方式查询,begin和end都为条码的参数
-									Map<String , Object> map = 
-											barcodeManager.getTousseInstanceListByRange(barcode, barcode, TousseInstance.STATUS_REVIEWED);
+									Map<String , Object> map = barcodeManager.getTousseInstanceListByRange(barcode, barcode, TousseInstance.STATUS_REVIEWED);
 									if(map != null && map.get("result") != null){
 										toussesInBasket = new HashSet<TousseInstance>();
 										toussesInBasket.addAll((List<TousseInstance>)map.get("result"));
@@ -903,45 +868,27 @@
 									Collections.sort(tousseList);//按id降序排序
 									for (TousseInstance tousseInstance : tousseList) {
 										if (tousseInstance != null
-												&& StringUtils
-														.isNotBlank(tousseInstance
-																.getTousseName())) {
-											String tousseName = tousseInstance
-													.getTousseName();
-											String tousseType = tousseInstance
-													.getTousseDefinition()
-													.getTousseType();
-											if (TousseDefinition.PACKAGE_TYPE_FOREIGN
-													.equals(tousseType)
-													|| TousseDefinition.PACKAGE_TYPE_STERILIZATION
-															.equals(tousseType)
-													|| TousseDefinition.PACKAGE_TYPE_CUSTOM
-															.equals(tousseType)) {
-												
-											}
+												&& StringUtils.isNotBlank(tousseInstance.getTousseName())) {
+											String tousseName = tousseInstance.getTousseName();
+											String tousseType = tousseInstance.getTousseDefinition().getTousseType();
+													
 											result += ","
 													+ tousseInstance.getBarcode()
-													+ ":" + tousseName + ":" + tousseInstance
-													.getSterilingType() + ":" + StringUtils.defaultString(tousseInstance.getDepart(), "");
+													+ ":" + tousseName 
+													+ ":" + tousseInstance.getSterilingType()
+													+ ":" + StringUtils.defaultString(tousseInstance.getDepart(), "");
 											// 超重、超大外来器械用配置的灭菌方式
-											if (TousseDefinition.BIG_PACKAGE_TRUE
-													.equals(tousseInstance
-															.getTousseDefinition()
-															.getIsBigPackage())) {
-												String bigPackage = supplyRoomConfigManager
-														.getSystemParamsObj()
-														.getBigPackageSterilizerType();
-												if (StringUtils
-														.isNotBlank(bigPackage)) {
-													result += ":true:"
-															+ bigPackage;
+											if (TousseDefinition.BIG_PACKAGE_TRUE.equals(
+													tousseInstance.getTousseDefinition().getIsBigPackage())) {
+												String bigPackage = supplyRoomConfigManager.getSystemParamsObj().getBigPackageSterilizerType();
+												if (StringUtils.isNotBlank(bigPackage)) {
+													result += ":true:" + bigPackage;
 												} else {
 													result += ":true:";
 												}
 											} else {
 												result += ":false:";
 											}
-	
 										}
 									}
 								}