Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r15410 -r15577 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 15410) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 15577) @@ -2129,6 +2129,12 @@ } return 0; } + + /** + * 申请单提交时,验证申请单的处理科室能否服务申请科室,处理科室能否处理所申请的器械包 + * @param application 申请单 + * @param tousseItemVoList 申请物品明细 + */ @Override public JSONObject validateRecyclingApplicationCssdPrivilege( RecyclingApplication application, @@ -2148,12 +2154,12 @@ return JSONUtil.buildJsonObject(false,"申请物品不能为空"); } - boolean appliedTousse = false;//是否有申领器械包(含消毒物品与敷料包) - boolean appliedDiposableGoods = false;//是否有申领一次性物品 + boolean appliedTousse = false;//判断申请单是否有申领器械包(含消毒物品与敷料包) + boolean appliedDiposableGoods = false;//判断申请单是否有申领一次性物品 for(TousseItemVo tousseItemVo : tousseItemVoList){ if(appliedTousse == false && (TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseItemVo.getTousseType()) - || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseItemVo.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseItemVo.getTousseType()) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseItemVo.getTousseType()))){ appliedTousse = true; } @@ -2192,7 +2198,7 @@ public void validateCssdHandleTousses(String cssdOrgUnitCode,String cssdOrgUnitName, String tousseType,String tousseName) { if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType) - || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType) + || TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType)){ String sql = " where orgUnitCode = '" + cssdOrgUnitCode