forgon-ssts-v4.1.0 / ssts-web / src / main / webapp

jasperRtp

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 12
Last Commit: 14 Feb 16
Commits this week: 0
Total Lines of Code (LoC): 60,570
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 21 Apr 2021
6:26 下午

zc.li

解决：NYSY-33。在外来器械申请单统计报表增加【材料明细】;SSTS-364:一张外来器械申请单如果申领了多套不同供应商的外来器械，在外来器械申请单统计报表中这些物品会重复显示，并且供应商也只显示了1.
Options
    • -1
    • +15
    ./foreignTousseApplicationReport_subreport1.jrxml
    • binary
    ./foreignTousseApplicationReport.jasper
    • -18
    • +11
    ./foreignTousseApplicationReport.jrxml
    • binary
    ./foreignTousseApplicationReport_subreport1.jasper
    • binary
    ./foreignTousseApplicationShowMaterialsReport.jasper
    • -0
    • +519
    ./foreignTousseApplicationShowMaterialsReport.jrxml
    • binary
    ./foreignTousseApplicationShowMaterialsReport_subreport1.jasper
    • -0
    • +127
    ./foreignTousseApplicationShowMaterialsReport_subreport1.jrxml
  9. … 8 more files in changeset.
Thursday 01 Apr 2021
4:16 下午

zc.li

修复核算月报科室发货的数据全退货时，数量格式显示异常的问题；
Options
    • -6
    • +12
    ./monthReport.jrxml
    • binary
    ./monthReportHideApplicationDepart.jasper
    • binary
    ./monthIntegralReport.jasper
    • binary
    ./monthReportBranche.jasper
    • -4
    • +7
    ./monthReportBranche.jrxml
    • -6
    • +8
    ./monthIntegralReport.jrxml
    • -6
    • +8
    ./monthReportHideApplicationDepart.jrxml
    • binary
    ./monthReportShowApplicationDepart.jasper
    • -2
    • +5
    ./monthReportGroupByDisposableGoodsType.jrxml
    • binary
    ./monthReport.jasper
    • binary
    ./monthReportGroupBySterilizationMode.jasper
    • binary
    ./monthReportGroupByDisposableGoodsType.jasper
    • -9
    • +11
    ./monthReportGroupBySterilizationMode.jrxml
    • -6
    • +8
    ./monthReportShowApplicationDepart.jrxml
  15. … 1 more file in changeset.
4:14 下午

zc.li

解决：ZJJSRM-50.外来器械申请单统计报表中增加“床位”列.(修复床位数据为空时，会出现null的问题)
Options
    • -2
    • +2
    ./foreignTousseApplicationReport.jrxml
    • binary
    ./foreignTousseApplicationReport.jasper
11:34 上午

zc.li

解决：ZJJSRM-50.外来器械申请单统计报表中增加“床位”列.
Options
    • -23
    • +37
    ./foreignTousseApplicationReport.jrxml
    • binary
    ./foreignTousseApplicationReport.jasper
  3. … 1 more file in changeset.
Tuesday 30 Mar 2021
5:52 下午

zc.li

修复ZSYY-291 核算月报及明细核算月报启用材料列配置项后材料列数量有误
Options
    • binary
    ./monthReportShowApplicationDepart.jasper
    • binary
    ./monthReportHideApplicationDepart.jasper
    • binary
    ./monthIntegralReport.jasper
    • -2
    • +2
    ./monthReportGroupByDisposableGoodsType.jrxml
    • binary
    ./monthReportBranche.jasper
    • binary
    ./monthReportGroupBySterilizationMode.jasper
    • -4
    • +5
    ./monthReportHideApplicationDepart.jrxml
    • -4
    • +5
    ./monthReportShowApplicationDepart.jrxml
    • binary
    ./monthReport.jasper
    • -4
    • +4
    ./monthReport.jrxml
    • -4
    • +5
    ./monthReportGroupBySterilizationMode.jrxml
    • -4
    • +5
    ./monthIntegralReport.jrxml
    • -4
    • +4
    ./monthReportBranche.jrxml
    • binary
    ./monthReportGroupByDisposableGoodsType.jasper
  15. … 1 more file in changeset.
