Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r15366 -r15381 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 15366) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 15381) @@ -224,8 +224,10 @@ public final static String TYPE_DIPOSABLE_GOODS_APPLICATION_FORM = "一次性物品申请单"; public final static String TYPE_DISINFECT_GOODS_APPLICATION_FORM = "消毒物品申请单"; public final static String TYPE_BORROWINGSINGLE = "借物单"; + //注意:敷料包申请单和专科器械申请单都是属于器械包申请单,只是用于在科室申请那里根据申请单的类型然后判断出需要过滤的物品类型 public final static String TYPE_DRESSING_APPLICATION_FROM = "敷料包申请单"; public final static String TYPE_SPECIALIZED_INSTRUMENT_APPLICATION_FROM = "专科器械申请单"; + public final static String TYPE_APPLYING_FOR_RETURN_FORM= "申请还物单"; public final static String TYPE_PROXYDISINFECTION = "代理灭菌单"; public final static String TYPE_FOREIGNPROXYDISINFECTION = "外部器械包代理灭菌申请单"; Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r15366 -r15381 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 15366) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 15381) @@ -1459,7 +1459,7 @@ int limit = StrutsParamUtils.getPraramValue("limit", 0); //处理科室(供应室)编码,按科室编码过滤器械包 String cssdOrgUnitCode = StrutsParamUtils.getPraramValue("cssdOrgUnitCode", ""); - + //打开申请单的类型 String tousseType = StrutsParamUtils.getPraramValue("tousseType", ""); String hideDiposableGoodsPrice = StrutsParamUtils.getPraramValue("hideDiposableGoodsPrice", null); boolean showReferencePrice = true; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r15366 -r15381 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15366) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15381) @@ -1172,8 +1172,8 @@ } comboGoodsStore.proxy.extraParams = {tousseType : type,hideDiposableGoodsPrice :hideDiposableGoodsPrice}; - // 设置申请单的类型,如果是消毒物品申请单,敷料包申请单和专科器械申请单,他们都属于器械包申请单,因此提交后申请单类型都算器械包申请单 - var formType = type == disinfectGoodsApplicationForm || type == dressingApplicationForm || type == spInstrumentApplicationForm ? tousseApplicationForm : type; + // 设置申请单的类型,如果是敷料包申请单和专科器械申请单,他们都属于器械包申请单,因此提交后申请单类型都算器械包申请单 + var formType = type == dressingApplicationForm || type == spInstrumentApplicationForm ? tousseApplicationForm : type; var departmentTemplateTitleStore = new Ext4.data.Store({ proxy : { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java =================================================================== diff -u -r15366 -r15381 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java (.../TousseDefinitionHelper.java) (revision 15366) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java (.../TousseDefinitionHelper.java) (revision 15381) @@ -42,7 +42,7 @@ } /** - * 根据tousseType来过滤对应的物品 + * 根据过滤的类型来过滤对应的物品 * * @param tousseType 器械包类型 * @param tousseDefinition 要过滤的物品po @@ -78,7 +78,7 @@ /** - * 根据申请单类型设置物品类型 + * 根据申请单类型设置需要过滤的物品类型 * * @param applicationFormType 申请单类型 * @return