Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java =================================================================== diff -u -r14293 -r14422 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java (.../ReturnGoodsRecordAction.java) (revision 14293) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java (.../ReturnGoodsRecordAction.java) (revision 14422) @@ -46,6 +46,7 @@ import com.forgon.tools.MapTools; import com.forgon.tools.MathTools; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.util.StrutsUtils; @@ -645,11 +646,10 @@ String[] returnTousseItemDataArr = StringUtils.splitByWholeSeparator(returnTousseItemStr,"@;"); for (String returnTousseItemData : returnTousseItemDataArr) { String[] returnTousseItemDetailArr = StringUtils.splitByWholeSeparator(returnTousseItemData,"@#"); - ReturnGoodsItem returnTousseItem = null; + ReturnGoodsItem returnTousseItem = new ReturnGoodsItem();; int currentAmount = Integer .parseInt(returnTousseItemDetailArr[2]); - returnTousseItem = new ReturnGoodsItem(); newReturnTousseItems.add(returnTousseItem); returnTousseItem @@ -696,28 +696,16 @@ returnTousseItem.setTousseInstanceList(tousseInstances); } } - - String message; + JSONObject json = null; try{ returnGoodsRecordManager.checkAndSaveForReturnTousse(returnGoodsRecord); - message = "{success:true,submit:true,message:'保存成功'}"; + json = JSONUtil.buildJsonObject(true, "保存成功"); + JSONUtil.addProperty(json, "submit", true); } catch(Exception ex){ - message = new JSONStringer().object() - .key("success").value(false) - .key("message").value(ex.getMessage()) - .endObject().toString(); + json = JSONUtil.buildJsonObject(false, ex.getMessage()); ex.printStackTrace(); } - - try { - HttpServletResponse response = StrutsParamUtils.getResponse(); - response.setCharacterEncoding("UTF-8"); - PrintWriter out = response.getWriter(); - out.print(message); - out.close(); - } catch (IOException e) { - e.printStackTrace(); - } + StrutsResponseUtils.output(json); } /** Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r14421 -r14422 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 14421) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 14422) @@ -811,7 +811,18 @@ } return false; } + /** + * 是否灭菌中 + * @return + */ @Transient + public boolean isSteriling(){ + if(StringUtils.equals(STATUS_STERILING, status)){ + return true; + } + return false; + } + @Transient public boolean isPacked() { if (StringUtils.equals(STATUS_PACKED, status)) { return true; Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r14377 -r14422 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 14377) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 14422) @@ -2099,27 +2099,19 @@ public JSONObject validateRecyclingApplicationCssdPrivilege( RecyclingApplication application, Collection tousseItemVoList) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("success", true); //处理科室(为空时需提示) String cssdOrgUnitCode = application.getHandleDepartCoding(); if(StringUtils.isBlank(cssdOrgUnitCode)){ - jsonObject.put("success", false); - jsonObject.put("message", "处理科室不能为空"); - return jsonObject; + return JSONUtil.buildJsonObject(false,"处理科室不能为空"); } //申请科室(为空时需提示) String applyOrgUnitCode = application.getDepartCoding(); if(StringUtils.isBlank(cssdOrgUnitCode)){ - jsonObject.put("success", false); - jsonObject.put("message", "申请科室不能为空"); - return jsonObject; + return JSONUtil.buildJsonObject(false,"申请科室不能为空"); } //申请物品(为空时需提示) if(CollectionUtils.isEmpty(tousseItemVoList)){ - jsonObject.put("success", false); - jsonObject.put("message", "申请物品不能为空"); - return jsonObject; + return JSONUtil.buildJsonObject(false,"申请物品不能为空"); } boolean appliedTousse = false;//是否有申领器械包(含消毒物品与敷料包) @@ -2147,10 +2139,9 @@ + "' and tousseType = '" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "' "; if(objectDao.getBySql(CssdServiceDepts.class.getSimpleName(), sql) == null){ - jsonObject.put("success", false); - jsonObject.put("message", application.getHandleDepart() + "未配置"+ - CssdServiceDepts.TOUSSETYPE_TOUSSE + "服务" + application.getDepart()); - return jsonObject; + String message = application.getHandleDepart() + "未配置"+ + CssdServiceDepts.TOUSSETYPE_TOUSSE + "服务" + application.getDepart(); + return JSONUtil.buildJsonObject(false,message); } } @@ -2160,10 +2151,9 @@ + "' and tousseType = '" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "' "; if(objectDao.getBySql(CssdServiceDepts.class.getSimpleName(), sql) == null){ - jsonObject.put("success", false); - jsonObject.put("message", application.getHandleDepart() + "未配置"+ - CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "服务" + application.getDepart()); - return jsonObject; + String message = application.getHandleDepart() + "未配置"+ + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "服务" + application.getDepart(); + return JSONUtil.buildJsonObject(false,message); } } @@ -2176,16 +2166,14 @@ String sql = " where orgUnitCode = '" + cssdOrgUnitCode + "' and tousseName = '" + tousseItemVo.getTousseName() + "' "; if(objectDao.getBySql(CssdHandleTousses.class.getSimpleName(), sql) == null){ - jsonObject.put("success", false); - jsonObject.put("message", application.getHandleDepart() + "未配置"+ - "处理" + tousseItemVo.getTousseName()); - return jsonObject; + String message = application.getHandleDepart() + "未配置"+ + "处理" + tousseItemVo.getTousseName(); + return JSONUtil.buildJsonObject(false,message); } } } - - return jsonObject; + return JSONUtil.buildJsonObject(true); } @Override @@ -2271,7 +2259,7 @@ //如果是消毒物品且拆包的情况下 if ("消毒物品".equals(tousseItemVo.getTousseType()) && "否".equals(tousseItemVo.getIsApplyEntireTousse())){ if (urgentAmount > 1){ - return this.jsonOutput("加急数量不能大于1！",false); + return JSONUtil.buildJsonObject(false,"加急数量不能大于1！"); } } return this.judgeUrgentAmountAndAmount(urgentAmount,amount); @@ -2284,20 +2272,6 @@ * @return */ private JSONObject judgeUrgentAmountAndAmount(Integer urgentAmount,Integer amount){ - return amount < urgentAmount ? this.jsonOutput("加急数量不能大于申请数量",false) : null; + return amount < urgentAmount ? JSONUtil.buildJsonObject(false, "加急数量不能大于申请数量") : null; } - - /** - * json返回结果 - * @param message 要提示的信息 - * @param result true或者false - * @return - */ - private JSONObject jsonOutput(String message,boolean result){ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("success", result); - jsonObject.put("message", message); - return jsonObject; - } - } Index: forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java =================================================================== diff -u -r14267 -r14422 --- forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java (.../JSONUtil.java) (revision 14267) +++ forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java (.../JSONUtil.java) (revision 14422) @@ -49,7 +49,8 @@ */ public class JSONUtil { - + public static final String JSON_KEY_SUCCESS = "success"; + public static final String JSON_KEY_MESSAGE = "message"; public static final int JSON_LIB = 1; public static final int FAST_JSON = 2; public static final int JACKSON = 3; @@ -270,7 +271,7 @@ } public static String buildErrorMsgJsonResult(String errorMsg) { - return new JSONStringer().object().key("success").value(false) + return new JSONStringer().object().key(JSON_KEY_SUCCESS).value(false) .key("error").value(errorMsg).endObject().toString(); } /** @@ -302,7 +303,7 @@ * @return 原json对象,并且添加了是否成功的标志位 */ public static JSONObject addSuccess(JSONObject json,boolean success){ - return addProperty(json,"success",success); + return addProperty(json,JSON_KEY_SUCCESS,success); } /** * 在json对象中添加提示消息 @@ -311,7 +312,7 @@ * @return 原json对象,并且message属性修改为新的消息内容。如果json为null，返回null */ public static JSONObject addMessage(JSONObject json,String message){ - return addProperty(json,"message",message); + return addProperty(json,JSON_KEY_MESSAGE,message); } /** * 在json对象中添加属性