Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r35413 -r35426
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 35413)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 35426)
@@ -118,6 +118,7 @@
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord;
+import com.forgon.disinfectsystem.entity.specialInfection.SpecialInfection;
 import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransition;
 import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransitionItem;
 import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransitionItemVO;
@@ -2046,6 +2047,16 @@
 					return JSONUtil.buildErrorMsgJsonResult("扫描的条码不是本科室用户");
 				}
 			}
+			//如果是特殊感染类型
+			if(barcodeDevice instanceof SpecialInfection){
+				SpecialInfection specialInfection = (SpecialInfection)barcodeDevice;
+				if(!StringUtils.equals(specialInfection.getEnable(), Constants.STR_YES)){
+					return JSONUtil.buildErrorMsgJsonResult(specialInfection.getName() + "已被停用,请先启用");
+				}
+				return new JSONStringer().object().key("success").value(true)
+						.key("type").value("SpecialInfection").key("data")
+						.value(JSONObject.fromObject(specialInfection)).endObject().toString();
+			}
 
 			if(!(barcodeDevice instanceof TousseInstance) 
 					&& !(barcodeDevice instanceof ExpensiveGoodsInstance) 
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r35346 -r35426
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 35346)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 35426)
@@ -20,6 +20,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -2446,9 +2447,16 @@
 		String specialInfection = StringUtils.defaultString(modified.getSpecialInfection());
 		if (!StringUtils.equals(originalSpecialInfection, specialInfection)) {
 			curUseRecord.setSpecialInfection(specialInfection);
-			curUseRecord.setSpecialInfectionID(modified.getSpecialInfectionID());
 			modifyContent.add("特殊感染类型由"+ originalSpecialInfection +"修改为"+ specialInfection);
 		}
+		
+		// specialInfectionID
+		Long originalSpecialInfectionID = original.getSpecialInfectionID();
+		Long specialInfectionId = modified.getSpecialInfectionID();
+		if (!Objects.equals(originalSpecialInfectionID, specialInfectionId)) {
+			curUseRecord.setSpecialInfectionID(specialInfectionId);
+			modifyContent.add("特殊感染类型Id由"+ originalSpecialInfectionID +"修改为"+ specialInfectionId);
+		}
 
 		// remark
 		String originalRemark = StringUtils.defaultString(original.getRemark());