Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r36197 -r36211
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 36197)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 36211)
@@ -1931,103 +1931,103 @@
 			
 			if((StringUtils.isNotBlank(originalPatientName) || StringUtils.isNotBlank(patientName))
 					&& !StringUtils.equals(originalPatientName, patientName)){
-				needAppendRemark.append("病人名称由").append(originalPatientName).append("修改为").append(patientName);
+				needAppendRemark.append("病人名称由").append(formateStringValue(originalPatientName)).append("修改为").append(formateStringValue(patientName));
 				foreignTousseApplication.setPatient(patientName);
 			}
 			if((StringUtils.isNotBlank(originalPatientAge) || StringUtils.isNotBlank(patientAge))
 					&& !StringUtils.equals(originalPatientAge, patientAge)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("年龄由").append(originalPatientAge).append("修改为").append(patientAge);
+				needAppendRemark.append("年龄由").append(formateStringValue(originalPatientAge)).append("修改为").append(formateStringValue(patientAge));
 				foreignTousseApplication.setPatientAge(patientAge);
 			}
 			if((StringUtils.isNotBlank(originalPatientSex) || StringUtils.isNotBlank(patientSex))
 					&& !StringUtils.equals(originalPatientSex, patientSex)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("性别由").append(originalPatientSex).append("修改为").append(patientSex);
+				needAppendRemark.append("性别由").append(formateStringValue(originalPatientSex)).append("修改为").append(formateStringValue(patientSex));
 				foreignTousseApplication.setPatientSex(patientSex);
 			}
 			if((StringUtils.isNotBlank(originalHospitalNumber) || StringUtils.isNotBlank(hospitalNumber))
 					&& !StringUtils.equals(originalHospitalNumber, hospitalNumber)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("住院号由").append(originalHospitalNumber).append("修改为").append(hospitalNumber);
+				needAppendRemark.append("住院号由").append(formateStringValue(originalHospitalNumber)).append("修改为").append(formateStringValue(hospitalNumber));
 				foreignTousseApplication.setHospitalNumber(hospitalNumber);
 			}
 			if((StringUtils.isNotBlank(originalClinicNumber) || StringUtils.isNotBlank(clinicNumber))
 					&& !StringUtils.equals(originalClinicNumber, clinicNumber)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("诊疗号由").append(originalClinicNumber).append("修改为").append(clinicNumber);
+				needAppendRemark.append("诊疗号由").append(formateStringValue(originalClinicNumber)).append("修改为").append(formateStringValue(clinicNumber));
 				foreignTousseApplication.setClinicNumber(clinicNumber);
 			}
 			if((StringUtils.isNotBlank(originalPatientArea) || StringUtils.isNotBlank(patientArea))
 					&& !StringUtils.equals(originalPatientArea, patientArea)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("病区由").append(originalPatientArea).append("修改为").append(patientArea);
+				needAppendRemark.append("病区由").append(formateStringValue(originalPatientArea)).append("修改为").append(formateStringValue(patientArea));
 				foreignTousseApplication.setPatientArea(patientArea);
 			}
 			if((StringUtils.isNotBlank(originalRoomNumber) || StringUtils.isNotBlank(roomNumber))
 					&& !StringUtils.equals(originalRoomNumber, roomNumber)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("病室由").append(originalRoomNumber).append("修改为").append(roomNumber);
+				needAppendRemark.append("病室由").append(formateStringValue(originalRoomNumber)).append("修改为").append(formateStringValue(roomNumber));
 				foreignTousseApplication.setRoomNumber(roomNumber);
 			}
 			if((StringUtils.isNotBlank(originalBedNumber) || StringUtils.isNotBlank(bedNumber))
 					&& !StringUtils.equals(originalBedNumber, bedNumber)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("床位由").append(originalBedNumber).append("修改为").append(bedNumber);
+				needAppendRemark.append("床位由").append(formateStringValue(originalBedNumber)).append("修改为").append(formateStringValue(bedNumber));
 				foreignTousseApplication.setBedNumber(bedNumber);
 			}
 			if((StringUtils.isNotBlank(originalDoctor) || StringUtils.isNotBlank(doctor))
 					&& !StringUtils.equals(originalDoctor, doctor)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("医生由").append(originalDoctor).append("修改为").append(doctor);
+				needAppendRemark.append("医生由").append(formateStringValue(originalDoctor)).append("修改为").append(formateStringValue(doctor));
 				foreignTousseApplication.setDoctor(doctor);
 			}
 			if((StringUtils.isNotBlank(originalSurgery) || StringUtils.isNotBlank(surgery))
 					&& !StringUtils.equals(originalSurgery, surgery)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("手术名称由").append(originalSurgery).append("修改为").append(surgery);
+				needAppendRemark.append("手术名称由").append(formateStringValue(originalSurgery)).append("修改为").append(formateStringValue(surgery));
 				foreignTousseApplication.setSurgery(surgery);
 			}
 			if((StringUtils.isNotBlank(originalOperationTime) || StringUtils.isNotBlank(operationTime))
 					&& !StringUtils.equals(originalOperationTime, operationTime)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("手术时间由").append(originalOperationTime).append("修改为").append(operationTime);
+				needAppendRemark.append("手术时间由").append(formateStringValue(originalOperationTime)).append("修改为").append(formateStringValue(operationTime));
 				foreignTousseApplication.setOperationTime(ForgonDateUtils.safelyParseDate(operationTime));
 			}
 			if((StringUtils.isNotBlank(originalOperationRoom) || StringUtils.isNotBlank(operationRoom))
 					&& !StringUtils.equals(originalOperationRoom, operationRoom)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("手术间由").append(originalOperationRoom).append("修改为").append(operationRoom);
+				needAppendRemark.append("手术间由").append(formateStringValue(originalOperationRoom)).append("修改为").append(formateStringValue(operationRoom));
 				foreignTousseApplication.setOperationRoom(operationRoom);
 			}
 			if((StringUtils.isNotBlank(originalAscriptionDepartment) || StringUtils.isNotBlank(ascriptionDepartment))
 					&& !StringUtils.equals(originalAscriptionDepartment, ascriptionDepartment)){
 				if(needAppendRemark.length() > 0){
 					needAppendRemark.append(";");
 				}
-				needAppendRemark.append("病人所属科室由").append(originalAscriptionDepartment).append("修改为").append(ascriptionDepartment);
+				needAppendRemark.append("病人所属科室由").append(formateStringValue(originalAscriptionDepartment)).append("修改为").append(formateStringValue(ascriptionDepartment));
 				foreignTousseApplication.setAscriptionDepartment(ascriptionDepartment);
 			}
 			LoginUserData userData = AcegiHelper.getLoginUser();
@@ -2047,6 +2047,15 @@
 			throw new RuntimeException(e.getMessage());
 		}
 	}
+	
+	/**
+	 * 字符串格式化
+	 * @param stringValue
+	 * @return
+	 */
+	private String formateStringValue(String stringValue){
+		return "“" + StringTools.defaultString(stringValue, "") + "”";
+	}
 
 	/**
 	 * 如果更改了（住院号和病人姓名）或（诊疗号和病人姓名），则需要将更改后器械包从原申请单中拆分出来，生成新的外来器械申请单