Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r17202 -r17810 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 17202) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 17810) @@ -318,7 +318,7 @@ } } /** - * 灭菌完成确认 + * 灭菌完成确认或者灭菌卸载 */ public void completeSterilizationConfirm() { String idStr = StrutsParamUtils.getPraramValue("id", ""); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java =================================================================== diff -u -r17315 -r17810 --- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java (.../DeleteTousseDefinitionTest.java) (revision 17315) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java (.../DeleteTousseDefinitionTest.java) (revision 17810) @@ -21,12 +21,11 @@ * */ public class DeleteTousseDefinitionTest extends AbstractCSSDTest { - - + /** - 删除Test开胸包场景1、还未产生了实例(即:在TousseInstance表没有相应的记录了,固定条码除外),并且还没被申请过(即:在TousseItem表,没有相应的记录), - 预期结果:则删除成功,并且将会删除此器械包对应的固定条码和在CssdHandleTousses配置的记录 - + * 此方法主要测试删除器械包定义 + * 测试以下1种场景 + * 1、删除“Test开胸包” 预期结果:则删除成功,并且将会删除此器械包对应的固定条码和在CssdHandleTousses配置的记录 */ @Test public void testDeleteTousseDefinition1() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r17411 -r17810 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 17411) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 17810) @@ -507,15 +507,21 @@ public void setFinishComfirmer(String finishComfirmer) { this.finishComfirmer = finishComfirmer; } - + /** + * 判断此灭菌记录的状态是否为“灭菌中” + * @return + */ @Transient public boolean isSterilizationBegin() { if (SterilizationRecord.STERILIZATION_STATUS_BEGIN.equals(status)) { return true; } return false; } - + /** + * 判断此灭菌记录的状态是否为“灭菌中断” + * @return + */ @Transient public boolean isSterilizationInterrupt() { if (SterilizationRecord.STERILIZATION_STATUS_INTERRUPT.equals(status)) {