Index: ssts-web/src/main/webapp/jasperRtp/unqualifiedPretreatmentReport.jasper
===================================================================
diff -u -r20872 -r21527
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/unqualifiedPretreatmentReport.jrxml
===================================================================
diff -u -r20872 -r21527
--- ssts-web/src/main/webapp/jasperRtp/unqualifiedPretreatmentReport.jrxml	(.../unqualifiedPretreatmentReport.jrxml)	(revision 20872)
+++ ssts-web/src/main/webapp/jasperRtp/unqualifiedPretreatmentReport.jrxml	(.../unqualifiedPretreatmentReport.jrxml)	(revision 21527)
@@ -24,8 +24,8 @@
 	<field name="recyclingTime" class="java.lang.String">
 		<fieldDescription><![CDATA[recyclingTime]]></fieldDescription>
 	</field>
-	<field name="recyclingUser" class="java.lang.String">
-		<fieldDescription><![CDATA[recyclingUser]]></fieldDescription>
+	<field name="operator" class="java.lang.String">
+		<fieldDescription><![CDATA[operator]]></fieldDescription>
 	</field>
 	<field name="tousseName" class="java.lang.String">
 		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
@@ -72,7 +72,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[回收人]]></text>
+				<text><![CDATA[清点人]]></text>
 			</staticText>
 			<staticText>
 				<reportElement uuid="8a2a1fa7-0fc5-4309-a75c-98b9982e4d3b" mode="Opaque" x="0" y="0" width="160" height="38" forecolor="#000000" backcolor="#F0F8FF"/>
@@ -136,7 +136,7 @@
 					<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{recyclingUser}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{operator}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="f6914fc5-39bc-43c3-868f-e072efef9bc0" stretchType="RelativeToBandHeight" mode="Opaque" x="450" y="0" width="200" height="38" isPrintWhenDetailOverflows="true" forecolor="#000000"/>
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UnqualifiedPretreatmentVo.java
===================================================================
diff -u -r20872 -r21527
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UnqualifiedPretreatmentVo.java	(.../UnqualifiedPretreatmentVo.java)	(revision 20872)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UnqualifiedPretreatmentVo.java	(.../UnqualifiedPretreatmentVo.java)	(revision 21527)
@@ -12,9 +12,9 @@
 	 */
 	private String recyclingTime;
 	/**
-	 * 回收人
+	 * 清点人
 	 */
-	private String recyclingUser;
+	private String operator;
 	/**
 	 * 备注
 	 */
@@ -38,11 +38,12 @@
 	public void setRecyclingTime(String recyclingTime) {
 		this.recyclingTime = recyclingTime;
 	}
-	public String getRecyclingUser() {
-		return recyclingUser;
+	
+	public String getOperator() {
+		return operator;
 	}
-	public void setRecyclingUser(String recyclingUser) {
-		this.recyclingUser = recyclingUser;
+	public void setOperator(String operator) {
+		this.operator = operator;
 	}
 	public String getRemark() {
 		return remark;
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java
===================================================================
diff -u -r20965 -r21527
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java	(.../RecyclingItemManagerImpl.java)	(revision 20965)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java	(.../RecyclingItemManagerImpl.java)	(revision 21527)
@@ -93,7 +93,7 @@
 		}else{
 			remarkSql = sqlFunctionsAdapter.strNotBlank("po.remark") + " and po.remark <> 'undefined'";
 		}
-		String sql = String.format("select po.remark,po.tousseName,rr.depart,rr.recyclingTime,rr.recyclingUser from %s po join %s rr on rr.id = po.recyclingRecord_id where %s and %s and %s order by rr.departCode", 
+		String sql = String.format("select po.remark,po.tousseName,rr.depart,rr.recyclingTime,rr.operator from %s po join %s rr on rr.id = po.recyclingRecord_id where %s and %s and %s order by rr.departCode", 
 				poName,RecyclingRecord.class.getSimpleName(),dateSql,departSql,remarkSql);
 		List<UnqualifiedPretreatmentVo> ret = new ArrayList<>();
 		ResultSet rs = objectDao.executeSql(sql);
@@ -102,14 +102,14 @@
 				String rm = rs.getString("remark");
 				String tousseName = rs.getString("tousseName");
 				String depart = rs.getString("depart");
-				String recyclingUser = rs.getString("recyclingUser");
+				String operator = rs.getString("operator");
 				Timestamp t = rs.getTimestamp("recyclingTime", Calendar.getInstance());
 				
 				UnqualifiedPretreatmentVo vo = new UnqualifiedPretreatmentVo();
 				vo.setDepart(depart);
 				vo.setRecyclingTime(ForgonDateUtils.safelyFormatDate(t,
 						Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""));
-				vo.setRecyclingUser(recyclingUser);
+				vo.setOperator(operator);
 				vo.setTousseName(tousseName);
 				vo.setRemark(rm);
 				ret.add(vo);