Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r15858 -r16040
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 15858)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 16040)
@@ -1030,13 +1030,13 @@
 			if(applyTousseMap.size() > 0){
 				recyclingApplicationManager.createRecyclingApplicationByTousse(
 						applyTousseMap,new HashMap<String, Integer>(), applicant, depart, departCoding, hospitalNumber, remark,
-						tousseBarcodeMap,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,
+						tousseBarcodeMap,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_COMBO_FORM,
 						applyUrgentTousseMap,useRecordId);
 			}
 			if(applyDiposableGoodsMap.size() > 0){
 				recyclingApplicationManager.createRecyclingApplicationByTousse(
 						new HashMap<String, Integer>(),applyDiposableGoodsMap, applicant, depart, departCoding, hospitalNumber, remark,
-						tousseBarcodeMap,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM,
+						tousseBarcodeMap,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_COMBO_FORM,
 						applyUrgentTousseMap,useRecordId);
 			}
 		}else{
@@ -1231,7 +1231,7 @@
 				remark.append(StringUtils.join(washHandNurseSet, ",")).append(";");
 			}
 			if(circuitNurseSet.size() > 0){
-				remark.append("巡回护士:");
+				remark.append(getCircuitNurseLabelName() + ":");
 				remark.append(StringUtils.join(circuitNurseSet, ","));
 			}
 			if(patientNameSet.size() > 0){
@@ -1391,7 +1391,7 @@
 				}
 			}
 			if(circuitNurseSet.size() > 0){
-				remarks.add("巡回护士:" + StringUtils.join(circuitNurseSet, ","));
+				remarks.add(getCircuitNurseLabelName() + ":" + StringUtils.join(circuitNurseSet, ","));
 			}
 			if(patientNameSet.size() > 0){
 				remarks.add("病人:" + StringUtils.join(patientNameSet, ","));
@@ -1412,6 +1412,18 @@
 	}
 	
 	/**
+	 * 查询使用记录的巡回护士标签名称
+	 * @return
+	 */
+	private String getCircuitNurseLabelName(){
+		String circuitNurseLabelName = CssdUtils.getSystemSetConfigByName("circuitNurseLabelName");
+		if(StringUtils.isNotBlank(circuitNurseLabelName)){
+			return circuitNurseLabelName;
+		}
+		return "巡回护士";
+	}
+	
+	/**
 	 * 使用记录合成申请单(原中六的方法直接移植)
 	 * 
 	 */