Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r26388 -r26525 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 26388) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 26525) @@ -330,7 +330,12 @@ * 外来器械是否审核 */ private String foreignTousseNeedReview = com.forgon.Constants.STR_YES; - + + /** + * 外来器械是否二次回收 + */ + private String foreignTousseIsSecondRecycle = com.forgon.Constants.STR_YES; + private Boolean secondWashCountWorkload = false; /** * 清洗筐装载器械包数量上限 @@ -869,6 +874,14 @@ this.foreignTousseNeedReview = foreignTousseNeedReview; } + public String getForeignTousseIsSecondRecycle() { + return foreignTousseIsSecondRecycle; + } + + public void setForeignTousseIsSecondRecycle(String foreignTousseIsSecondRecycle) { + this.foreignTousseIsSecondRecycle = foreignTousseIsSecondRecycle; + } + public Boolean getIsPackingAfterWashTimeEnd() { return isPackingAfterWashTimeEnd; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r26424 -r26525 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 26424) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 26525) @@ -918,7 +918,10 @@ } supplyRoomConfig.setForeignTousseCleanedEntirely(rq.getParameter("foreignTousseCleanedEntirely")); String foreignTousseNeedReview = StrutsParamUtils.getPraramValue("foreignTousseNeedReview", Constants.STR_YES); + //外来器械是否需要二次回收 + String foreignTousseIsSecondRecycle = StrutsParamUtils.getPraramValue("foreignTousseIsSecondRecycle", Constants.STR_YES); supplyRoomConfig.setForeignTousseNeedReview(foreignTousseNeedReview); + supplyRoomConfig.setForeignTousseIsSecondRecycle(foreignTousseIsSecondRecycle); String ftDefaultSterilingMethod = rq.getParameter("ftDefaultSterilingMethod"); supplyRoomConfig.setFtDefaultSterilingMethod(ftDefaultSterilingMethod);