Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r14913 -r14935 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 14913) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 14935) @@ -5,6 +5,8 @@ import java.util.List; import java.util.Map; +import net.sf.json.JSONObject; + import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; @@ -22,9 +24,9 @@ public void updateOldSterilization(TousseInstance tousseInstance); - public String completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater); + public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater); - public String completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater,String finishComfirmer); + public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater,String finishComfirmer); public SterilizationRecord getSterilizationRecordById(Long id); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js =================================================================== diff -u -r12599 -r14935 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js (.../proxyDisinfectionView.js) (revision 12599) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js (.../proxyDisinfectionView.js) (revision 14935) @@ -252,18 +252,17 @@ ids : ids },success : function(response, options) { var result = Ext.decode(response.responseText); + MsgTip.msg('提示', result.message,true,3); var success = result.success; - if (true != success) { - MsgTip.msg('提示', result.cause,true,3); - return; - } else { - MsgTip.msg('提示','完成灭菌',true,3); + if (success) { grid.dwrReload(); } }, failure : function(response, options) { var result = Ext.decode(response.responseText); - MsgTip.msg('提示', result.cause,true,3); + if(result && result.message){ + MsgTip.msg('提示', result.message,true,3); + } } }); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r14913 -r14935 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 14913) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 14935) @@ -71,6 +71,7 @@ import com.forgon.tools.Path; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.forgon.treenode.service.THTreeNodeManager; /** @@ -298,17 +299,15 @@ } } } - public String completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater){ + public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater){ if(StringUtils.isBlank(finishOperater)){ finishOperater = AcegiHelper.getLoginUserFullName(); } return completeSterilization(sterilizationRecordIds,orgUnitCode,finishOperater,finishOperater); } @Override - public String completeSterilization(Collection sterilizationRecordIds, + public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater,String finishComfirmer) { - - String result = ""; SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager .getSupplyRoomConfigByOrgUnitCoding(orgUnitCode); //判断该科室是否为一级供应室 @@ -343,29 +342,14 @@ if( time > 0 && dTime/(60*1000) < time) { // 灭菌时间没有达到最小值,不能完成灭菌 - result = new JSONStringer() - .object() - .key("success") - .value(false) - .key("cause") - .value("灭菌时间不够" + time + "分钟" + ",不能完成灭菌!").endObject() - .toString(); - return result; + return JSONUtil.buildJsonObject(false, "灭菌时间不够" + time + "分钟" + ",不能完成灭菌!"); } } } if (!sterilizer.getOrgUnitCoding().equalsIgnoreCase(orgUnitCode)) { String orgUnitName = supplyRoomConfig.getOrgUnitName(); - result = new JSONStringer() - .object() - .key("success") - .value(false) - .key("cause") - .value(sterilizer.getName() + "不属于当前用户所在的科室:" - + orgUnitName + ",不能完成灭菌!").endObject() - .toString(); - return result; + return JSONUtil.buildJsonObject(false, sterilizer.getName() + "不属于当前用户所在的科室:"+ orgUnitName + ",不能完成灭菌!"); } // 如果灭菌目的为每天例行监测并且是第一炉时 @@ -470,10 +454,7 @@ updateTousseStock(tousseMap); updateFirstSupplyRoomStock(supplyRoomConfig,tousseMap,tousseListMap); - result = new JSONStringer().object().key("success").value(true) - .key("msg").value("完成灭菌。").endObject().toString(); - - return result; + return JSONUtil.buildJsonObject(true, "完成灭菌。"); } /** Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r14910 -r14935 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 14910) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 14935) @@ -65,8 +65,10 @@ import com.forgon.tools.FileSystemHelper; import com.forgon.tools.ImageUtils; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; @@ -256,28 +258,22 @@ public void completeSterilization() { String idsStr = StrutsParamUtils.getPraramValue("ids", ""); String finishComfirmer = StrutsParamUtils.getPraramValue("finishComfirmer", ""); - String jsonResult = null; try { String orgUnitCode = AcegiHelper.getLoginUser() .getOrgUnitCodingFromSupplyRoomConfig(); Collection sterilizationRecordIds = StringTools.parseToLongs( idsStr, ";"); + JSONObject jsonResult = null; jsonResult = sterilizationRecordManager.completeSterilization( sterilizationRecordIds, orgUnitCode,null,finishComfirmer); + StrutsResponseUtils.output(jsonResult); // sterilizerRecordManager // .readAndSaveSterilizerRecord(sterilizationRecordIds); } catch (Exception e) { e.printStackTrace(); + StrutsResponseUtils.output(false, e.getMessage()); } - HttpServletResponse httpServletResponse = StrutsParamUtils - .getResponse(); - httpServletResponse.setCharacterEncoding("UTF-8"); - try { - httpServletResponse.getWriter().print(jsonResult); - } catch (IOException e) { - e.printStackTrace(); - } } public void loadSterilizationRecord() { Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r14913 -r14935 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 14913) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 14935) @@ -159,23 +159,14 @@ success : function(response, options) { hideMessageBox(false); var result = Ext.decode(response.responseText); - var success = result.success; - if (true != success) { - if(result.cause){ - showResult(result.cause); - } - grid.dwrReload(); - return; - } else { - showResult(result.msg); - grid.dwrReload(); - } + showResult(result.message); + grid.dwrReload(); }, failure : function(response, options) { hideMessageBox(false); var result = Ext.decode(response.responseText); - if(result && result.cause){ - showResult(result.cause); + if(result && result.message){ + showResult(result.message); } } });