forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 17 Feb 2017
5:24 下午

zengjc

解决jira问题：ZSYY-14,质量监测项统计月报添加季度报表、支持按月查询每天的数据，查询每天的数据的显示支持折现图和柱状图；中大附一报表名称“质量监测项统计月报”改为“质量监测项统计分析报表”.
Options
    • -0
    • +28
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView1.jrxml
    • -0
    • +176
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView1.jasper
    • -3
    • +6
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportBarChartView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportBarChartView.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -0
    • +73
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/QualityMonitoringInspectBean.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jasper
    • -1
    • +5
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +11
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -9
    • +92
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectQuarterCompareReportView.jasper
    • -0
    • +192
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectQuarterCompareReportView.jrxml
4:41 下午

wangyi

完成：HDQRMYY-17，外来器械标签类型默认取祖先类包定义标签类型，如果祖先类包定义没有配置拿科室供应室配置为准
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -42
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:53 上午

wangyi

解决：DGZYY-53，外来器械二次回收扫描条码开打该申请单
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.4_4.6.5.sql
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -11
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
11:20 上午

chenjiaru

解决jira问题：ZSSXLRMYY-120 状态为“灭菌失败”的灭菌记录，物理监测结果和化学监测结果需要默认为不合格
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
Thursday 16 Feb 2017
7:40 下午

adairkang

核算月报和明细核算月报添加折扣价格
Options
    • -0
    • +238
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPrice.jrxml
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetail.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPrice_child.jasper
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +138
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPrice_child.jrxml
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPrice.jasper
6:41 下午

chenjiaru

去掉多余的代码，和去掉报表界面多余的嵌套，此次提交没有关联jira
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -208
    • +202
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
    • -9
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.jsp
    • -197
    • +0
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml
    • --16
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -2
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jasper
    • -2
    • +0
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
4:23 下午

wangyi

完成：ZSSZYY-94，触摸屏回收外来器械显示总件数
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
3:45 下午

chenjiaru

解决jira问题：HDQRMYY-15 三个报表中的器械包装配总数对不上
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:18 下午

shuyongfu

DYSYY-6 供应室的基数包，不管回收来自哪个科室，都打印科室为供应室。

DYSYY-10 器械包定义增加【是否发货】字段

针对以上两个问题增加配置项

Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
3:18 下午

wangyi

解决：PYQZYY-146，部分回收时终止申请单失败
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
12:54 下午

chenjiaru

在报表那一块的“设置统计的器械包”多加了停用的器械包，此次提交没有关联jira
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/js/common.js
11:35 上午

chenjiaru

修复有误的sql语句，此次提交没有关联jira
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:27 上午

zengjc

修复jira问题：ZSYY-16,定期检测的监测范围是‘灭菌炉记录’，隐藏器械包信息;质量检测的监测范围是‘灭菌炉记录’，保存不校验器械包材料录入;定期检测、质量监测打开，监测项不能编辑.
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -38
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
11:10 上午

wangyi

完成：DGZYY-76功能开发，增加工作量评分标准功能
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp
    • -0
    • +71
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/WorkScoreConfig.java
    • -5
    • +34
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkLoad.java
    • -30
    • +50
    /ssts-web/src/main/webapp/jasperRtp/workload.jrxml
    • -8
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/workload.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +16
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/dwr/table/JasperreportsTableManager.java
    • -0
    • +206
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js
    • -190
    • +217
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
9:54 上午

shuyongfu

DYSYY-6 供应室的基数包，不管回收来自哪个科室，都打印科室为供应室。

DYSYY-10 器械包定义增加【是否发货】字段

DYSYY-15 折扣价问题的个性化需求改进

针对以上三个问题增加包实例与发货项表的字段及处理相关的字段的旧数据

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
Wednesday 15 Feb 2017
7:39 下午

zengjc

修复定期监测、质量监测没有添加灭菌记录日期，保存报错的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
7:21 下午

chenjiaru

优化报表设置物品的那个窗口的“批量添加物品”的方法，此次提交没有关联jira
Options
    • -18
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
5:51 下午

chenjiaru

把“器械包各生产环节统计报表”和“器械包工作量统计报表”合并，此次提交没有关联jira
Options
    • -0
    • +55
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadVO.java
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.js
    • -8
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -6
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp
    • -7
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -195
    • +189
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • -6
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -11
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -2
    • +2
    /forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • -54
    • +108
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
5:06 下午

shuyongfu

DYSYY-6 供应室的基数包，不管回收来自哪个科室，都打印科室为供应室。

DYSYY-10 器械包定义增加【是否发货】字段

DYSYY-15 折扣价问题的个性化需求改进

针对以上三个问题增加包定义的字段及处理相关的字段的旧数据

Options
    • -0
    • +47
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +3
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql
4:25 下午

zengjc

解决jira问题: ZSYY-16,质量监测、定期监测监测范围增加按灭菌炉记录，当监测范围为‘灭菌炉记录’时，选择时间和炉号，就可以选择相关炉次，质量监测列表、定期监测列表添加灭菌炉号和炉次显示。
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
    • -1
    • +20
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp
    • -4
    • +22
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
    • -0
    • +124
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • -2
    • +169
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -0
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
4:23 下午

cherry

更新PDA版本为4.5.32 支持自定义发货选择科室
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.30_20170121.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.32_20170214.apk
10:24 上午

adairkang

ZSWY-64 物品签收时,如果扫描某个物品有错误信息提示时,需要回到屏幕手工关掉信息,操作比较麻烦
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
Tuesday 14 Feb 2017
10:48 下午

terrykwan

修改为Jenkins工作区的路径
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
8:21 下午

adairkang

材料入库单的删除
Options
    • -2
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
    • -9
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -9
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialEntryAction.java
    • -0
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -5
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
5:30 下午

adairkang

ZSWY-61 核算月报，如果有器械丢失或报废，同一个科室显示2行结果
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:14 下午

wangyi

修复质量监测停用功能问题
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/customform/formdefinitionView.js
2:39 下午

jeffli

解决： DYSYY-20

自定义标签中，把一维码条码和条码号分开

Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
2:05 下午

zengjc

去掉调试的提示.
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
1:01 下午

adairkang

JMSRMYY-27 科室申领页面鼠标移上去的单据视图显示时间增加

借物单管理、发货管理、审核、科室申领、灭菌装载、清洗消毒界面，弹出提示筐不自动消失

Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
11:44 上午

adairkang

DYSYY-21 PDA端自定义发货，发货科室增加选择项
Options
    • -1
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java