Monday 29 Mar 2021
3:37 下午

zc.li

（美化院区核算月报，暂时挂在此问题下）：GDSZYY-73。将属于科研项目的一次性物品申请单的发放金额汇总显示到核算月报中。
Options
    • -4
    • +4
    ./monthReportBranche.jrxml
    • binary
    ./monthReportBranche.jasper
Tuesday 16 Mar 2021
6:58 下午

zc.li

解决：SSTS-333。质量监测项统计月报中，显示形式为“表格”，“折线图”，“柱状图”导出的excel文件命名不恰当
Options
    • -5
    • +8
    ./QualityMonitoringInspectMonthReportView.jrxml
    • -1
    • +1
    ./QualityMonitoringInspectDayOfMonthReportView.jrxml
    • binary
    ./QualityMonitoringInspectMonthReportView.jasper
    • binary
    ./QualityMonitoringInspectDayOfMonthReportView.jasper
  5. … 2 more files in changeset.
Thursday 04 Mar 2021
3:21 下午

zc.li

解决：GDSRMYY-526.包定义中一次性物品应纳入器械包工作量统计报表和消毒供应中心工作量统计报表统计（件数）。
Options
    • binary
    ./tousseWorkLoad.jasper
    • -4
    • +4
    ./tousseWorkLoad.jrxml
  3. … 16 more files in changeset.
Friday 26 Feb 2021
5:56 下午

zc.li

解决： SZSDSRMYY-54 第一点： 监测范围为【材料和器械包】的质量监测报表的改进(字体大小调整)
Options
    • -12
    • +27
    ./routineMonitoringWashScopeReport.jrxml
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • binary
    ./routineMonitoringWashScopeReport.jasper
    • -12
    • +24
    ./routineMonitoringSteScopeReport.jrxml
10:14 上午

zc.li

解决： SZSDSRMYY-54 第一点： 监测范围为【材料和器械包】的质量监测报表的改进
Options
    • binary
    ./routineMonitoringWashScopeReport.jasper
    • -0
    • +473
    ./routineMonitoringWashScopeReport.jrxml
  3. … 2 more files in changeset.
Friday 05 Feb 2021
7:04 下午

zc.li

解决BJ307YY-78 显示科室的核算月报科室显示优化
Options
    • binary
    ./monthReportShowApplicationDepart.jasper
    • -33
    • +15
    ./monthReportShowApplicationDepart.jrxml
2:30 下午

zc.li

解决BJ307YY-78新增重新打开后的需求：调整查询结果表格的列宽，科室名称列宽调小，能显示12个汉字即可；金额列的宽度调大，要能完整显示13个字符（包括数字和小数点在内）。
Options
    • binary
    ./monthReportHideApplicationDepart.jasper
    • binary
    ./monthReportShowApplicationDepart.jasper
    • -24
    • +24
    ./monthReportHideApplicationDepart.jrxml
    • -31
    • +32
    ./monthReportShowApplicationDepart.jrxml
10:56 上午

zc.li

监测报表格式调整，列头过长自动换行
Options
    • binary
    ./routineMonitoringReport.jasper
    • binary
    ./routineMonitoringReportOfADJ.jasper
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • -8
    • +8
    ./routineMonitoringReportOfADJ.jrxml
    • -10
    • +11
    ./routineMonitoringSteScopeReport.jrxml
    • binary
    ./QualityMonitoringReport.jasper
    • -8
    • +9
    ./routineMonitoringReport.jrxml
Thursday 04 Feb 2021
6:15 下午

zc.li

完善：GDSZYY-50 金额数字列的宽度要求：能完整显示13个字符（包括数字和小数点在内）
Options
    • -19
    • +19
    ./monthReportBranche.jrxml
    • binary
    ./monthReportBranche.jasper
10:34 上午

zc.li

解决:GDSZYY-70.GDSZYY-62.新增【科研项目明细核算月报;核算月报和明细核算月报要排除掉属于科研项目的一次性物品申请单发货的费用
Options
    • -0
    • +224
    ./sciProjectMonthReport.jrxml
    • binary
    ./sciProjectMonthReport.jasper
  3. … 8 more files in changeset.
