Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/UseRecordPushDaoImpl.java
===================================================================
diff -u -r31983 -r32531
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/UseRecordPushDaoImpl.java	(.../UseRecordPushDaoImpl.java)	(revision 31983)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/UseRecordPushDaoImpl.java	(.../UseRecordPushDaoImpl.java)	(revision 32531)
@@ -11,17 +11,13 @@
 import com.forgon.directory.model.OrgUserRelation;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.datasynchronization.dao.UseRecordPushDao;
-import com.forgon.disinfectsystem.entity.basedatamanager.signRecord.SignRecord;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
-import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
-import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
-import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
@@ -188,406 +184,343 @@
 	 */
 	private String useRecordToXmlString(UseRecord useRecord) {
 		
-		String instrumentSetBarcode = "";
+		// 使用记录的基础信息
+		String useRecordStr = buildUseRecordXml(useRecord);
+		
 		String goodsItemListStr = "";
 		List<TousseInstance> tousseInstanceList = useRecord.getTousseInstanceList(objectDao);
 		if(CollectionUtils.isNotEmpty(tousseInstanceList)){
-			for (TousseInstance tousseInstance : tousseInstanceList) {
-				if(StringUtils.isBlank(instrumentSetBarcode)){
-					instrumentSetBarcode = tousseInstance.getBarcode();
-				}else{
-					instrumentSetBarcode += ";" + tousseInstance.getBarcode();
-				}
-			}
-			goodsItemListStr = buildGoodsItemListXml(tousseInstanceList);
+			goodsItemListStr = buildGoodsItemListXml(useRecordStr, tousseInstanceList);
 		}
 		
 		StringBuffer result = new StringBuffer();
 		result.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
 		result.append("<root>");
-		result.append("<msg>");
+		if(StringUtils.isNotBlank(goodsItemListStr)){
+			result.append(goodsItemListStr);
+		}
+		result.append("</root>");
+		return result.toString();
+	}
+	
+	/**
+	 * 获取使用记录基础信息
+	 * @param useRecord
+	 * @return
+	 */
+	private String buildUseRecordXml(UseRecord useRecord) {
+		StringBuffer result = new StringBuffer();
 		// 登记人姓名
 		result.append("<regOperatorName>" + useRecord.getOperator() + "</regOperatorName>");
-		// 录入日期yyyymmddhhmmss
+		// 录入日期2021-11-11 15:10:07
 		result.append("<regDatetime>" + ForgonDateUtils.safelyFormatDate(useRecord.getEnteringDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "") + "</regDatetime>");
-		// 录入使用记录的科室编码
-		result.append("<regDeptCode>" + useRecord.getDepartCoding() + "</regDeptCode>");
-		// 录入使用记录的科室名称
-		result.append("<regDeptName>" + useRecord.getDepart() + "</regDeptName>");
-		// 手术所使用的器械包的条码，多个器械包的条码通过分号;分隔 
-		result.append("<instrumentSetBarcode>" + instrumentSetBarcode + "</instrumentSetBarcode>");
-		// 手术状态: 有如下4个状态：“准备手术”，“手术开始”，“手术中”，“手术结束”
-		// 值为“手术结束”时把单据改成已申请的状态，并且自动生成一张通用申请单，提醒供应室去回收器械
-		result.append("<operationStatus>" + StringUtils.defaultString(useRecord.getOperationStatus()) + "</operationStatus>");
+		// 病人ID
+		result.append("<patientId></patientId>");
 		// 住院号
 		result.append("<visitNo>" + StringUtils.defaultString(useRecord.getHospitalNum()) + "</visitNo>");
-		// 诊疗号
-		result.append("<outhospIndexNo>" + StringUtils.defaultString(useRecord.getTreatmentNum()) + "</outhospIndexNo>");
-		// 病人姓名
-		result.append("<patientName>" + StringUtils.defaultString(useRecord.getPatientName()) + "</patientName>");
-		// 病人年龄
-		result.append("<patientAge>" + StringUtils.defaultString(useRecord.getPatientAge()) + "</patientAge>");
-		// 病人性别(男/女)
-		result.append("<patientSex>" + StringUtils.defaultString(useRecord.getPatientSex()) + "</patientSex>");
 		// 病人身份证号
 		result.append("<idCardNo>" + StringUtils.defaultString(useRecord.getPatientIDCard()) + "</idCardNo>");
+		// 病人性别(男/女)
+		result.append("<sex>" + StringUtils.defaultString(useRecord.getPatientSex()) + "</sex>");
+		// 病人年龄
+		result.append("<age>" + StringUtils.defaultString(useRecord.getPatientAge()) + "</age>");
+		// 病区
+		result.append("<inDept>" + StringUtils.defaultString(useRecord.getPatientArea()) + "</inDept>");
+		// 住院次数
+		result.append("<visitNum>" + (useRecord.getVisitId() == null ? "" : (useRecord.getVisitId()+"")) + "</visitNum>");
+		// 病人姓名
+		result.append("<patientName>" + StringUtils.defaultString(useRecord.getPatientName()) + "</patientName>");
+		// 床位
+		result.append("<bedNum>" + StringUtils.defaultString(useRecord.getBedNumber()) + "</bedNum>");
 		// 手术申请单号
 		result.append("<surgeryAppliFormNo>" + StringUtils.defaultString(useRecord.getOperationScheduleId()) + "</surgeryAppliFormNo>");
 		// 手术名称
 		result.append("<surgeryName>" + StringUtils.defaultString(useRecord.getOperation()) + "</surgeryName>");
-		// 手术时间yyyymmddhhmmss
-		result.append("<surgeryDatetime>" + ForgonDateUtils.safelyFormatDate(useRecord.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "") + "</surgeryDatetime>");
-		// 医生姓名
-		result.append("<surgeryDoctorName>" + StringUtils.defaultString(useRecord.getDoctorName()) + "</surgeryDoctorName>");
-		// 洗手护士工号
+		// 医生工号和姓名
+		String doctorName = StringUtils.defaultString(useRecord.getDoctorName());
+		String doctorCode = searchUserCode(doctorName, useRecord.getDepartCoding());
+		result.append("<surgeryDoctorCode>" + doctorCode + "</surgeryDoctorCode>");
+		result.append("<surgeryDoctorName>" + doctorName + "</surgeryDoctorName>");
+		// 洗手护士工号和姓名
 		String washHandNurseName = StringUtils.defaultString(useRecord.getWashHandNurse());
 		String washHandNurseCode = searchUserCode(washHandNurseName, useRecord.getDepartCoding());
 		result.append("<washHandNurseCode>" + washHandNurseCode + "</washHandNurseCode>");
-		// 洗手护士姓名
 		result.append("<washHandNurseName>" + washHandNurseName + "</washHandNurseName>");
-		// 巡回护士工号
+		// 巡回护士工号和姓名
 		String circuitNurseName = StringUtils.defaultString(useRecord.getCircuitNurse());
 		String circuitNurseCode = searchUserCode(circuitNurseName, useRecord.getDepartCoding());
 		result.append("<circuitNurseCode>" + circuitNurseCode + "</circuitNurseCode>");
-		// 巡回护士姓名
 		result.append("<circuitNurseName>" + circuitNurseName + "</circuitNurseName>");
-		// 手术间
-		result.append("<operationRoom>" + StringUtils.defaultString(useRecord.getOperationRoom()) + "</operationRoom>");
-		// 病区
-		result.append("<patientArea>" + StringUtils.defaultString(useRecord.getPatientArea()) + "</patientArea>");
-		// 病人所属科室名称
-		result.append("<ascriptionDepartName>" + StringUtils.defaultString(useRecord.getAscriptionDepartment()) + "</ascriptionDepartName>");
-		// 病室
-		result.append("<roomNum>" + StringUtils.defaultString(useRecord.getRoomNumber()) + "</roomNum>");
-		// 床位
-		result.append("<bedNum>" + StringUtils.defaultString(useRecord.getBedNumber()) + "</bedNum>");
-		// 住院次数
-		result.append("<visitNum>" + (useRecord.getVisitId() == null ? "" : (useRecord.getVisitId()+"")) + "</visitNum>");
-		// 特殊感染类型
-		result.append("<specialInfection>" + StringUtils.defaultString(useRecord.getSpecialInfection()) + "</specialInfection>");
 		// 备注
 		result.append("<remark>" + StringUtils.defaultString(useRecord.getRemark()) + "</remark>");
-		if(StringUtils.isNotBlank(goodsItemListStr)){
-			result.append(goodsItemListStr);
-		}
-		result.append("</msg>");
-		result.append("</root>");
 		return result.toString();
 	}
 	
 	/**
 	 * 生成物品xml
+	 * @param useRecordStr 
 	 * @param tousseInstanceList
 	 * @return
 	 */
