Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js =================================================================== diff -u -r17582 -r21036 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 17582) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 21036) @@ -4,11 +4,15 @@ var myMask; Ext.onReady(function() { Ext.QuickTips.init(); - + var tousseTypes = [ ['全部'],['全部器械包'],['器械包'],['敷料包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'] ] + if(!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods){ + tousseTypes.push(['高值耗材']); + } + tousseTypes.push(['自动扣减物品']); //物品类型store var tousseTypeStore = new Ext.data.SimpleStore( { fields : ['value'], - data : [ ['全部'],['全部器械包'],['器械包'],['敷料包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'],['自动扣减物品'] ] + data : tousseTypes }); var diposableGooodsStore = new Ext.data.JsonStore({ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r20991 -r21036 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 20991) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21036) @@ -65,6 +65,7 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods; +import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; @@ -7337,6 +7338,7 @@ */ private List getTousseTypes(String tousseType){ List allType = new LinkedList(); + boolean enableExpensiveGoods = CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods"); if("全部器械包".equals(tousseType) || StringTools.isBlank(tousseType)){ allType.add(TousseDefinition.PACKAGE_TYPE_CUSTOM); allType.add(TousseDefinition.PACKAGE_TYPE_DISINFECTION); @@ -7345,13 +7347,22 @@ allType.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); allType.add(TousseDefinition.PACKAGE_TYPE_INSIDE); allType.add(TousseDefinition.PACKAGE_TYPE_SPLIT); + if(StringTools.isBlank(tousseType) && enableExpensiveGoods){ + allType.add(ExpensiveGoods.TYPE_NAME); + } }else if("外来器械包".equals(tousseType)){ allType.add(TousseDefinition.PACKAGE_TYPE_FOREIGN); allType.add(TousseDefinition.PACKAGE_TYPE_SPLIT); }else if("外部代理灭菌包".equals(tousseType)){ allType.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); }else if(StringTools.isNotBlank(tousseType)){ - allType.add(tousseType); + if(ExpensiveGoods.TYPE_NAME.equals(tousseType)){ + if(enableExpensiveGoods){ + allType.add(tousseType); + } + }else{ + allType.add(tousseType); + } } return allType; } @@ -7363,6 +7374,7 @@ String department,String tousseType,String disposableGoodsType,Boolean showCustonTousseAmount){ // String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); boolean enableDiscountPrice = CssdUtils.getSystemSetConfigByNameBool("enableDiscountPrice"); + boolean enableExpensiveGoods = CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods"); //是否启用包内材料统计列 boolean monthReportMaterialAmountOfTousse = CssdUtils.getSystemSetConfigByNameBool("monthReportMaterialAmountOfTousse"); @@ -7422,32 +7434,41 @@ }else{ tousseTypeReturnSql = String.format(" and i.tousseDefinition_id in (select id from TousseDefinition where %s) ", SqlUtils.getStringFieldInCollectionsPredicate("tousseType", allTousseType)); } + }else{ + tousseTypeInvoiceSql = String.format(" and (ii.type='%s' or ii.diposable='是' or (ii.diposable='否' and %s))", InvoiceItem.TYPE_AUTO_DEDUCTION,SqlUtils.getStringFieldInCollectionsPredicate("ii.tousseType", allTousseType)); + tousseTypeReturnSql = String.format(" and (i.disposableGoodsId in (select id from DisposableGoods) or i.tousseDefinition_id in (select id from TousseDefinition where %s) )",SqlUtils.getStringFieldInCollectionsPredicate("tousseType", allTousseType)); } String invoicePriceSql = "select i.settleAccountsDepartCoding as coding,i.settleAccountsDepart " - + "as depart,sum(ii.settlementPrice) as price,ii.diposable,sum(ii.settlementDiscountPrice) as settlementDiscountPrice from " + Invoice.class.getSimpleName() + " i," + + "as depart,sum(ii.settlementPrice) as price,ii.diposable,sum(ii.settlementDiscountPrice) as settlementDiscountPrice,ii.tousseType from " + Invoice.class.getSimpleName() + " i," + InvoiceItem.class.getSimpleName() + " ii where i.id = ii.invoice_id and "+invoiceItemDisposableGoodsTypePredicate+" and " + getHandleDeptCodeSql("i.orgUnitCoding") + " and (i.status ='收货签收' or " - + "i.status = '已发货') " + invoiceWheresql + tousseTypeInvoiceSql + " group by i.settleAccountsDepartCoding,i.settleAccountsDepart,ii.diposable"; + + "i.status = '已发货') " + invoiceWheresql + tousseTypeInvoiceSql + " group by i.settleAccountsDepartCoding,i.settleAccountsDepart,ii.diposable,ii.tousseType"; ResultSet rs = objectDao.executeSql(invoicePriceSql); try { while(rs.next()){ - String code = rs.getString(1); - String dept = rs.getString(2); - Double price = rs.getDouble(3); - String diposable = rs.getString(4); + String code = rs.getString("coding"); + String dept = rs.getString("depart"); + Double price = rs.getDouble("price"); + String diposable = rs.getString("diposable"); Double discountPrice = rs.getDouble("settlementDiscountPrice"); + String tType = rs.getString("tousseType"); String columnName = ""; String costColumn = ""; if("是".equals(diposable)){ columnName = "一次性物品总价"; costColumn = "一次性物品记支"; discountPrice = price;//一次性物品发货项中目前还没有记录折扣价 }else{ - columnName = "器械包总价"; - costColumn = "器械包记支"; + if(ExpensiveGoods.TYPE_NAME.equals(tType)){ + columnName = "高值耗材总价"; + }else{ + columnName = "器械包总价"; + costColumn = "器械包记支"; + } + } newMonthReport(code, dept,"2", "价格统计",columnName,price, list); - if(enableDiscountPrice){ + if(enableDiscountPrice && StringUtils.isNotBlank(costColumn)){ newMonthReport(code, dept,"1", "科室记支",costColumn,discountPrice, list); } } @@ -7856,9 +7877,13 @@ } } if(tousseAmount > 0){ - newMonthReport(code, dept,"3","数量统计", "器械包数量",tousseAmount,list); - if(monthReportMaterialAmountOfTousse){ - newMonthReport(code, dept, "4", "包内材料统计", "包内材料数量", totalMaterialAmount, list); + if(ExpensiveGoods.TYPE_NAME.equals(tousseTypeName)){ + newMonthReport(code, dept,"3","数量统计", "高值耗材数量",tousseAmount,list); + }else{ + newMonthReport(code, dept,"3","数量统计", "器械包数量",tousseAmount,list); + if(monthReportMaterialAmountOfTousse){ + newMonthReport(code, dept, "4", "包内材料统计", "包内材料数量", totalMaterialAmount, list); + } } } } @@ -7988,7 +8013,9 @@ String goodsNameSearch, String batch,String searchType,boolean disinfection,String disposableGoodsType,String goodsType, Boolean showCustonTousseAmount) { final String TYPE_AUTO_DEDUCTION = "自动扣减物品"; + final String TYPE_ALL = "全部"; boolean isSupplyRoomUser = supplyRoomConfigManager.isSupplyRoomUser(); + boolean enableExpensiveGoods = CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods"); if(!supplyRoomConfigManager.isSupplyRoomUser()){ departSearch = AcegiHelper.getCurrentOrgUnitName(); departCoding = AcegiHelper.getCurrentOrgUnitCode(); @@ -8110,7 +8137,8 @@ if (StringUtils.isNotBlank(typeSearch)) { if ("全部器械包".equals(typeSearch)) { - typeFilterSql = " and ii.diposable = '否'"; + //ii.diposable = '否' and ii.tousseType='高值耗材'的是新版本的高值耗材 + typeFilterSql = " and ii.diposable = '否' and ii.tousseType <> '" + ExpensiveGoods.TYPE_NAME + "'"; returnGoodsFilterSql += " and rr.type = '器械包'"; supplyRoomDiposableGoodsFilterSql += " and 1=2"; outEntryFilterSql += " and 1=2"; @@ -8192,40 +8220,61 @@ supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition) "; outEntryFilterSql += " and 1=2"; } else if ("高值耗材".equals(typeSearch)) { - //goodsType是高值耗材类型，值有全部、一次性物品、器械 - if(StringUtils.isNotBlank(goodsType)){ - if("一次性物品".equals(goodsType)){ - returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and ri.expensiveDisposablegoodsId <> 0"; - materialTypeFilterSql = " and 1=2 "; - supplyRoomDiposableGoodsFilterSql += " and d.goodsType = '"+DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS+"'"; - lostMaterialFilterSql += " and 1=2 "; - damageFilterSql += " and 1=2 "; - expensiveDisposablegoodsSql = " and d.expensiveDisposablegoodsId is not null "; - outEntryFilterSql += " and dg.goodsType = '" + DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS + "' "; + if(enableExpensiveGoods){ + //新的高值耗材 + typeFilterSql = " and ii.diposable = '否' and ii.tousseType = '" + ExpensiveGoods.TYPE_NAME + "'"; + //新的高值耗材还没有退货功能 + returnGoodsFilterSql += " and 1=2"; + lostMaterialFilterSql += " and 1=2 "; + damageFilterSql += " and 1=2 "; + //新的高值耗材还没有供应室领用功能 + supplyRoomDiposableGoodsFilterSql += " and 1=2"; + }else{ + //goodsType是高值耗材类型，值有全部、一次性物品、器械 + if(StringUtils.isNotBlank(goodsType)){ + if("一次性物品".equals(goodsType)){ + returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and ri.expensiveDisposablegoodsId <> 0"; + materialTypeFilterSql = " and 1=2 "; + supplyRoomDiposableGoodsFilterSql += " and d.goodsType = '"+DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS+"'"; + lostMaterialFilterSql += " and 1=2 "; + damageFilterSql += " and 1=2 "; + expensiveDisposablegoodsSql = " and d.expensiveDisposablegoodsId is not null "; + outEntryFilterSql += " and dg.goodsType = '" + DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS + "' "; + }else{ + returnGoodsFilterSql += " and 1=2 "; + materialTypeFilterSql = " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; + supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition where goodsType = '" + + MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS + "') "; + lostMaterialFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' "; + damageFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' "; + expensiveDisposablegoodsSql = " and 1=2 "; + outEntryFilterSql += " and 1=2 "; + } }else{ - returnGoodsFilterSql += " and 1=2 "; + returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and ri.expensiveDisposablegoodsId <> 0"; materialTypeFilterSql = " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition where goodsType = '" + MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS + "') "; lostMaterialFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' "; damageFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' "; - expensiveDisposablegoodsSql = " and 1=2 "; - outEntryFilterSql += " and 1=2 "; + expensiveDisposablegoodsSql = " and d.expensiveDisposablegoodsId is not null "; + outEntryFilterSql += " and dg.goodsType = '" + DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS + "' "; } - }else{ - returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and ri.expensiveDisposablegoodsId <> 0"; - materialTypeFilterSql = " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; - supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition where goodsType = '" - + MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS + "') "; - lostMaterialFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' "; - damageFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' "; - expensiveDisposablegoodsSql = " and d.expensiveDisposablegoodsId is not null "; - outEntryFilterSql += " and dg.goodsType = '" + DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS + "' "; + typeFilterSql = " and 1=2 "; } - typeFilterSql = " and 1=2 "; }else if (TYPE_AUTO_DEDUCTION.equals(typeSearch)) { typeFilterSql = " and 1=2 "; + }else if(TYPE_ALL.equals(typeSearch)){ + if(!enableExpensiveGoods){ + //没有启用高值耗材,就不查询新的高值耗材的数据 + typeFilterSql = " and ii.tousseType <> '" + ExpensiveGoods.TYPE_NAME + "'"; + } } + }else{ + if(!enableExpensiveGoods){ + //没有启用高值耗材,就不查询新的高值耗材的数据 + typeFilterSql = " and ii.tousseType <> '" + ExpensiveGoods.TYPE_NAME + "'"; + } } String goodsNameFilterSql = " "; if (StringUtils.isNotBlank(goodsNameSearch)) { @@ -8309,7 +8358,7 @@ if(TYPE_AUTO_DEDUCTION.equals(typeSearch)){ diposableGoodsTousseTypeSql = String.format(" and d.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION); } - if(StringUtils.isBlank(typeSearch) || "一次性物品".equals(typeSearch) || "高值耗材".equals(typeSearch) || TYPE_AUTO_DEDUCTION.equals(typeSearch)){ + if(StringUtils.isBlank(typeSearch) || "一次性物品".equals(typeSearch) || "高值耗材".equals(typeSearch) && !enableExpensiveGoods || TYPE_AUTO_DEDUCTION.equals(typeSearch)){ diposableGoodsSql = " union all (select i.settleaccountsdepart,d.name as name,sum(d.amount) as amount," +"sum(d.fluctuationPrice*d.amount) as settlementprice,sum(d.fluctuationPrice*d.amount) as settlementDiscountPrice,'一次性物品' as type" + ",d.batch as batchNumber,dgbs.expDate,0 as tousseDefinitionId from invoice i,DiposableGoodsItem d," + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs " @@ -8683,13 +8732,16 @@ String expensiveGoodsType = StringTools.defaultIfEmpty(requestParams.get("expensiveGoodsType"),"全部"); String tousseGroupName = StringTools.defaultIfEmpty(requestParams.get("tousseGroupName"),"全部"); String invoiceDepartGroup = StringTools.defaultIfEmpty(requestParams.get("invoiceDepartGroup"),"all"); + boolean enableExpensiveGoods = CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods"); String tousseTypeSql = " 1=1 "; String disposableTypeSql = " 1=1 "; String materialTypeSql = " 1=1 "; + String expensiveGoodsSql = " 1=1 ";//新的高值耗材条件过滤 if(StringTools.equals("一次性物品", goodsType)){ tousseTypeSql = " 1=2 "; materialTypeSql = " 1=2 "; + expensiveGoodsSql = " 1=2 "; if(!StringTools.equals("全部", disposableGoodsType) && !StringTools.isBlank(disposableGoodsType)){ String disposableGoodsIdSql = String.format(" select id from DisposableGoods where type='%s' ", disposableGoodsType); disposableTypeSql = String.format(" (bo.disposableGoodsID in(%s)) ", disposableGoodsIdSql); @@ -8698,28 +8750,38 @@ tousseTypeSql = " 1=2 "; disposableTypeSql = " 1=2 "; materialTypeSql = " 1=1 "; + expensiveGoodsSql = " 1=2 "; }else if(StringTools.equals("高值耗材", goodsType)){ - tousseTypeSql = " 1=2 "; - if(!StringTools.equals("全部", expensiveGoodsType) && !StringTools.isBlank(expensiveGoodsType)){ - if(StringTools.equals("一次性物品", expensiveGoodsType)){ - disposableTypeSql = " bo.expensiveDisposablegoodsId is not null "; - materialTypeSql = " 1=2 "; - }else if(StringTools.equals("器械", expensiveGoodsType)){ - disposableTypeSql = " 1=2 "; - materialTypeSql = " dg.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; + if(enableExpensiveGoods){ + //器械包的类型 + tousseTypeSql = " 1=2 "; + disposableTypeSql = " 1=2 "; + materialTypeSql = " 1=2 "; + }else{ + tousseTypeSql = " 1=2 "; + expensiveGoodsSql = " 1=2 "; + if(!StringTools.equals("全部", expensiveGoodsType) && !StringTools.isBlank(expensiveGoodsType)){ + if(StringTools.equals("一次性物品", expensiveGoodsType)){ + disposableTypeSql = " bo.expensiveDisposablegoodsId is not null "; + materialTypeSql = " 1=2 "; + }else if(StringTools.equals("器械", expensiveGoodsType)){ + disposableTypeSql = " 1=2 "; + materialTypeSql = " dg.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; + }else{ + disposableTypeSql = " bo.expensiveDisposablegoodsId is not null "; + materialTypeSql = " dg.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; + } }else{ disposableTypeSql = " bo.expensiveDisposablegoodsId is not null "; materialTypeSql = " dg.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; } - }else{ - disposableTypeSql = " bo.expensiveDisposablegoodsId is not null "; - materialTypeSql = " dg.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'"; } }else if(!StringTools.equals("全部", goodsType)){ //器械包的类型 tousseTypeSql = SqlUtils.getStringFieldInCollectionsPredicate("td.tousseType", getTousseTypes(goodsType)); disposableTypeSql = " 1=2 "; materialTypeSql = " 1=2 "; + expensiveGoodsSql = " 1=2 "; } //有无备注 String hasRemark = requestParams.get("hasRemark"); @@ -8785,6 +8847,15 @@ + DisposableGoods.class.getSimpleName() + " dg,"+ DisposableGoodsBatchStock.class.getSimpleName() +" dgbs where po.id = bo.invoice_id and " + " bo.disposableGoodsBatchStockID=dgbs.id and " + "bo.disposableGoodsID = dg.id " + remarkCondition + hospitalNumberSql + " and " + disposableTypeSql; + + String expensiveGoods = "select '高值耗材' as type,po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,bd.barcode barcode,ii.tousseName name,ii.amount,ii.settlementPrice as totalPrice," + + "po.sendTime,po.applicant,'' batch,eg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," + + "po.hospitalNumber as hospitalNumber,po.sender,po.assistantSender,ei.expDate from " + + Invoice.class.getSimpleName() + " po join " + InvoiceItem.class.getSimpleName()+" ii on ii.invoice_id = po.id" + + " join " + ExpensiveGoodsInstance.class.getSimpleName() + " ei on ei.id = ii.expensiveGoodsInstanceId join "+ BarcodeDevice.class.getSimpleName() +" bd on bd.id = ei.id" + + " join " + ExpensiveGoods.class.getSimpleName() + " eg on eg.id = ei.expensiveGoods_id" + + " where (1=1) " + remarkCondition + hospitalNumberSql + " and " + expensiveGoodsSql; + String materialSql = "select '材料' as type,po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,'' as barcode,bo.name as name,bo.amount,bo.price*bo.amount as totalPrice," + "po.sendTime,'' as applicant,'' as batch,dg.externalCode,po.remark as remark,'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency," + "'' as hospitalNumber,po.sender,'' as assistantSender,null as expDate from " + MaterialInvoice.class.getSimpleName() + " po inner join " @@ -8799,6 +8870,7 @@ sql = " select * from ( "; sql += tousseSql + " union all "; sql += diposableSql + " union all "; + sql += expensiveGoods + " union all "; sql += materialSql + " ) m"; sql += " where " + dateQueryAdapter.dateAreaSql("m.sendTime", startDate, endDate, true, true); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js =================================================================== diff -u -r20419 -r21036 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 20419) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 21036) @@ -253,7 +253,7 @@ Ext.getCmp('disposableGoodsTypeElement').setDisabled(true); } - if(Ext.getCmp('goodsType').getValue() == '高值耗材'){ + if(Ext.getCmp('goodsType').getValue() == '高值耗材' && !sstsConfig.enableExpensiveGoods){ Ext.getCmp('expensiveGoodsTypeElement').setDisabled(false); }else{ Ext.getCmp('expensiveGoodsTypeElement').setDisabled(true); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r17837 -r21036 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 17837) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 21036) @@ -296,8 +296,8 @@ Ext.getCmp('disposableGoodsType').setValue('全部'); Ext.getCmp('disposableGoodsType').setDisabled(true); } - - if(Ext.getCmp('tousseType').getValue() == '高值耗材'){ + //旧的高值耗材才显示高值耗材类型,新的高值耗材不显示 + if(Ext.getCmp('tousseType').getValue() == '高值耗材' && !sstsConfig.enableExpensiveGoods){ Ext.getCmp('goodsTypeElement').show(); }else{ Ext.getCmp('goodsType').setValue('全部');