Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r37662 -r37665
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 37662)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 37665)
@@ -7340,37 +7340,38 @@
 						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@operationRoom") != -1){
 					for (UseRecord useRecord : useRecordList) {
 						//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount @operationRoom
+						String newUseRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark;
 						if(StringUtils.isNotBlank(RecyclingApplicationUtils.getCircuitNurseLabelName())){
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", RecyclingApplicationUtils.getCircuitNurseLabelName());
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", RecyclingApplicationUtils.getCircuitNurseLabelName());
 						}else{
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", "");
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", "");
 						}
 						if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse());
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse());
 						}else{
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurse", "");
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurse", "");
 						}
 						if(StringUtils.isNotBlank(useRecord.getPatientName())){
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName());
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName());
 						}else{
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@patientName", "");
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@patientName", "");
 						}
 						if(StringUtils.isNotBlank(useRecord.getRemark())){
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark());
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark());
 						}else{
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@useRecordRemark", "");
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@useRecordRemark", "");
 						}
 						if(StringUtils.isNotBlank(useRecord.getHospitalNum())){
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum());
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum());
 						}else{
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", "");
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", "");
 						}
 						if(StringUtils.isNotBlank(useRecord.getOperationRoom())){
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@operationRoom", useRecord.getOperationRoom());
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@operationRoom", useRecord.getOperationRoom());
 						}else{
-							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@operationRoom", "");
+							newUseRecordMergeConvertRecyclingApplicationRemark = newUseRecordMergeConvertRecyclingApplicationRemark.replace("@operationRoom", "");
 						}
-						remarks.add(useRecordMergeConvertRecyclingApplicationRemark);
+						remarks.add(newUseRecordMergeConvertRecyclingApplicationRemark);
 					}
 				}
 			}else{
@@ -7392,7 +7393,9 @@
 			}
 		}
 		if(CollectionUtils.isNotEmpty(remarks)){
-			return StringUtils.join(remarks , "、");
+			String remark = StringUtils.join(remarks , "、");
+			remark = remark.length() > 1000 ? (remark.substring(0, 1000) + "...") : remark;
+			return remark;
 		}
 		return recyclingApplication.getRemark();
 	}