Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r13453 -r13568 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 13453) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 13568) @@ -69,7 +69,9 @@ // 炉次 private Integer frequency; - // 循环次数 + /** + * 循环次数 + */ private Long cycleCounter; // 灭菌目的 @@ -90,7 +92,9 @@ private List reviewedBaskets = new ArrayList(); private String orgUnitCoding; - + /** + * 灭菌记录条数 + */ private Long sterilizerRecordAmount; // 照片记录 Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r13557 -r13568 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13557) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13568) @@ -2813,7 +2813,7 @@ final TousseInstance tousseInstance = (TousseInstance) barcodeDevice; if(!TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseInstance.getTousseDefinition().getTousseType())) return JSONUtil.buildErrorMsgJsonResult("只能退货普通器械包"); - String[] acceptStatus = {TousseInstance.STATUS_SHIPPED}; + String[] acceptStatus = {TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED}; if(!ArrayUtils.contains(acceptStatus, tousseInstance.getStatus())) return JSONUtil.buildErrorMsgJsonResult(String.format("此器械包状态为[%s],不可退货", tousseInstance.getStatus()));