Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java
===================================================================
diff -u -r27486 -r27629
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java	(.../HIPMessageWebServiceImpl.java)	(revision 27486)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java	(.../HIPMessageWebServiceImpl.java)	(revision 27629)
@@ -17,6 +17,8 @@
 import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO;
 import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
 import com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManager;
+import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
@@ -296,28 +298,43 @@
 				TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
 				if (tousseDefinition != null) {
 					List<MaterialInstance> materialInstances = tousseDefinition.getMaterialInstances();
+					List<DiposableGoodsInstance> diposableGoodsInstanceList = tousseDefinition.getDiposableGoodsItems();
 					messageId = ti.getRemark();
 					typeCode = "AA";
 					//String materialStr = "";
 					StringBuilder materialStr = new StringBuilder();
 					if (CollectionUtils.isNotEmpty(materialInstances)) {
 						for (MaterialInstance materialInstance : materialInstances) {
 							String detailspec = materialInstance.getSpecification() == null ? "" : materialInstance.getSpecification();
-							materialStr.append("<detail><detailcode>" + materialInstance.getMaterialDefinitionId() + "</detailcode>");
+							materialStr.append("<list><detailcode>" + materialInstance.getMaterialDefinitionId() + "</detailcode>");
 							materialStr.append("<detailname>" + materialInstance.getMaterialName() + "</detailname>");
 							materialStr.append("<detailspec>" + detailspec + "</detailspec>");
-							materialStr.append("<number>" + materialInstance.getCount() + "</number></detail>");
+							materialStr.append("<number>" + materialInstance.getCount() + "</number></list>");
 						}
 					}
+					if (CollectionUtils.isNotEmpty(diposableGoodsInstanceList)) {
+						for (DiposableGoodsInstance disposableGoodsInstance : diposableGoodsInstanceList) {
+							DisposableGoods diposableGoods = disposableGoodsInstance.getDiposableGoods();
+							String detailspec = diposableGoods.getSpecification() == null ? "" : diposableGoods.getSpecification();
+							materialStr.append("<list><detailcode>" + disposableGoodsInstance.getDiposableGoodsId() + "</detailcode>");
+							materialStr.append("<detailname>" + diposableGoods.getName() + "</detailname>");
+							materialStr.append("<detailspec>" + detailspec + "</detailspec>");
+							materialStr.append("<number>" + disposableGoodsInstance.getAmount() + "</number></list>");
+						}
+					}
 					StringBuilder returnStrSB = new StringBuilder();
 					returnStrSB.append("<text>");
 					returnStrSB.append("<code>" + tousseInstance.getBarcode() + "</code>");
 					returnStrSB.append("<pack_code>" + tousseDefinition.getId() + "</pack_code>");
 					returnStrSB.append("<pack_name>" + tousseInstance.getTousseName() + "</pack_name>");
 					returnStrSB.append("<distime>" + tousseInstance.getSterileEndTime() + "</distime>");
-					returnStrSB.append("<failtime>" + tousseInstance.getValidUntilStr() + "</failtime><list>");
-					returnStrSB.append(materialStr.toString());
-					returnStrSB.append("</list></text>");
+					returnStrSB.append("<failtime>" + tousseInstance.getValidUntilStr() + "</failtime>");
+					if(StringUtils.isNotBlank(materialStr.toString())){
+						returnStrSB.append(materialStr.toString());
+					}else{
+						returnStrSB.append("<list></list>");
+					}
+					returnStrSB.append("</text>");
 					returnStr = returnStrSB.toString();
 				}
 			}