Wednesday 03 Feb 2021
8:15 下午

jason

解决jira问题：SZSDSRMYY-48 自定义表单管理功能改进
Options
    • -3
    • +2
    ./formInstanceReport.jrxml
    • binary
    ./formInstanceReport.jasper
  3. … 1 more file in changeset.
5:30 下午

jason

解决jira问题：SZSDSRMYY-48 自定义表单管理功能改进
Options
    • binary
    ./formInstanceReport.jasper
    • -4
    • +9
    ./formInstanceReport.jrxml
  3. … 1 more file in changeset.
Tuesday 02 Feb 2021
3:12 下午

zc.li

解决新增需求4：BJ307YY-78。显示申请科室的核算月报开发
Options
    • -1
    • +3
    ./monthReportHideApplicationDepart.jrxml
    • binary
    ./monthReportHideApplicationDepart.jasper
  3. … 2 more files in changeset.
10:59 上午

jason

解决jira问题：SZSDSRMYY-48 自定义表单管理功能改进
Options
    • binary
    ./formInstanceReport.jasper
    • -119
    • +40
    ./formInstanceReport.jrxml
  3. … 2 more files in changeset.
Monday 01 Feb 2021
2:06 下午

zc.li

解决：BJ307YY-78。显示申请科室的核算月报开发
Options
    • binary
    ./monthReportShowApplicationDepart.jasper
    • binary
    ./monthReportHideApplicationDepart.jasper
    • -0
    • +376
    ./monthReportHideApplicationDepart.jrxml
    • -0
    • +431
    ./monthReportShowApplicationDepart.jrxml
  5. … 6 more files in changeset.
Saturday 30 Jan 2021
10:04 上午

zc.li

完善：DGSFYBJY-44。质量监测报表标题长度调短
Options
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • -1
    • +1
    ./routineMonitoringSteScopeReport.jrxml
Friday 29 Jan 2021
3:37 下午

zc.li

完善：DGSFYBJY-44。1。修复元素超过9个时排序不正常的问题。2.定期监测监测范围为灭菌炉记录时，日期改为监测登记的灭菌日期。
Options
    • -0
    • +463
    ./routineMonitoringSteScopeReport.jrxml
    • binary
    ./routineMonitoringReport.jasper
    • binary
    ./QualityMonitoringReport.jasper
    • -1
    • +1
    ./QualityMonitoringReport.jrxml
    • binary
    ./routineMonitoringSteScopeReport.jasper
    • binary
    ./routineMonitoringReportOfADJ.jasper
    • -115
    • +24
    ./routineMonitoringReport.jrxml
    • -1
    • +1
    ./routineMonitoringReportOfADJ.jrxml
  9. … 3 more files in changeset.
11:38 上午

zc.li

部分解决：DGSFYBJY-44。1.定期监测定义元素排序问题；4、新增定期检查的监测范围选择【灭菌炉记录】，登记后，在报表中展示灭菌炉相关炉号、炉次。灭菌日期未使用，使用监测登记日期。注：2未重现；3暂不支持。
Options
    • binary
    ./routineMonitoringReportOfADJ.jasper
    • -24
    • +115
    ./routineMonitoringReport.jrxml
    • -1
    • +1
    ./routineMonitoringReportOfADJ.jrxml
    • -1
    • +1
    ./QualityMonitoringReport.jrxml
    • binary
    ./routineMonitoringReport.jasper
    • binary
    ./QualityMonitoringReport.jasper
  7. … 1 more file in changeset.
Wednesday 27 Jan 2021
4:40 下午

zc.li

解决：FSSZYY-15 增加工作量积分统计报表
Options
    • binary
    ./workloadScoreStatisticReport.jasper
    • -0
    • +358
    ./workloadScoreStatisticReport.jrxml
  3. … 7 more files in changeset.
Tuesday 26 Jan 2021
6:59 下午

zc.li

