Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r25611 -r26466 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 25611) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 26466) @@ -452,4 +452,10 @@ * @return */ public List getInvoicesByApplicationId(String applicationId); + /** + * 验证“科室名称”和“科室编码”是否对应. + * @param departmentCode 科室编码 + * @param departmentName 科室名称 + */ + public boolean validateDepartment(String departmentCode, String departmentName); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r26368 -r26466 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 26368) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 26466) @@ -476,33 +476,20 @@ return applyTousses; } - /** - * 验证“科室名称”和“科室编码”是否对应. - * @param departmentCode 科室编码 - * @param departmentName 科室名称 - */ - private boolean validateDepartment(String departmentCode, String departmentName) { - OrgUnit department = (OrgUnit) orgUnitManager.getOrgUnitByCode(departmentCode); - if (department == null || !StringTools.equals(department.getName(), departmentName)) { - return false; - } - return true; - } - // 检查并创建还物单或通用申请单 private JSONObject createReturnApplicationOrRecyclingApplication() { Collection srcTousseItemVoList = getTousseItemVos(); appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_APPLICATION, Log.TYPE_ADD, "保存申请单:recyclingApplication=" + JSONUtil.toJsonObjecttWithSimpleProperty(recyclingApplication) + ",tousseItems=" + JSONUtil.toJsonArraytWithSimpleProperty(srcTousseItemVoList)); //验证科室名称和科室编码是否一致 - if (!validateDepartment(recyclingApplication.getDepartCoding(), recyclingApplication.getDepart())) { + if (!recyclingApplicationManager.validateDepartment(recyclingApplication.getDepartCoding(), recyclingApplication.getDepart())) { return JSONUtil.buildJsonObject(false, "申请科室名称和科室编码不一致,请联系系统管理员!"); } - if (!validateDepartment(recyclingApplication.getSettleAccountsDepartCoding(), recyclingApplication.getSettleAccountsDepart())) { + if (!recyclingApplicationManager.validateDepartment(recyclingApplication.getSettleAccountsDepartCoding(), recyclingApplication.getSettleAccountsDepart())) { return JSONUtil.buildJsonObject(false, "结算科室名称和科室编码不一致,请联系系统管理员!"); } - if (!validateDepartment(recyclingApplication.getHandleDepartCoding(), recyclingApplication.getHandleDepart())) { + if (!recyclingApplicationManager.validateDepartment(recyclingApplication.getHandleDepartCoding(), recyclingApplication.getHandleDepart())) { return JSONUtil.buildJsonObject(false, "处理科室名称和科室编码不一致,请联系系统管理员!"); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r26377 -r26466 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 26377) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 26466) @@ -3760,6 +3760,11 @@ ul.setId(newItemVo.getUrgentLevelId()); tousseItem.setUrgentLevelObj(ul); } + }else{ + tousseItem.setUrgentAmount(null); + tousseItem.setUrgent(com.forgon.Constants.STR_NO); + tousseItem.setUrgentLevel(null); + tousseItem.setUrgentLevelObj(null); } //判断是否要重新设置数量和单位 if (!this.isNeedToResetAmountAndUnit(tousseItem, newItemVo)){ @@ -6839,5 +6844,13 @@ return list; } - + @Override + public boolean validateDepartment(String departmentCode, + String departmentName) { + OrgUnit department = (OrgUnit) orgUnitManager.getOrgUnitByCode(departmentCode); + if (department == null || !StringTools.equals(department.getName(), departmentName)) { + return false; + } + return true; + } }