• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
发货物品查询报表格式调整。不显示null值。
    • binary
    ./invoiceSummaryQuery_childAddSupplierName.jasper
    • binary
    ./invoiceItemsQuery_child_1AddSupplierName.jasper
    • binary
    ./invoiceSummaryQuery_mainAddSupplierName.jasper
    • -1
    • +2
    ./invoiceSummaryQuery_mainAddSupplierName.jrxml
    • -1
    • +1
    ./invoiceItemsQuery_child_1AddSupplierName.jrxml
    • -1
    • +1
    ./invoiceSummaryQuery_childAddSupplierName.jrxml
解决:BJ307YY-43。发货物品查询结果表格增加物品数量和金额的统计,以及增加申请科室列。

修复明细核算月报不显示材料数量列可能报错,器械包退货材料数量不正常的问题;

调整报表样式。

    • binary
    ./departmentMonthDetailSupplierNameAndDiscountPrice_child.jasper
    • -0
    • +1
    ./DepartmentMonthDetailIntegral_child.jrxml
    • -23
    • +129
    ./invoiceItemsQuery_main_1.jrxml
    • binary
    ./invoiceItemsQuery_main_1AddSupplierName.jasper
    • binary
    ./departmentMonthDetailShowMaterialsAmount_child.jasper
    • -0
    • +1
    ./departmentMonthDetailShowMaterialsAmount_child.jrxml
    • binary
    ./invoiceItemsQuery_child_1AddSupplierName.jasper
    • binary
    ./DepartmentMonthDetailIntegral_child.jasper
    • binary
    ./DepartmentMonthDetail_child.jasper
    • -0
    • +1
    ./departmentMonthDetailSupplierName_child.jrxml
    • -0
    • +1
    ./DepartmentMonthDetailDiscountPrice_child.jrxml
    • -13
    • +118
    ./invoiceSummaryQuery_mainAddSupplierName.jrxml
  1. … 15 more files in changeset.
解决:JYSRMYY-19

明细核算月报增加材料数量列;DGSDBZXYY-150

明细核算月报的申请科室和结算科室改进为可以多选

    • -0
    • +247
    ./departmentMonthDetailShowMaterialsAmount.jrxml
    • binary
    ./departmentMonthDetailShowMaterialsAmount.jasper
    • binary
    ./departmentMonthDetailShowMaterialsAmount_child.jasper
    • -0
    • +145
    ./departmentMonthDetailShowMaterialsAmount_child.jrxml
  1. … 4 more files in changeset.
GDSZYY-50.调整核算月报格式
  1. … 1 more file in changeset.
解决:GGSRMYY-153。核算月报选择按一次性物品类型统计,数量合计列负数数量不能合计的问题;
    • -2
    • +2
    ./monthReportGroupByDisposableGoodsType.jrxml
    • binary
    ./monthReportGroupBySterilizationMode.jasper
    • binary
    ./monthReportGroupByDisposableGoodsType.jasper
    • -4
    • +4
    ./monthReportGroupBySterilizationMode.jrxml
解决:GDSZYY-50。增加多区院设置的以及按院区进行核算月报的查询和汇总统计
    • binary
    ./monthReportBranche.jasper
    • -0
    • +412
    ./monthReportBranche.jrxml
  1. … 17 more files in changeset.
解决:CSSZXYY-136.部分报表中的金额支持通过配置项配置为2或4位小数格式。部分数量调整为整数。
    • -1
    • +8
    ./DepartmentMonthDetailOfSingleDepart.jrxml
    • binary
    ./DepartmentMonthDetailOfSingleDepart_child.jasper
    • binary
    ./DepartmentMonthDetailDiscountPrice.jasper
    • binary
    ./DepartmentMonthDetail_child.jasper
    • binary
    ./DepartmentMonthDetailIntegral.jasper
    • -4
    • +14
    ./DepartmentMonthDetailDiscountPrice.jrxml
    • -3
    • +8
    ./DepartmentMonthDetailOfSingleDepart_child.jrxml
    • binary
    ./disposableGoodsInvoiceStatistics.jasper
    • binary
    ./invoiceSummaryQuery_childAddSupplierName.jasper
    • binary
    ./monthReportGroupBySterilizationMode.jasper
  1. … 50 more files in changeset.
解决:BJ307YY-54。明细核算月报加上查询条件以及显示改进。
    • binary
    ./disposableGoodsInvoiceStatistics.jasper
    • binary
    ./DepartmentMonthDetail_child.jasper
    • -12
    • +12
    ./DepartmentMonthDetailOfSingleDepart.jrxml
    • -16
    • +31
    ./disposableGoodsInvoiceStatistics.jrxml
    • binary
    ./DepartmentMonthDetailOfSingleDepart.jasper
  1. … 8 more files in changeset.
解决:FSSZYY-12,核算月报、明细核算月报增加的器械包积分统计的显示。
    • binary
    ./DepartmentMonthDetailIntegral_child.jasper
    • -0
    • +372
    ./monthIntegralReport.jrxml
    • binary
    ./monthIntegralReport.jasper
    • -0
    • +141
    ./DepartmentMonthDetailIntegral_child.jrxml
    • -0
    • +227
    ./DepartmentMonthDetailIntegral.jrxml
    • binary
    ./DepartmentMonthDetailIntegral.jasper
  1. … 11 more files in changeset.
