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
Thursday 16 Jun 2016
5:33 下午

shuyongfu

解决回收申请单批量打印发货计划时小计金额为0的问题
Options
    • -1
    • +13
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
4:27 下午

adairkang

历史回收记录，表格内容不隐藏
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
4:12 下午

adairkang

中医药附三发货单打印
Options
    • -8
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js
3:49 下午

shuyongfu

1.增加器械包改名的日志记录

2.解决中大五院问题:增加去下划线改造方法的action入口、二级供应室申请单在科室申领及全部申请单都能看到、一级供应室回收的单在历史回收记录能看到等

3.装配的一些细节问题

Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -0
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +21
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
    • -0
    • +7
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
    • -1
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
3:03 下午

wangyi

日志记录里回收记录id为null
Options
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:53 下午

adairkang

回收清点添加器械包，可选择的器械包按登录用户的科室能处理和器械包过滤
Options
    • -8
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:42 下午

jeffli

解决bug：

升级脚本有中文时会乱码，导致脚本执行有问题。

Options
    • -6
    • +15
    /forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionByExecSqls.java
2:34 下午

zengjc

档案管理模块，上传头像和附件，如果后台没有配置有效保存路径，页面有提示.
Options
    • -1
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/staffArchives/action/StaffArchiveAction.java
    • -26
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/staffArchives/staffArchiveForm.js
1:49 下午

adairkang

调整历史回收记录界面列宽
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
1:36 下午

terrykwan

调整底图的列宽表格线
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg_02.jpg
11:32 上午

adairkang

修改为javadoc注释
Options
    • -3
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/db/DatabaseUtil.java
11:25 上午

wangyi

材料定义页面上加清洗分类类型字段
Options
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
9:56 上午

adairkang

历史回收记录添加备注列(GZFDZL-38)
Options
    • -4
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • -11
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -7
    • +8
    /forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java
    • -0
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 15 Jun 2016
6:39 下午

adairkang

入库物品统计报表、入/退库物品统计报表、入库物品明细统计报表添加对一次性物品的分类查询（GZFDZL-37）
Options
    • -1
    • +41
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -3
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
5:06 下午

wangyi

修改自定义器械申请项是否整包清洗属性
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
4:11 下午

zengjc

1.器械包定义上传图片时,保存目录不存在提示失败.

2.科室供应室配置模块，设置文件保存路径不存在时,保存失败，没有配置保存路径，则用默认的。

Options
    • -1
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -1
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -0
    • +58
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -1
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
3:59 下午

adairkang

入库物品统计报表，物品类型选择框不可修改
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
3:54 下午

adairkang

入库物品统计报表跟入库物品明细统计报表在第一次进入时，不加载数据
Options
    • -14
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
    • -14
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryDetailStatisticView.js
3:49 下午

wangyi

增加清洗区材料类别工作量统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +168
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
    • -0
    • +65
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialTypeWorkloadReport.java
    • -0
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jasper
    • -0
    • +221
    /ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
3:37 下午

adairkang

将一次性物品类别统一改为一次性物品类型
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
3:21 下午

wangyi

科室供应室配置增加自定义器械包是否整包清洗字段
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -15
    • +11
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -2
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
2:53 下午

adairkang

同步4.0中番禺区中医院的打印配置printConfig.js
Options
    • -67
    • +207
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
11:34 上午

adairkang

器械包退货失败，因为没有所属仓库，扣减不了库存(旧数据)
Options
    • -2
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
10:32 上午

adairkang

审核统计界面，高度减少30，以免在ie8下，滚动条不能使用
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
9:39 上午

adairkang

器械包的中标签打印
Options
    • -13
    • +134
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
Tuesday 14 Jun 2016
4:27 下午

zengjc

解决删除所有一次性物品类型时，物品有申请发放记录也删除类型的问题，Jira问题ZYYFS-40
Options
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
3:43 下午

shuyongfu

东莞东华医院his接口及webservice调用重新封装
Options
    • -1
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/WebServiceClientHelper.java
3:41 下午

shuyongfu

东莞东华医院his接口及webservice调用重新封装
Options
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +143
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/WebServiceClientHelper.java
    • -1
    • +2
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/FindPatientInfoByHospitalNumDao.java
    • -6
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -2
    • +3
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/WebServiceClientHelper.java
  7. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy
    • -0
    • +66
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +133
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/SyncOrgUnitAndUserDaoImpl.java
  11. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy
    • -0
    • +63
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/FindPatientInfoByHospitalNumDaoImpl.java
    • -0
    • +22
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/HisDbConnectionUtil.java
    • -0
    • +86
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +85
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/FindPatientInfoByHospitalNumDaoImpl.java
  16. … 11 more files in changeset.
3:20 下午

jeffli

导入包定义时，设置材料的顺序，使包定义材料的顺序跟excel里面材料的顺序一致。
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
3:13 下午

jeffli

导入包定义时，设置材料的顺序，使包定义材料的顺序跟excel里面材料的顺序一致。
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java