Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r19677 -r19721 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 19677) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 19721) @@ -1026,7 +1026,7 @@ Integer tempFrequency = getMaxFrequency(sr, sterilizationRecord.getId()); //因为返回值一定不为空null,所以直接转成Integer类型 //新增的灭菌记录,需要校验前台传过来的炉次是否合法(防止用户不规范的操作顺序,导致同一炉次被保存两次) - if (!MathTools.equals(frequency, tempFrequency)) { + if (frequency == null || frequency < tempFrequency) { result.put(JSONUtil.JSON_KEY_SUCCESS, false); result.put(JSONUtil.JSON_KEY_MESSAGE, "此炉次已经被使用,请确认!"); return result; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java =================================================================== diff -u -r18137 -r19721 --- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java (.../TestTousseOverLoad.java) (revision 18137) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java (.../TestTousseOverLoad.java) (revision 19721) @@ -56,7 +56,7 @@ private String basketCode = "018000001"; @Test - @Rollback(false) +// @Rollback(false) public void testGetTousseOverLoadData(){ //1.初始化基础数据 initCSSDData();