Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
===================================================================
diff -u -r33942 -r35340
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 33942)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 35340)
@@ -100,6 +100,10 @@
 	 * 特殊感染类型
 	 */
 	private String specialInfection;
+	/**
+	 * 特殊感染类型的颜色
+	 */
+	private String specialInfectionColorCode;
 	public Long getId() {
 		return id;
 	}
@@ -299,5 +303,13 @@
 	public void setSpecialInfection(String specialInfection) {
 		this.specialInfection = specialInfection;
 	}
+
+	public String getSpecialInfectionColorCode() {
+		return specialInfectionColorCode;
+	}
+
+	public void setSpecialInfectionColorCode(String specialInfectionColorCode) {
+		this.specialInfectionColorCode = specialInfectionColorCode;
+	}
 	
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r34123 -r35340
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 34123)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 35340)
@@ -33,6 +33,7 @@
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
+import com.forgon.disinfectsystem.basedatamanager.specialInfection.service.SpecialInfectionManager;
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.tousseGroup.service.TousseGroupManager;
@@ -48,6 +49,7 @@
 import com.forgon.disinfectsystem.entity.message.SystemMessage;
 import com.forgon.disinfectsystem.entity.printRecyclingApplicationConfig.PrintConfig;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
+import com.forgon.disinfectsystem.entity.specialInfection.SpecialInfection;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.inventorymanagement.model.HrpTousseItem;
 import com.forgon.disinfectsystem.print.vo.PrintPageVo;
@@ -119,6 +121,12 @@
 	
 	private OperationManager operationManager;
 	
+	private SpecialInfectionManager specialInfectionManager;
+	
+	public void setSpecialInfectionManager(
+			SpecialInfectionManager specialInfectionManager) {
+		this.specialInfectionManager = specialInfectionManager;
+	}
  	public void setOperationManager(OperationManager operationManager) {
 		this.operationManager = operationManager;
 	}
@@ -377,7 +385,8 @@
 			objectDao.saveOrUpdate(invoicePlan);
 		}
 		String operationInfo = "";
-		RecyclingApplicationVo resultVo = invoicePlanManager.invoicePlan2RecyclingApplicationVo(invoicePlan,true);
+		Map<String, SpecialInfection> specialInfectionMap = specialInfectionManager.getSpecialInfectionMap();
+		RecyclingApplicationVo resultVo = invoicePlanManager.invoicePlan2RecyclingApplicationVo(invoicePlan,true,specialInfectionMap);
 		if(resultVo != null){
 			operationInfo = String.format("打开了待回收列表的%s,单号:%s", resultVo.getType(),resultVo.getSerialNumber());
 			List<TousseItemVo> items = resultVo.getApplicationItems();
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r35067 -r35340
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 35067)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 35340)
@@ -89,6 +89,7 @@
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingItem;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
+import com.forgon.disinfectsystem.entity.specialInfection.SpecialInfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
@@ -6156,6 +6157,12 @@
 	@Override
 	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(
 			InvoicePlan invoicePlan,boolean sort) {
+		return invoicePlan2RecyclingApplicationVo(invoicePlan, sort, null);
+	}
+	@Override
+	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(
+			InvoicePlan invoicePlan, boolean sort,
+			Map<String, SpecialInfection> specialInfectionMap) {
 		RecyclingApplicationVo vo = null;
 		if(invoicePlan != null){
 			vo = new RecyclingApplicationVo();
@@ -6178,6 +6185,9 @@
 			vo.setHandleDepart(invoicePlan.getHandleDepart());
 			vo.setVersion(invoicePlan.getVersion());
 			vo.setSpecialInfection(invoicePlan.getSpecialInfection());
+			if(MapUtils.isNotEmpty(specialInfectionMap) && StringUtils.isNotBlank(invoicePlan.getSpecialInfection()) && specialInfectionMap.containsKey(invoicePlan.getSpecialInfection())){
+				vo.setSpecialInfectionColorCode(specialInfectionMap.get(invoicePlan.getSpecialInfection()).getColorCode());
+			}
 			if(invoicePlan.getSubmitTime() != null){
 				vo.setSubmitTime(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(invoicePlan.getSubmitTime()));
 			}
@@ -6246,7 +6256,6 @@
 		}
 		return vo;
 	}
-
 	/**
 	 * 根据器械包实例获取是有记录(DGSDBZXYY-121 如果这个包是有标识牌的有使用记录的那么也要带出相关的巡回护士、手术间)
 	 * @param list