Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r19925 -r20014 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19925) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 20014) @@ -3974,6 +3974,17 @@ } } + // 验证是否过期 + Date validUntil = ti.getValidUntil(); + if (validUntil == null) { + obj.put(JSONUtil.JSON_KEY_MESSAGE, "器械包无失效日期,不能登记"); + return obj; + } + if (validUntil.before(new Date())) { + obj.put(JSONUtil.JSON_KEY_MESSAGE, "器械包已过期,不能登记").toString(); + return obj; + } + // 3.检测该器械包有没有被召回 if (TousseInstance.STATUS_WAIT_FOR_RECALL.equals(ti.getStatus()) || TousseInstance.STATUS_RECALLED.equals(ti.getStatus())) { obj.put(JSONUtil.JSON_KEY_MESSAGE, "该器械包不能被使用,已被召回!");