Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r15983 -r15990 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 15983) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 15990) @@ -27,6 +27,17 @@ public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater); public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater,String finishComfirmer); + /** + * 灭菌完成 增加是否需要"完成确认"参数 + * @param sterilizationRecordIds + * @param orgUnitCode + * @param finishOperater + * @param finishComfirmer + * @param needFinishConfirm + * @return + */ + public JSONObject completeSterilization(Collection sterilizationRecordIds, + String orgUnitCode,String finishOperater,String finishComfirmer,boolean needFinishConfirm); public SterilizationRecord getSterilizationRecordById(Long id); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r15983 -r15990 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 15983) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 15990) @@ -318,14 +318,13 @@ } return completeSterilization(sterilizationRecordIds,orgUnitCode,finishOperater,finishOperater); } + public JSONObject completeSterilization(Collection sterilizationRecordIds, + String orgUnitCode,String finishOperater,String finishComfirmer){ + return completeSterilization(sterilizationRecordIds,orgUnitCode,finishOperater,finishComfirmer,false); + } @Override public JSONObject completeSterilization(Collection sterilizationRecordIds, - String orgUnitCode,String finishOperater,String finishComfirmer) { - String needFinishConfirmStr = StrutsParamUtils.getPraramValue("needFinishConfirm", ""); - boolean needFinishConfirm = false; - if(StringUtils.equals("true", needFinishConfirmStr)) { - needFinishConfirm = true; - } + String orgUnitCode,String finishOperater,String finishComfirmer,boolean needFinishConfirm) { SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager .getSupplyRoomConfigByOrgUnitCoding(orgUnitCode); //判断该科室是否为一级供应室 Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r15983 -r15990 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 15983) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 15990) @@ -279,14 +279,19 @@ public void completeSterilization() { String idsStr = StrutsParamUtils.getPraramValue("ids", ""); String finishComfirmer = StrutsParamUtils.getPraramValue("finishComfirmer", ""); + String needFinishConfirmStr = StrutsParamUtils.getPraramValue("needFinishConfirm", ""); + boolean needFinishConfirm = false; + if(StringUtils.equals("true", needFinishConfirmStr)) { + needFinishConfirm = true; + } try { String orgUnitCode = AcegiHelper.getLoginUser() .getOrgUnitCodingFromSupplyRoomConfig(); Collection sterilizationRecordIds = StringTools.parseToLongs( idsStr, ";"); JSONObject jsonResult = null; jsonResult = sterilizationRecordManager.completeSterilization( - sterilizationRecordIds, orgUnitCode,null,finishComfirmer); + sterilizationRecordIds, orgUnitCode,null,finishComfirmer,needFinishConfirm); StrutsResponseUtils.output(jsonResult); // sterilizerRecordManager // .readAndSaveSterilizerRecord(sterilizationRecordIds);