优化:DGZYY-175。质量监测报表列头字体大小调整
修复:DGZYY-175。质量监测报表样式有时单元格与单元格之间有空白和汇总多一行的问题。
  1. … 1 more file in changeset.
解决:DGZYY-175。质量监测的无纸化报表改进(第1个报表:出炉后灭菌物品质量检查登记表)。
  1. … 1 more file in changeset.
解决SSTS-114:为jsp文件中的所有js和css文件引用加上版本号的后缀,解决代码更新后的缓存问题
  1. … 534 more files in changeset.
修复:ASSFDZLYY-42。消毒供应中心工作量统计报表包数导出有.的问题
    • -1
    • +1
    ./statisticalWorkloadDisposableGood.jrxml
    • binary
    ./statisticalWorkloadDisposableGood.jasper
解决:ASSFDZLYY-42。消毒供应中心工作量统计报表样式调整。
    • -0
    • +410
    ./strengthenStatisticalWorkloadDisposableGood.jrxml
    • binary
    ./strengthenStatisticalWorkloadDisposableGood.jasper
    • binary
    ./statisticalWorkloadDisposableGood.jasper
    • binary
    ./strengthenStatisticalWorkload.jasper
    • -3
    • +3
    ./statisticalWorkloadDisposableGood.jrxml
  1. … 1 more file in changeset.
部分解决:ASSFDZLYY-42。消毒供应中心工作量统计报表样式调整
    • -155
    • +167
    ./statisticalWorkloadDisposableGood.jrxml
    • binary
    ./statisticalWorkloadDisposableGood.jasper
  1. … 1 more file in changeset.
部分解决:ASSFDZLYY-42。消毒供应中心工作量统计报表增加一列“一次性物品发货数量”以及表格布局优化。(还有开了配置项strengthenStatisticalWorkload启用另外的模板的没处理)
    • binary
    ./statisticalWorkloadDisposableGood.jasper
    • -0
    • +339
    ./statisticalWorkloadDisposableGood.jrxml
  1. … 5 more files in changeset.
完善:ASSJMSZXYY-37 物品风险报表显示内容调整
解决:ASSJMSZXYY-37。新增《物品风险级别统计报表》。
    • binary
    ./goodsRiskLevelReport.jasper
    • -0
    • +385
    ./goodsRiskLevelReport.jrxml
  1. … 9 more files in changeset.
解决:ZSWY-136。器械包工作量统计报表的发货数量统计指标的改进
  1. … 2 more files in changeset.
完善:NYSY-12;修复急用物品处理周期统计报表汇总行有时会异常换页显示的问题;
    • binary
    ./urgentNeedGoodsProcessingCycle.jasper
    • -2
    • +2
    ./urgentNeedGoodsProcessingCycle.jrxml
灭菌区工作量及不合格率月报时间列调宽
    • binary
    ./disinfectionFractionDefective.jasper
解决:NYSY-12;修改加急物品汇总行统计;解决:NYSY-11急用物品处理周期统计报表 导出Excel文件无效
    • -16
    • +16
    ./urgentNeedGoodsProcessingCycle.jrxml
    • binary
    ./urgentNeedGoodsProcessingCycle.jasper
解决:NYSY-12;急用物品处理周期统计报表增加加急物品数量总价汇总行
    • binary
    ./urgentNeedGoodsProcessingCycle.jasper
    • -1
    • +36
    ./urgentNeedGoodsProcessingCycle.jrxml
  1. … 3 more files in changeset.
解决:NYSY-4;外来器械申请单统计表查询时间由申请时间改为接收时间,精确到分;
    • -33
    • +33
    ./foreignTousseApplicationReport.jrxml
    • binary
    ./foreignTousseApplicationReport.jasper
  1. … 1 more file in changeset.
完善:ZSSXLRMYY-194;年度消毒中心指标工作量统计的标题显示不完成;
完善:ZYYFS-126 修复灭菌炉使用次数统计报表(明细查询)导出有合并列;美化质量监测报表(质量监测模板)
    • binary
    ./sterilizingStoveUseCountDetail.jasper
    • -3
    • +3
    ./sterilizingStoveUseCountDetail.jrxml
  1. … 1 more file in changeset.
解决:ZYYFS-126 修复系统内的指定报表导出后有数据列合并的问题;
    • binary
    ./departmentMonthDetailSupplierNameAndDiscountPrice_child.jasper
    • binary
    ./departmentMonthDetailSupplierName.jasper
    • -1
    • +1
    ./departmentMonthDetailSupplierName.jrxml
    • binary
    ./departmentMonthDetailSupplierNameAndDiscountPrice.jasper
    • binary
    ./strengthenStatisticalWorkload.jasper
    • binary
    ./materialTypeWorkloadReport.jasper
    • binary
    ./invoiceSummaryQuery_mainAddSupplierName.jasper
  1. … 35 more files in changeset.
解决:ZSWY-120;质量监测报表增加质量元素出现次数的统计.
  1. … 1 more file in changeset.
修复入退库物品统计报表(按供应商)供应商有时显示null的问题