• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
解决:SSTS-333。质量监测项统计月报中,显示形式为“表格”,“折线图”,“柱状图”导出的excel文件命名不恰当
    • -5
    • +8
    ./QualityMonitoringInspectMonthReportView.jrxml
    • -1
    • +1
    ./QualityMonitoringInspectDayOfMonthReportView.jrxml
    • binary
    ./QualityMonitoringInspectMonthReportView.jasper
    • binary
    ./QualityMonitoringInspectDayOfMonthReportView.jasper
  1. … 2 more files in changeset.
解决:GDSRMYY-526.包定义中一次性物品应纳入器械包工作量统计报表和消毒供应中心工作量统计报表统计(件数)。
  1. … 16 more files in changeset.
解决: SZSDSRMYY-54 第一点: 监测范围为【材料和器械包】的质量监测报表的改进(字体大小调整)
    • -12
    • +27
    ./routineMonitoringWashScopeReport.jrxml
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • binary
    ./routineMonitoringWashScopeReport.jasper
    • -12
    • +24
    ./routineMonitoringSteScopeReport.jrxml
解决: SZSDSRMYY-54 第一点: 监测范围为【材料和器械包】的质量监测报表的改进
    • binary
    ./routineMonitoringWashScopeReport.jasper
    • -0
    • +473
    ./routineMonitoringWashScopeReport.jrxml
  1. … 2 more files in changeset.
解决BJ307YY-78 显示科室的核算月报科室显示优化
    • binary
    ./monthReportShowApplicationDepart.jasper
    • -33
    • +15
    ./monthReportShowApplicationDepart.jrxml
解决BJ307YY-78新增重新打开后的需求:调整查询结果表格的列宽,科室名称列宽调小,能显示12个汉字即可;金额列的宽度调大,要能完整显示13个字符(包括数字和小数点在内)。
    • binary
    ./monthReportHideApplicationDepart.jasper
    • binary
    ./monthReportShowApplicationDepart.jasper
    • -24
    • +24
    ./monthReportHideApplicationDepart.jrxml
    • -31
    • +32
    ./monthReportShowApplicationDepart.jrxml
监测报表格式调整,列头过长自动换行
    • binary
    ./routineMonitoringReportOfADJ.jasper
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • -10
    • +11
    ./routineMonitoringSteScopeReport.jrxml
完善:GDSZYY-50 金额数字列的宽度要求:能完整显示13个字符(包括数字和小数点在内)
解决:GDSZYY-70.GDSZYY-62.新增【科研项目明细核算月报;核算月报和明细核算月报要排除掉属于科研项目的一次性物品申请单发货的费用
    • -0
    • +224
    ./sciProjectMonthReport.jrxml
    • binary
    ./sciProjectMonthReport.jasper
  1. … 8 more files in changeset.
解决jira问题:SZSDSRMYY-48 自定义表单管理功能改进
  1. … 1 more file in changeset.
解决jira问题:SZSDSRMYY-48 自定义表单管理功能改进
  1. … 1 more file in changeset.
解决新增需求4:BJ307YY-78。显示申请科室的核算月报开发
    • -1
    • +3
    ./monthReportHideApplicationDepart.jrxml
    • binary
    ./monthReportHideApplicationDepart.jasper
  1. … 2 more files in changeset.
解决jira问题:SZSDSRMYY-48 自定义表单管理功能改进
  1. … 2 more files in changeset.
解决:BJ307YY-78。显示申请科室的核算月报开发
    • binary
    ./monthReportShowApplicationDepart.jasper
    • binary
    ./monthReportHideApplicationDepart.jasper
    • -0
    • +376
    ./monthReportHideApplicationDepart.jrxml
    • -0
    • +431
    ./monthReportShowApplicationDepart.jrxml
  1. … 6 more files in changeset.
完善:DGSFYBJY-44。质量监测报表标题长度调短
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • -1
    • +1
    ./routineMonitoringSteScopeReport.jrxml
完善:DGSFYBJY-44。1。修复元素超过9个时排序不正常的问题。2.定期监测监测范围为灭菌炉记录时,日期改为监测登记的灭菌日期。
    • -0
    • +463
    ./routineMonitoringSteScopeReport.jrxml
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • binary
    ./routineMonitoringReportOfADJ.jasper
    • -115
    • +24
    ./routineMonitoringReport.jrxml
  1. … 3 more files in changeset.
部分解决:DGSFYBJY-44。1.定期监测定义元素排序问题;4、新增定期检查的监测范围选择【灭菌炉记录】,登记后,在报表中展示灭菌炉相关炉号、炉次。灭菌日期未使用,使用监测登记日期。注:2未重现;3暂不支持。
    • binary
    ./routineMonitoringReportOfADJ.jasper
    • -24
    • +115
    ./routineMonitoringReport.jrxml
  1. … 1 more file in changeset.
解决:FSSZYY-15 增加工作量积分统计报表
    • binary
    ./workloadScoreStatisticReport.jasper
    • -0
    • +358
    ./workloadScoreStatisticReport.jrxml
  1. … 7 more files in changeset.
解决新增的需求3,4:CDSLQYQYYY-84.消毒供应中心工作量统计报表》统计的数量要增加材料发货的数量统计,《器械包规格大小统计报表》统计的数量要增加材料发货的数量统计,合计。
    • binary
    ./tousseSpecificationSizeStatistics_child.jasper
    • binary
    ./tousseSpecificationSizeStatistics.jasper
    • -0
    • +3
    ./tousseSpecificationSizeStatistics_child.jrxml
    • -0
    • +36
    ./tousseSpecificationSizeStatistics.jrxml
  1. … 1 more file in changeset.
解决:DGSDBZXYY-152NYSY-19

外来器械申请单统计报表增加价格,发货时间列,病人所属科室列可配置,支持不查询发货状态已终止的申请单。

    • -1
    • +38
    ./foreignTousseApplicationReport_subreport1.jrxml
    • binary
    ./foreignTousseApplicationReport.jasper
    • binary
    ./foreignTousseApplicationReport_subreport1.jasper
    • -54
    • +82
    ./foreignTousseApplicationReport.jrxml
  1. … 6 more files in changeset.
发货物品查询报表格式调整。不显示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。质量监测报表列头字体大小调整