Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
===================================================================
diff -u -r31181 -r35588
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java	(.../UrgentLevelManagerImpl.java)	(revision 31181)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java	(.../UrgentLevelManagerImpl.java)	(revision 35588)
@@ -18,6 +18,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.urgent.UrgentLevel;
+import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
@@ -116,7 +117,7 @@
 					if(newGrade == -1){
 						continue;
 					}
-					if(grade == newGrade){
+					if(MathTools.equals(grade, newGrade)){
 						continue;
 					}
 					UrgentLevel ul = getForUpdate(id);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
===================================================================
diff -u -r28549 -r35588
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 28549)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 35588)
@@ -39,6 +39,7 @@
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.packingrecordclassifybasket.service.PackingRecordClassifyBasketManager;
+import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
@@ -822,7 +823,7 @@
 						isLoadDefaultCleanMethod = false;// 只需要一个清洗程序即可
 					}
 					
-					if (numOfwashedStops == item.getAmount()) {
+					if (MathTools.equals(numOfwashedStops, item.getAmount())) {
 						// 物品全部被终止
 						obj.put("name", tousseName + "(已终止)");
 					} else {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
===================================================================
diff -u -r33608 -r35588
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java	(.../ReviewedBasketManagerImpl.java)	(revision 33608)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java	(.../ReviewedBasketManagerImpl.java)	(revision 35588)
@@ -29,6 +29,7 @@
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
+import com.forgon.tools.MathTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
@@ -344,15 +345,6 @@
 		String deleteSql = "delete from "+ ReviewedBasket.class.getSimpleName() +" where id in ( " + whereSql +" )";
 		objectDao.excuteSQL(deleteSql);*/
 	}
-	@Override
-	public boolean isTousseInReviewedBasket(ReviewedBasket basket, TousseInstance instance) {
-		boolean exist = false;//标示这个包是否在这个审核篮筐内
-		
-		if (basket.getId() == instance.getReviewBasket_id()){
-			exist = true;
-		}
-		return exist;
-	}
 
 	/**
 	 * 根据篮筐条码（灭菌篮筐条码或者虚拟篮筐条码），获取其生成ReviewedBasket的数量
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java
===================================================================
diff -u -r31897 -r35588
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java	(.../ReviewedBasketManager.java)	(revision 31897)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java	(.../ReviewedBasketManager.java)	(revision 35588)
@@ -78,8 +78,6 @@
 	public ReviewedBasket getReviewedBasketForSterilizeRecordNew(String barcode,
 			Long sterilizeRecordId);
 	
-	public boolean isTousseInReviewedBasket(ReviewedBasket basket,TousseInstance instance);
-	
 	public void deleteAllTousse(String reviewBasketId);
 	
 	/**
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/commonlyUsedDoctor/service/CommonlyUsedDoctorManagerImpl.java
===================================================================
diff -u -r21962 -r35588
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/commonlyUsedDoctor/service/CommonlyUsedDoctorManagerImpl.java	(.../CommonlyUsedDoctorManagerImpl.java)	(revision 21962)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/commonlyUsedDoctor/service/CommonlyUsedDoctorManagerImpl.java	(.../CommonlyUsedDoctorManagerImpl.java)	(revision 35588)
@@ -15,6 +15,7 @@
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.entity.commonlyUsedDoctor.CommonlyUsedDoctor;
+import com.forgon.tools.MathTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.json.JSONUtil;
@@ -138,7 +139,7 @@
 					if(newGrade == -1){
 						continue;
 					}
-					if(grade == newGrade){
+					if(MathTools.equals(grade, newGrade)){
 						continue;
 					}
 					CommonlyUsedDoctor cDoctor = getForUpdate(id);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/datamodifyrecord/service/DataModifyRecordManagerImpl.java
===================================================================
diff -u -r34958 -r35588
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/datamodifyrecord/service/DataModifyRecordManagerImpl.java	(.../DataModifyRecordManagerImpl.java)	(revision 34958)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/datamodifyrecord/service/DataModifyRecordManagerImpl.java	(.../DataModifyRecordManagerImpl.java)	(revision 35588)
@@ -32,6 +32,7 @@
 import com.forgon.exception.SystemException;
 import com.forgon.security.model.User;
 import com.forgon.security.service.UserManager;
+import com.forgon.tools.MathTools;
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
@@ -715,7 +716,7 @@
 				newAmount = newAmount == null ? 0 : newAmount;
 				Integer oldAmount = diposableGoodsInstance.getAmount();
 				oldAmount = oldAmount == null ? 0 : oldAmount;
-				if(newAmount != oldAmount){
+				if(!MathTools.equals(newAmount, oldAmount)){
 					//修改材料数量
 					DataModifyRecord dataModifyRecord = new DataModifyRecord();
 					dataModifyRecord.setModifyDateTime(new Date());