-	private String buildGoodsItemListXml(List<TousseInstance> tousseInstanceList) {
-		if(CollectionUtils.isEmpty(tousseInstanceList)){
+	private String buildGoodsItemListXml(String useRecordStr, List<TousseInstance> tousseInstanceList) {
+		if(CollectionUtils.isEmpty(tousseInstanceList) || StringUtils.isBlank(useRecordStr)){
 			return null;
 		}
 		StringBuffer result = new StringBuffer();
-		result.append("<GoodsItems>");
+		result.append("<returnContents>");
 		for (TousseInstance tousseInstance : tousseInstanceList) {
-			String itemTraceInfo = getTousseInstanceTraceInfo(tousseInstance);
+			String itemTraceInfo = getTousseInstanceTraceInfo(useRecordStr, tousseInstance);
 			result.append(itemTraceInfo);
 		}
-		result.append("</GoodsItems>");
+		result.append("</returnContents>");
 		return result.toString();
 	}
 	
 	/**
 	 * 根据器械包条码查询器械包的追溯信息
+	 * @param useRecordStr 
 	 * @param barcode
 	 * @return <Item>...</Item>
+	 * <returnContent>
+	 * 		.....(使用记录的基础信息)
+	  		<instrumentSetBarcode>器械包条码</instrumentSetBarcode>
+			<instrumentSetName>器械包名称</instrumentSetName>
+			<instrumentSetAppliFormNo>器械包申请单号</instrumentSetAppliFormNo>
+			<sterilizationOperatorCode>灭菌员代码</sterilizationOperatorCode>			
+			<sterilizationOperatorName>灭菌员姓名</sterilizationOperatorName>
+			<sterilizationBeginDatetime>灭菌开始时间</sterilizationBeginDatetime>
+			<instrumentSetExpirationDatetime>器械包失效日期</instrumentSetExpirationDatetime>
+			<sterilizationFurnaceName>灭菌炉名称</sterilizationFurnaceName>
+			<sterilizationCycleNum>灭菌炉次</sterilizationCycleNum>
+			<washOperatorCode>清洗操作员工号</washOperatorCode>
+			<washOperatorName>清洗操作员名称</washOperatorName>
+			<washBeginDatetime>清洗开始时间</washBeginDatetime>
+			<washEndDatetime>清洗结束时间</washEndDatetime>
+			<deliverPackPperatorCode>配包人工号</deliverPackPperatorCode>
+			<deliverPackOperatorName>配包人姓名</deliverPackOperatorName>
+			<assembleDatetime>装配时间</assembleDatetime>
+			<assembleProofOperatorCode>装配审核人工号</assembleProofOperatorCode>
+			<assembleProofOperatorName>装配审核人姓名</assembleProofOperatorName>
+			<proofDatetime>审核时间</proofDatetime>
+			<sterilizationProgramCode>灭菌程序编码</sterilizationProgramCode>
+			<sterilizationProgramName>灭菌程序名称</sterilizationProgramName>
+			<sterilizationEndDatetime>灭菌结束时间</sterilizationEndDatetime>
+			<biologicalMonitorResult>生物监测结果</biologicalMonitorResult>
+			<deliveryOperatorCode>发货员工号</deliveryOperatorCode>
+			<deliveryOperatorName>发货员姓名</deliveryOperatorName>
+			<deliveryDatetime>发货时间</deliveryDatetime>
+		</returnContent>
 	 */
 	@SuppressWarnings("unchecked")
-	private String getTousseInstanceTraceInfo(TousseInstance tousseInstance) {
+	private String getTousseInstanceTraceInfo(String useRecordStr, TousseInstance tousseInstance) {
 		String returnStr = "";
-
+		
+		// 器械包条码
+		String instrumentSetBarcode = tousseInstance.getBarcode();
+		// 器械包名称
+		String instrumentSetName = tousseInstance.getTousseName();
+		// 器械包申请单号
+		String instrumentSetAppliFormNo = "";
+		
+		// 灭菌员代码
+		String sterilizationOperatorCode = "";
+		// 灭菌员姓名
+		String sterilizationOperatorName = "";
+		// 灭菌开始时间
+		String sterilizationBeginDatetime = "";
+		// 器械包失效日期
+		String instrumentSetExpirationDatetime = "";
+		// 灭菌炉名称
+		String sterilizationFurnaceName = "";
+		// 灭菌炉次
+		String sterilizationCycleNum = "";
+		
+		// 清洗操作员工号
+		String washOperatorCode = "";
+		// 清洗操作员名称
+		String washOperatorName = "";
+		// 清洗开始时间
+		String washBeginDatetime = "";
+		// 清洗结束时间
+		String washEndDatetime = "";
+		
+		// 配包人工号
+		String deliverPackPperatorCode = "";
+		// 配包人姓名
+		String deliverPackOperatorName = "";
+		// 装配时间
+		String assembleDatetime = "";
+		
+		// 装配审核人工号
+		String assembleProofOperatorCode = "";
+		// 装配审核人姓名
+		String assembleProofOperatorName = "";
+		// 审核时间
+		String proofDatetime = "";
+		
+		// 灭菌程序编码
+		String sterilizationProgramCode = "";
+		// 灭菌程序名称
+		String sterilizationProgramName = "";
+		// 灭菌结束时间
+		String sterilizationEndDatetime = "";
+		// 生物监测结果
+		String biologicalMonitorResult = "";
+		
+		// 发货员工号
+		String deliveryOperatorCode = "";
+		// 发货员姓名
+		String deliveryOperatorName = "";
+		// 发货时间
+		String deliveryDatetime = "";
+		
+		
 		// 申请记录信息
-		StringBuilder applyStrSB = new StringBuilder();
-		applyStrSB.append("<ApplyRecords>");
 		Long invoicePlanId = tousseInstance.getInvoicePlanID();
 		SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();
 		if(DatabaseUtil.isPoIdValid(invoicePlanId)){
 			InvoicePlan invoicePlan = (InvoicePlan) objectDao.getById(InvoicePlan.class.getSimpleName(), invoicePlanId);
 			if(invoicePlan != null){
-				String userCode = searchUserCode(invoicePlan.getApplicant(), invoicePlan.getDepartCoding());
-				applyStrSB.append("<Record>");
-				applyStrSB.append("<InstrumentSetAppliFormNo>" + invoicePlan.getSerialNumber() + "</InstrumentSetAppliFormNo>");
-				applyStrSB.append("<ApplyDeptCode>" + invoicePlan.getDepartCoding() + "</ApplyDeptCode>");
-				applyStrSB.append("<ApplyDeptName>" + invoicePlan.getDepart() + "</ApplyDeptName>");
-				applyStrSB.append("<ApplyOperatorCode>" + StringUtils.defaultString(userCode) + "</ApplyOperatorCode>");
-				applyStrSB.append("<ApplyOperatorName>" + invoicePlan.getApplicant() + "</ApplyOperatorName>");
-				applyStrSB.append("<ApplyDateTime>" + ForgonDateUtils.safelyFormatDate(invoicePlan.getApplicationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "") + "</ApplyDateTime>");
-				applyStrSB.append("<ApplyTypeCode></ApplyTypeCode>");
-				applyStrSB.append("<ApplyTypeName>" + invoicePlan.getType() + "</ApplyTypeName>");
-				applyStrSB.append("</Record>");
+				instrumentSetAppliFormNo = invoicePlan.getSerialNumber();
 			}
 		}
-		applyStrSB.append("</ApplyRecords>");
-
-		// 回收记录信息
-		StringBuilder recycleStrSB = new StringBuilder();
-		recycleStrSB.append("<RecycleRecords>");
-		if(DatabaseUtil.isPoIdValid(invoicePlanId)){
-			List<RecyclingRecord> recyclingRecordList = objectDao.findBySql(RecyclingRecord.class.getSimpleName(), 
-					" where recyclingApplication.id=" + invoicePlanId, 
-					" id desc ");
-			if(CollectionUtils.isNotEmpty(recyclingRecordList)){
-				for (RecyclingRecord recyclingRecord : recyclingRecordList) {
-					String checkOperatorName = recyclingRecord.getOperator();
-					String checkOperatorCode = checkOperatorName;
-					String recycleOperatorName = recyclingRecord.getRecyclingUser();
-					String recycleOperatorCode = recycleOperatorName;
-					if(firstSupplyRoomConfig != null){
-						recycleOperatorCode = searchUserCode(recycleOperatorName, firstSupplyRoomConfig.getOrgUnitCoding());
-						checkOperatorCode =  searchUserCode(checkOperatorName, firstSupplyRoomConfig.getOrgUnitCoding());
-					}
-					String recycleDateTimeStr =  ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-
-					recycleStrSB.append("<Record>");
-					recycleStrSB.append("<CheckOperatorCode>" + checkOperatorCode + "</CheckOperatorCode>");
-					recycleStrSB.append("<CheckOperatorName>" + StringUtils.defaultString(checkOperatorName) + "</CheckOperatorName>");
-					recycleStrSB.append("<RecycleOperatorCode>" + recycleOperatorCode + "</RecycleOperatorCode>");
-					recycleStrSB.append("<RecycleOperatorName>" + StringUtils.defaultString(recycleOperatorName) + "</RecycleOperatorName>");
-					recycleStrSB.append("<RecycleDateTime>" + recycleDateTimeStr + "</RecycleDateTime>");
-					recycleStrSB.append("</Record>");
-				}
-			}
-		}
-		recycleStrSB.append("</RecycleRecords>");
-
 		// 清洗记录信息
-		StringBuilder cleanstrSB = new StringBuilder();
-		cleanstrSB.append("<WashRecords>");
 		String classifyBasketIds = tousseInstance.getClassifyBasketIds();
 		if(StringUtils.isNotBlank(classifyBasketIds)){
 			String[] classifyBasketIdArr = classifyBasketIds.split(";");
 			List<String> classifyBasketIdList = Arrays.asList(classifyBasketIdArr);
-			String classifyBasketHql = String.format("select po from %s po where %s", ClassifyBasket.class.getSimpleName(),
+			String classifyBasketHql = String.format("select po from %s po where %s order by po.id desc", ClassifyBasket.class.getSimpleName(),
 					SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", classifyBasketIdList));
 			List<ClassifyBasket> classifyBasketList = objectDao.findByHql(classifyBasketHql);
 			if(CollectionUtils.isNotEmpty(classifyBasketList)){
 				List<WashAndDisinfectRecord> washAndDisinfectRecordList = new ArrayList<WashAndDisinfectRecord>();
 				for (ClassifyBasket classifyBasket : classifyBasketList) {
 					washAndDisinfectRecordList.addAll(classifyBasket.getWashAndDisinfectRecords());
 				}
-				for (WashAndDisinfectRecord washAndDisinfectRecord : washAndDisinfectRecordList) {
-					cleanstrSB.append("<Record>");
-					cleanstrSB.append("<WashMachineCode>" + washAndDisinfectRecord.getRinserId() + "</WashMachineCode>");
-					cleanstrSB.append("<WashMachineName>" + washAndDisinfectRecord.getDisinfectIdentification() + "</WashMachineName>");
-					cleanstrSB.append("<WashProcedureName>" + washAndDisinfectRecord.getDisinfectProgram() + "</WashProcedureName>");
-					cleanstrSB.append("<WashOperatorCode>" + washAndDisinfectRecord.getOperatorCode() + "</WashOperatorCode>");
-					cleanstrSB.append("<WashOperatorName>" + washAndDisinfectRecord.getOperator() + "</WashOperatorName>");
-					cleanstrSB.append("<WashBeginDateTime>" + washAndDisinfectRecord.getStartDateStr() + "</WashBeginDateTime>");
-					cleanstrSB.append("<WashEndDateTime>" + washAndDisinfectRecord.getEndDateStr() + "</WashEndDateTime>");
-					cleanstrSB.append("</Record>");
+				if(CollectionUtils.isNotEmpty(washAndDisinfectRecordList)){
+					WashAndDisinfectRecord washAndDisinfectRecord = washAndDisinfectRecordList.get(0);
+					// 清洗操作员工号
+					washOperatorCode = StringUtils.defaultIfEmpty(washAndDisinfectRecord.getOperatorCode(), "");
+					// 清洗操作员名称
+					washOperatorName = StringUtils.defaultIfEmpty(washAndDisinfectRecord.getOperator(), "");
+					// 清洗开始时间
+					washBeginDatetime = washAndDisinfectRecord.getStartDateStr();
+					// 清洗结束时间
+					washEndDatetime = washAndDisinfectRecord.getEndDateStr();
 				}
 			}
 		}
-		cleanstrSB.append("</WashRecords>");
 
 		// 装配记录
-		StringBuilder packageStrSB = new StringBuilder();
-		String operationTimeStr = ForgonDateUtils.safelyFormatDate(tousseInstance.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-		String reviewTimeStr =ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-		packageStrSB.append("<AssembleRecords>");
-		packageStrSB.append("<Record>");
-		packageStrSB.append("<InstrumentSetBarcode>" + tousseInstance.getBarcode() + "</InstrumentSetBarcode>");
-		packageStrSB.append("<InstrumentSetName>" + tousseInstance.getTousseName() + "</InstrumentSetName>");
-		packageStrSB.append("<AssembleOperatorCode>" + StringUtils.defaultString(tousseInstance.getOperatorCode()) + "</AssembleOperatorCode>");
-		packageStrSB.append("<AssembleOperatorName>" + StringUtils.defaultString(tousseInstance.getOperator()) + "</AssembleOperatorName>");
-		packageStrSB.append("<AssembleReviewerCode>" + StringUtils.defaultString(tousseInstance.getReviewerCode()) + "</AssembleReviewerCode>");
-		packageStrSB.append("<AssembleRevieweName>" + StringUtils.defaultString(tousseInstance.getReviewer()) + "</AssembleRevieweName>");
-		packageStrSB.append("<AssembleDateTime>" + operationTimeStr + "</AssembleDateTime>");
-		packageStrSB.append("<ReviewDateTime>" + reviewTimeStr + "</ReviewDateTime>");
-		packageStrSB.append("<PackTypeCode></PackTypeCode>");
-		packageStrSB.append("<PackTypeName>" + StringUtils.defaultString(tousseInstance.getPackageType()) + "</PackTypeName>");
-		packageStrSB.append("</Record>");
-		packageStrSB.append("</AssembleRecords>");
+		// 配包人工号
+		deliverPackPperatorCode = StringUtils.defaultString(tousseInstance.getOperatorCode());
+		// 配包人姓名
+		deliverPackOperatorName = StringUtils.defaultString(tousseInstance.getOperator());
+		// 装配时间
+		assembleDatetime = ForgonDateUtils.safelyFormatDate(tousseInstance.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
+		// 装配审核人工号
+		assembleProofOperatorCode = StringUtils.defaultString(tousseInstance.getReviewerCode());
+		// 装配审核人姓名
+		assembleProofOperatorName = StringUtils.defaultString(tousseInstance.getReviewer());
+		// 审核时间
+		proofDatetime = ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
 
 		// 灭菌记录
 		StringBuilder sterilizationstrSB = new StringBuilder();
 		sterilizationstrSB.append("<SterilizationRecords>");
 		SterilizationRecord sterilizationRecord = tousseInstance.getSterilizationRecord(objectDao);
 		if(sterilizationRecord != null){
-			String sterilizationOperatorName = sterilizationRecord.getSterilizationUser();
-			String sterilizationOperatorCode = sterilizationOperatorName;
-			if(firstSupplyRoomConfig != null){
-				sterilizationOperatorCode = searchUserCode(sterilizationOperatorName, firstSupplyRoomConfig.getOrgUnitCoding());
-			}
 			Sterilizer sterilizer = sterilizationRecord.getSterilizer();
 			String sterilizationProcedure = sterilizationRecord.getSterilizationType();
 			Sterilisation sterilisation = (Sterilisation) objectDao.getByProperty(Sterilisation.class.getSimpleName(),
 					"sterilisation", sterilizationProcedure);
-			String sterilizationBeginTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getStartDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			String sterilizationEndTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getEndDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			String bioMonitorBeginTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getBiologicalMonitoringStartDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			String bioMonitorEndTimeStr = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getBiologicalMonitoringEndDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			String validUntil = ForgonDateUtils.safelyFormatDate(tousseInstance.getValidUntil(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			sterilizationstrSB.append("<Record>");
-			sterilizationstrSB.append("<SterilizationOperatorCode>" + sterilizationOperatorCode + "</SterilizationOperatorCode>");
-			sterilizationstrSB.append("<SterilizationOperatorName>" + sterilizationOperatorName + "</SterilizationOperatorName>");
-			sterilizationstrSB.append("<SterilizerName>" + sterilizer.getName() + "</SterilizerName>");
-			sterilizationstrSB.append("<SterilizationProgramCode>" + (sterilisation == null ? "" : sterilisation.getBarcode()) + "</SterilizationProgramCode>");
-			sterilizationstrSB.append("<SterilizationProgramName>" + (sterilisation == null ? "" : sterilisation.getSterilisation()) + "</SterilizationProgramName>");
-			sterilizationstrSB.append("<SterilizationCycleNum>" + sterilizationRecord.getFrequency() + "</SterilizationCycleNum>");
-			sterilizationstrSB.append("<SterilizationBeginDateTime>" + sterilizationBeginTimeStr + "</SterilizationBeginDateTime>");
-			sterilizationstrSB.append("<SterilizationEndDateTime>" + sterilizationEndTimeStr + "</SterilizationEndDateTime>");
-			sterilizationstrSB.append("<ChemistryMonitorResult>" + StringUtils.defaultString(sterilizationRecord.getChemistryResult()) + "</ChemistryMonitorResult>");
-			sterilizationstrSB.append("<BioMonitorBeginDateTime>" + bioMonitorBeginTimeStr + "</BioMonitorBeginDateTime>");
-			sterilizationstrSB.append("<BioMonitorEndDateTime>" + bioMonitorEndTimeStr + "</BioMonitorEndDateTime>");
-			sterilizationstrSB.append("<BiologicalMonitorResult>" + StringUtils.defaultString(sterilizationRecord.getBiologyResult()) + "</BiologicalMonitorResult>");
-			sterilizationstrSB.append("<InstrumentSetExpirationDateTime>" + validUntil + "</InstrumentSetExpirationDateTime>");
-			sterilizationstrSB.append("</Record>");
+			
+			// 灭菌员代码和姓名
+			sterilizationOperatorName = sterilizationRecord.getSterilizationUser();
+			if(firstSupplyRoomConfig != null){
+				sterilizationOperatorCode = searchUserCode(sterilizationOperatorName, firstSupplyRoomConfig.getOrgUnitCoding());
+			}
+			// 灭菌开始时间
+			sterilizationBeginDatetime = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getStartDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
+			// 器械包失效日期
+			instrumentSetExpirationDatetime = ForgonDateUtils.safelyFormatDate(tousseInstance.getValidUntil(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
+			// 灭菌炉名称
+			if(sterilizer != null){
+				sterilizationFurnaceName = sterilizer.getName();
+			}
+			// 灭菌炉次
+			sterilizationCycleNum = (sterilizationRecord.getFrequency() == null ? "" : sterilizationRecord.getFrequency().toString());
+			
+			// 灭菌程序编码
+			sterilizationProgramCode = (sterilisation == null ? "" : sterilisation.getBarcode());
+			// 灭菌程序名称
+			sterilizationProgramName = (sterilisation == null ? "" : sterilisation.getSterilisation());
+			// 灭菌结束时间
+			sterilizationEndDatetime = ForgonDateUtils.safelyFormatDate(sterilizationRecord.getEndDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
+			// 生物监测结果
+			biologicalMonitorResult = StringUtils.defaultString(sterilizationRecord.getBiologyResult());
 		}
-		sterilizationstrSB.append("</SterilizationRecords>");
 
 		// 发货记录
 		StringBuilder sendstrSB = new StringBuilder();
-		Invoice ip = tousseInstance.getInvoice(objectDao);
-		sendstrSB.append("<DeliveryRecords>");
-		if (ip != null) {
-			String senderName = ip.getSender();
-			String senderCode = senderName;
-			if(firstSupplyRoomConfig != null){
-				senderCode = searchUserCode(senderName, firstSupplyRoomConfig.getOrgUnitCoding());
-			}
-			String delivertDateTime = ForgonDateUtils.safelyFormatDate(ip.getSendTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			sendstrSB.append("<Record>");
-			sendstrSB.append("<DeliveryOperatorCode>" + senderCode + "</DeliveryOperatorCode>");
-			sendstrSB.append("<DeliveryOperatorName>" + (senderName == null ? "" : senderName) + "</DeliveryOperatorName>");
-			sendstrSB.append("<DeliveryDeptCode>" + StringUtils.defaultString(ip.getDepartCoding()) + "</DeliveryDeptCode>");
-			sendstrSB.append("<DeliveryDeptName>" + StringUtils.defaultString(ip.getDepart()) + "</DeliveryDeptName>");
-			sendstrSB.append("<DeliveryDateTime>" + delivertDateTime + "</DeliveryDateTime>");
-			sendstrSB.append("</Record>");
-		}
 		if(DatabaseUtil.isPoIdValid(tousseInstance.getInvoice2_id())){
 			Invoice ip2 = (Invoice) objectDao.getById(Invoice.class.getSimpleName(), tousseInstance.getInvoice2_id());
 			if (ip2 != null) {
-				String senderName = ip2.getSender();
-				String senderCode = senderName;
+				deliveryOperatorName = ip2.getSender();
 				if(firstSupplyRoomConfig != null){
-					senderCode = searchUserCode(senderName, firstSupplyRoomConfig.getOrgUnitCoding());
+					deliveryOperatorCode = searchUserCode(deliveryOperatorName, firstSupplyRoomConfig.getOrgUnitCoding());
 				}
-				String delivertDateTime = ForgonDateUtils.safelyFormatDate(ip2.getSendTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-				sendstrSB.append("<Record>");
-				sendstrSB.append("<DeliveryOperatorCode>" + senderCode + "</DeliveryOperatorCode>");
-				sendstrSB.append("<DeliveryOperatorName>" + (senderName == null ? "" : senderName) + "</DeliveryOperatorName>");
-				sendstrSB.append("<DeliveryDeptCode>" + StringUtils.defaultString(ip2.getDepartCoding()) + "</DeliveryDeptCode>");
-				sendstrSB.append("<DeliveryDeptName>" + StringUtils.defaultString(ip2.getDepart()) + "</DeliveryDeptName>");
-				sendstrSB.append("<DeliveryDateTime>" + delivertDateTime + "</DeliveryDateTime>");
-				sendstrSB.append("</Record>");
+				deliveryDatetime = ForgonDateUtils.safelyFormatDate(ip2.getSendTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
 			}
-		}
-		sendstrSB.append("</DeliveryRecords>");
-
-		// 签收记录
-		StringBuilder signRecordStrSB = new StringBuilder();
-		signRecordStrSB.append("<SignRecords>");
-		Long signRecordId = tousseInstance.getSignRecordId();
-		if(DatabaseUtil.isPoIdValid(signRecordId)){
-			SignRecord signRecord = (SignRecord) objectDao.getById(SignRecord.class.getSimpleName(), signRecordId);
-			if(signRecord != null){
-				OrgUnit depart = null;
-				String departCode = signRecord.getDepartCode();
-				List<OrgUnit> departs =  objectDao.findByProperty(OrgUnit.class.getSimpleName(),
-						"orgUnitCoding", departCode);
-				if(CollectionUtils.isNotEmpty(departs)){
-					depart = departs.get(0);
+		}else{
+			Invoice ip = tousseInstance.getInvoice(objectDao);
+			sendstrSB.append("<DeliveryRecords>");
+			if (ip != null) {
+				deliveryOperatorName = ip.getSender();
+				if(firstSupplyRoomConfig != null){
+					deliveryOperatorCode = searchUserCode(deliveryOperatorName, firstSupplyRoomConfig.getOrgUnitCoding());
 				}
-				String signDate = ForgonDateUtils.safelyFormatDate(signRecord.getSignDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-				signRecordStrSB.append("<Record>");
-				signRecordStrSB.append("<SignOperatorCode>" + StringUtils.defaultString(signRecord.getSignUserCode()) + "</SignOperatorCode>");
-				signRecordStrSB.append("<SignOperatorName>" + StringUtils.defaultString(signRecord.getSignUserName()) + "</SignOperatorName>");
-				signRecordStrSB.append("<SignDeptCode>" + StringUtils.defaultString(departCode) + "</SignDeptCode>");
-				signRecordStrSB.append("<SignDeptName>" + (depart == null ? "" : depart.getName()) + "</SignDeptName>");
-				signRecordStrSB.append("<SignDateTime>" + signDate + "</SignDateTime>");
-				signRecordStrSB.append("</Record>");
+				deliveryDatetime = ForgonDateUtils.safelyFormatDate(ip.getSendTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
 			}
 		}
-		signRecordStrSB.append("</SignRecords>");
 
-		// 使用记录
-		UseRecord ur = tousseInstance.getUseRecord(objectDao);
-		StringBuilder useStrSB = new StringBuilder();
-		useStrSB.append("<UseRecords>");
-		if (ur != null) {
-			String useDate = ForgonDateUtils.safelyFormatDate(ur.getEnteringDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-			String departCode = ur.getDepartCoding();
-			String operatorName = ur.getOperator() == null ? "" : ur.getOperator();
-			String operatorCode = searchUserCode(operatorName, departCode);
-			String washHandNurseName = ur.getWashHandNurse() == null ? "" : ur.getWashHandNurse();
-			String washHandNurseCode = searchUserCode(washHandNurseName, departCode);
-			String circuitNurseName = ur.getCircuitNurse() == null ? "" : ur.getCircuitNurse();
-			String circuitNurseCode = searchUserCode(circuitNurseName, departCode);
-			useStrSB.append("<Record>");
-			useStrSB.append("<InHospIndexNO>" + StringUtils.defaultString(ur.getHospitalNum()) + "</InHospIndexNO>");
-			useStrSB.append("<OutHospIndexNO>" + StringUtils.defaultString(ur.getTreatmentNum()) + "</OutHospIndexNO>");
-			useStrSB.append("<SurgeryAppliFormNO>" + StringUtils.defaultString(ur.getOperationScheduleId()) + "</SurgeryAppliFormNO>");
-			useStrSB.append("<UseDateTime>" + useDate + "</UseDateTime>");
-			useStrSB.append("<RegOperatorCode>" + operatorCode + "</RegOperatorCode>");
-			useStrSB.append("<RegOperatorName>" + operatorName + "</RegOperatorName>");
-			useStrSB.append("<WashHandNurseCode>" + washHandNurseCode + "</WashHandNurseCode>");
-			useStrSB.append("<WashHandNurseName>" + washHandNurseName + "</WashHandNurseName>");
-			useStrSB.append("<CircuitNurseCode>" + circuitNurseCode + "</CircuitNurseCode>");
-			useStrSB.append("<CircuitNurseName>" + circuitNurseName + "</CircuitNurseName>");
-			useStrSB.append("<UseDeptCode>" + departCode + "</UseDeptCode>");
-			useStrSB.append("<UseDeptName>" + ur.getDepart() + "</UseDeptName>");
-			useStrSB.append("</Record>");
-		}
-		useStrSB.append("</UseRecords>");
-
-		// 废弃
-		StringBuilder discardstrSB = new StringBuilder();
-		String wasteDate = ForgonDateUtils.safelyFormatDate(tousseInstance.getWasteDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-		discardstrSB.append("<DiscardRecords>");
-		discardstrSB.append("<Record>");
-		discardstrSB.append("<DiscardDateTime>" + wasteDate + "</DiscardDateTime>");
-		discardstrSB.append("<DiscardReason>" + StringUtils.defaultString(tousseInstance.getWasteReason()) + "</DiscardReason>");
-		discardstrSB.append("<DiscardOperator>" + StringUtils.defaultString(tousseInstance.getOperateUser()) + "</DiscardOperator>");
-		discardstrSB.append("</Record>");
-		discardstrSB.append("</DiscardRecords>");
-
-		// 质量监测记录
-		StringBuilder qualityStrSB = new StringBuilder();
-		qualityStrSB.append("<QualityRecords>");
-		String qualityHql = String.format("select po from %s po where po.tousseInstance.id = %s", QualityMonitoringInstance.class.getSimpleName(),
-				tousseInstance.getId());
-		List<QualityMonitoringInstance> qualityList = objectDao.findByHql(qualityHql);
-		if(CollectionUtils.isNotEmpty(qualityList)){
-			for (QualityMonitoringInstance qualityMonitoringInstance : qualityList) {
-				String departCode = qualityMonitoringInstance.getOrgUnitCoding();
-				String createUserName = StringUtils.defaultString(qualityMonitoringInstance.getCreateUserName());
-				String createUserCode = searchUserCode(createUserName, departCode);
-				String regDateTime = ForgonDateUtils.safelyFormatDate(qualityMonitoringInstance.getCreateDate(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, "");
-				FormDefinition formDefinition = qualityMonitoringInstance.getFormDefinition();
-				qualityStrSB.append("<Record>");
-				qualityStrSB.append("<QualityRegOperatorCode>" + createUserCode + "</QualityRegOperatorCode>");
-				qualityStrSB.append("<QualityRegOperatorName>" + createUserName + "</QualityRegOperatorName>");
-				qualityStrSB.append("<QualityRegDeptCode>" + departCode + "</QualityRegDeptCode>");
-				qualityStrSB.append("<QualityRegDeptName>" + qualityMonitoringInstance.getOrgUnit() + "</QualityRegDeptName>");
-				qualityStrSB.append("<QualityRegDateTime>" + regDateTime + "</QualityRegDateTime>");
-				qualityStrSB.append("<QualityMonitorItemCode>" + formDefinition.getId() + "</QualityMonitorItemCode>");
-				qualityStrSB.append("<QualityMonitorItemName>" + formDefinition.getFormName() + "</QualityMonitorItemName>");
-				qualityStrSB.append("</Record>");
-			}
-		}
-		qualityStrSB.append("</QualityRecords>");
-
 		StringBuilder returnStrSB = new StringBuilder();
-		returnStrSB.append("<Item>");
-		returnStrSB.append(applyStrSB.toString());
-		returnStrSB.append(recycleStrSB.toString());
-		returnStrSB.append(cleanstrSB.toString());
-		returnStrSB.append(packageStrSB.toString());
-		returnStrSB.append(sterilizationstrSB.toString());
-		returnStrSB.append(sendstrSB.toString());
-		returnStrSB.append(signRecordStrSB.toString());
-		returnStrSB.append(useStrSB.toString());
-		returnStrSB.append(discardstrSB.toString());
-		returnStrSB.append(qualityStrSB.toString());
-		returnStrSB.append("</Item>");
+		returnStrSB.append("<returnContent>");
+		returnStrSB.append(useRecordStr);
+		// <subNo>申请单子序号，如：器械包条码</subNo>
+		returnStrSB.append("<subNo>" + tousseInstance.getBarcode() + "</subNo>");
+		returnStrSB.append("<instrumentSetBarcode>" + instrumentSetBarcode + "</instrumentSetBarcode>");
+		returnStrSB.append("<instrumentSetName>" + instrumentSetName + "</instrumentSetName>");
+		returnStrSB.append("<instrumentSetAppliFormNo>" + instrumentSetAppliFormNo + "</instrumentSetAppliFormNo>");
+		returnStrSB.append("<sterilizationOperatorCode>" + sterilizationOperatorCode + "</sterilizationOperatorCode>");
+		returnStrSB.append("<sterilizationOperatorName>" + sterilizationOperatorName + "</sterilizationOperatorName>");
+		returnStrSB.append("<sterilizationBeginDatetime>" + sterilizationBeginDatetime + "</sterilizationBeginDatetime>");
+		returnStrSB.append("<instrumentSetExpirationDatetime>" + instrumentSetExpirationDatetime + "</instrumentSetExpirationDatetime>");
+		returnStrSB.append("<sterilizationFurnaceName>" + sterilizationFurnaceName + "</sterilizationFurnaceName>");
+		returnStrSB.append("<sterilizationCycleNum>" + sterilizationCycleNum + "</sterilizationCycleNum>");
+		
+		returnStrSB.append("<washOperatorCode>" + washOperatorCode + "</washOperatorCode>");
+		returnStrSB.append("<washOperatorName>" + washOperatorName + "</washOperatorName>");
+		returnStrSB.append("<washBeginDatetime>" + washBeginDatetime + "</washBeginDatetime>");
+		returnStrSB.append("<washEndDatetime>" + washEndDatetime + "</washEndDatetime>");
+		
+		returnStrSB.append("<deliverPackPperatorCode>" + deliverPackPperatorCode + "</deliverPackPperatorCode>");
+		returnStrSB.append("<deliverPackOperatorName>" + deliverPackOperatorName + "</deliverPackOperatorName>");
+		returnStrSB.append("<assembleDatetime>" + assembleDatetime + "</assembleDatetime>");
+		returnStrSB.append("<assembleProofOperatorCode>" + assembleProofOperatorCode + "</assembleProofOperatorCode>");
+		returnStrSB.append("<assembleProofOperatorName>" + assembleProofOperatorName + "</assembleProofOperatorName>");
+		returnStrSB.append("<proofDatetime>" + proofDatetime + "</proofDatetime>");
+		
+		returnStrSB.append("<sterilizationProgramCode>" + sterilizationProgramCode + "</sterilizationProgramCode>");
+		returnStrSB.append("<sterilizationProgramName>" + sterilizationProgramName + "</sterilizationProgramName>");
+		returnStrSB.append("<sterilizationEndDatetime>" + sterilizationEndDatetime + "</sterilizationEndDatetime>");
+		returnStrSB.append("<biologicalMonitorResult>" + biologicalMonitorResult + "</biologicalMonitorResult>");
+		
+		returnStrSB.append("<deliveryOperatorCode>" + deliveryOperatorCode + "</deliveryOperatorCode>");
+		returnStrSB.append("<deliveryOperatorName>" + deliveryOperatorName + "</deliveryOperatorName>");
+		returnStrSB.append("<deliveryDatetime>" + deliveryDatetime + "</deliveryDatetime>");
+		
+		returnStrSB.append("</returnContent>");
 		returnStr = returnStrSB.toString();
 		return returnStr;
 	}