解决新增的需求3,4:CDSLQYQYYY-84.消毒供应中心工作量统计报表》统计的数量要增加材料发货的数量统计,《器械包规格大小统计报表》统计的数量要增加材料发货的数量统计,合计。
Options
    • binary
    ./tousseSpecificationSizeStatistics_child.jasper
    • binary
    ./tousseSpecificationSizeStatistics.jasper
    • -0
    • +3
    ./tousseSpecificationSizeStatistics_child.jrxml
    • -0
    • +36
    ./tousseSpecificationSizeStatistics.jrxml
  5. … 1 more file in changeset.
Tuesday 19 Jan 2021
2:30 下午

zc.li

解决：DGSDBZXYY-152，NYSY-19。

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

Options
    • -1
    • +38
    ./foreignTousseApplicationReport_subreport1.jrxml
    • binary
    ./foreignTousseApplicationReport.jasper
    • binary
    ./foreignTousseApplicationReport_subreport1.jasper
    • -54
    • +82
    ./foreignTousseApplicationReport.jrxml
  5. … 6 more files in changeset.
Thursday 14 Jan 2021
2:09 下午

zc.li

发货物品查询报表格式调整。不显示null值。
Options
    • binary
    ./invoiceSummaryQuery_childAddSupplierName.jasper
    • -5
    • +9
    ./invoiceItemsQuery_main_1.jrxml
    • binary
    ./invoiceItemsQuery_child_1AddSupplierName.jasper
    • binary
    ./invoiceSummaryQuery_mainAddSupplierName.jasper
    • -3
    • +3
    ./invoiceItemsQuery_child_1.jrxml
    • binary
    ./invoiceSummaryQuery_child.jasper
    • -1
    • +1
    ./invoiceSummaryQuery_child.jrxml
    • binary
    ./invoiceItemsQuery_main_1.jasper
    • -1
    • +2
    ./invoiceSummaryQuery_mainAddSupplierName.jrxml
    • binary
    ./invoiceSummaryQuery_main.jasper
    • -1
    • +1
    ./invoiceItemsQuery_child_1AddSupplierName.jrxml
    • binary
    ./invoiceItemsQuery_child_1.jasper
    • -2
    • +3
    ./invoiceSummaryQuery_main.jrxml
    • -1
    • +1
    ./invoiceSummaryQuery_childAddSupplierName.jrxml
Wednesday 13 Jan 2021
4:23 下午

zc.li

解决：BJ307YY-43。发货物品查询结果表格增加物品数量和金额的统计，以及增加申请科室列。

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

调整报表样式。

Options
    • binary
    ./departmentMonthDetailSupplierNameAndDiscountPrice_child.jasper
    • binary
    ./invoiceSummaryQuery_main.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
    ./invoiceItemsQuery_child_1.jasper
    • binary
    ./DepartmentMonthDetailIntegral_child.jasper
    • binary
    ./DepartmentMonthDetail_child.jasper
    • -0
    • +1
    ./departmentMonthDetailSupplierName_child.jrxml
    • -0
    • +1
    ./DepartmentMonthDetail_child.jrxml
    • -0
    • +1
    ./DepartmentMonthDetailDiscountPrice_child.jrxml
    • -13
    • +118
    ./invoiceSummaryQuery_mainAddSupplierName.jrxml
  16. … 15 more files in changeset.
Tuesday 12 Jan 2021
10:14 上午

zc.li

解决：JYSRMYY-19

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

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

Options
    • -0
    • +247
    ./departmentMonthDetailShowMaterialsAmount.jrxml
    • binary
    ./departmentMonthDetailShowMaterialsAmount.jasper
    • binary
    ./departmentMonthDetailShowMaterialsAmount_child.jasper
    • -0
    • +145
    ./departmentMonthDetailShowMaterialsAmount_child.jrxml
  5. … 4 more files in changeset.
Thursday 07 Jan 2021
6:07 下午

zc.li

GDSZYY-50.调整核算月报格式
Options
    • binary
    ./monthReportBranche.jasper
    • -12
    • +14
    ./monthReportBranche.jrxml
  3. … 1 more file in changeset.