Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33845 -r33853
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33845)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33853)
@@ -16785,7 +16785,7 @@
 					+ " left join UseRecord ur on ur.id=ti.useRecord_id ";
 		}else if(QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH.equals(responsibilityPart)){
 			String wdrStartDate = dateQueryAdapter.dateToVarchar1("wdr.startDate");
-			extraQueryForResponsibilityPart = ",wdr.disinfectIdentification,"+ wdrStartDate +" washStartDate,wdr.washPersonInCharge ";
+			extraQueryForResponsibilityPart = ",wdr.disinfectIdentification,"+ wdrStartDate +" washStartDate,case when qmi.responsiblePerson is null or qmi.responsiblePerson='' then wdr.washPersonInCharge else qmi.responsiblePerson end washPersonInCharge ";
 			extraJoinForResponsibilityPart = "   left join WashAndDisinfectRecord wdr on wdr.id=qmi.scanWashRecord_id ";
 			if(Constants.STR_YES.equals(recordRinseInformation)){
 				ReportQueryParams params = new ReportQueryParams();
@@ -18337,7 +18337,7 @@
 					String washPersonInCharge = null;
 					if(SqlUtils.isExistColumn(rs, "washPersonInCharge")){
 						washPersonInCharge = rs.getString("washPersonInCharge");
-						copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","清洗责任人", washPersonInCharge, isCustomADJAndIsFormNameIsADJ);
+						copyPartPropertiesMonitoringItem(list, monitoringItemBean, 15, "清洗情况","责任人", washPersonInCharge, isCustomADJAndIsFormNameIsADJ);
 					}
 					if(!readedSet.contains(dataStr)){
 						readedSet.add(dataStr);
@@ -25165,7 +25165,7 @@
 			List<String> values = new ArrayList<String>();
 			values.add("清洗机");
 			values.add("清洗开始时间");
-			values.add("清洗责任人");
+			values.add("责任人");
 			values.add("当天清洗件数");
 			values.add("当天清洗外来器械件数");
 			columnNameMap.put("清洗情况+" + maxNum, values);