Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
===================================================================
diff -u -r33656 -r33942
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 33656)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 33942)
@@ -214,7 +214,7 @@
 		String groupBySql = "";
 		if(this.enableUrgentFunction || extraQuerys != null && extraQuerys.contains("包数")){
 			joinSqlOfUrgent = " left join UrgentLevel ul on p.urgentLevel_id=ul.id left join RecyclingItem ri on ri.recyclingRecord_id=r.id ";
-			groupBySql = " group by r.id,r.communicationUserCode,r.communicationUserName,r.depart,r.departCode,r.departmentSender,r.operator,r.orgUnitCoding,r.packingTaskSerialNumber,r.recycleAmountNeedConfirm,r.recyclingApplicationType,r.recyclingTime,r.recyclingUser,r.status,r.recyclingApplication_id,p.applicationTime,p.type,p.remark,p.submitTime,p.recyclingStatus ,ul.id ,ul.name ,ul.colorCode,ul.colorName,ul.grade,p.operationRoom,p.patient,p.hospitalNumber,p.serialNumber,r.recyclingTimes ";
+			groupBySql = " group by r.id,r.communicationUserCode,r.communicationUserName,r.depart,r.departCode,r.departmentSender,r.operator,r.orgUnitCoding,r.packingTaskSerialNumber,r.recycleAmountNeedConfirm,r.recyclingApplicationType,r.recyclingTime,r.recyclingUser,r.status,r.recyclingApplication_id,p.applicationTime,p.type,p.remark,p.submitTime,p.recyclingStatus,p.specialInfection ,ul.id ,ul.name ,ul.colorCode,ul.colorName,ul.grade,p.operationRoom,p.patient,p.hospitalNumber,p.serialNumber,r.recyclingTimes ";
 			if(this.enableHaveUnRecycling){
 				groupBySql += ",p.id ";
 			}
@@ -226,7 +226,7 @@
 		if (dbConnection.isSqlServer()) {
 			String tempSql = "(SELECT TOP "
 					+ end
-					+ " r.*,p.applicationTime, p.type,p.remark,p.submitTime,p.recyclingStatus,p.operationRoom,p.patient,p.hospitalNumber,p.serialNumber "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() 
+					+ " r.*,p.applicationTime, p.type,p.remark,p.submitTime,p.recyclingStatus,p.specialInfection,p.operationRoom,p.patient,p.hospitalNumber,p.serialNumber "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() 
 					+ " p on r.recyclingApplication_id = p.id " + joinSqlOfUrgent
 					+ "where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
@@ -246,7 +246,7 @@
 					+ tempSql2
 					+ " order by A.recyclingTime desc ";
 		} else if (dbConnection.isOracle()) {
-			sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.applicationTime,p.type,p.remark,p.submitTime,p.recyclingStatus,p.operationRoom,p.patient,p.hospitalNumber,p.serialNumber "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() 
+			sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.applicationTime,p.type,p.remark,p.submitTime,p.recyclingStatus,p.specialInfection,p.operationRoom,p.patient,p.hospitalNumber,p.serialNumber "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() 
 					+ " r left join " + InvoicePlan.class.getSimpleName() + " p on r.recyclingApplication_id = p.id " + joinSqlOfUrgent
 					+ "where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
===================================================================
diff -u -r29908 -r33942
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 29908)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 33942)
@@ -96,7 +96,10 @@
 	 * 打印状态
 	 */
 	private Integer printed;
-	
+	/**
+	 * 特殊感染类型
+	 */
+	private String specialInfection;
 	public Long getId() {
 		return id;
 	}
@@ -288,5 +291,13 @@
 	public void setPrinted(Integer printed) {
 		this.printed = printed;
 	}
+
+	public String getSpecialInfection() {
+		return specialInfection;
+	}
+
+	public void setSpecialInfection(String specialInfection) {
+		this.specialInfection = specialInfection;
+	}
 	
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r33913 -r33942
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 33913)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 33942)
@@ -5550,6 +5550,7 @@
 					}
 				}
 				record.setRecyclingStatus(rs.getString("recyclingStatus"));
+				record.setSpecialInfection(rs.getString("specialInfection"));
 				// 设置申请单状态
 				recordVos.add(record);
 			}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r33921 -r33942
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33921)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33942)
@@ -5673,6 +5673,7 @@
 			vo.setIsPrepareRecycled(invoicePlan.getIsPrepareRecycled());
 			vo.setHandleDepart(invoicePlan.getHandleDepart());
 			vo.setVersion(invoicePlan.getVersion());
+			vo.setSpecialInfection(invoicePlan.getSpecialInfection());
 			if(invoicePlan.getSubmitTime() != null){
 				vo.setSubmitTime(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(invoicePlan.getSubmitTime()));
 			}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r33929 -r33942
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 33929)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 33942)
@@ -1129,6 +1129,7 @@
 		obj.put("recyclingStatus", StringTools.getDefaultString((ip.getRecyclingStatus())));
 		obj.put("urgentLevel", ip.getUrgentLevel());
 		obj.put("urgent",ip.getUrgent());
+		obj.put("specialInfection",ip.getSpecialInfection());
 		jsonArray.add(obj);
 	}
 	/**
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java
===================================================================
diff -u -r33656 -r33942
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java	(.../RecyclingRecordVo.java)	(revision 33656)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java	(.../RecyclingRecordVo.java)	(revision 33942)
@@ -99,6 +99,10 @@
 	 * 回收记录存在回收数量小于申请数量的物品(SZSDSRMYY-42 历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色)
 	 */
 	private boolean haveUnRecycling;
+	/**
+	 * 特殊感染类型 invoicePlan上的字段
+	 */
+	private String specialInfection;
 	public Long getId() {
 		return id;
 	}
@@ -219,5 +223,12 @@
 	public void setSerialNumber(String serialNumber) {
 		this.serialNumber = serialNumber;
 	}
+	public String getSpecialInfection() {
+		return specialInfection;
+	}
+	public void setSpecialInfection(String specialInfection) {
+		this.specialInfection = specialInfection;
+	}
+	
 }