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
Wednesday 04 May 2016
3:09 下午

wangyi

修复回收消毒物品bug
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasket.png
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:57 下午

jeffli

解决bug：

批量打印发货计划时报错

Options
    • -0
    • +11
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.3_4.1.4_oracle.sql
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.3_4.1.4_sqlserver.sql
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
2:01 下午

jeffli

解决bug：

用户部门为空时，会自动刷新界面。

Options
    • -0
    • +4
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
Tuesday 03 May 2016
7:02 下午

wangyi

回收功能bug修复
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasket.png
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customerIntobaskethovert.png
    • -99
    • +134
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -0
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customerIntobasket.png
    • -0
    • +220
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css
    • -187
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
6:45 下午

shuyongfu

核算月报增加按物品类型查询
Options
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -5
    • +51
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
2:47 下午

adairkang

将复大肿瘤打印入库单、退库单、调拨单、材料入库单等的打印配置同步到其他医院,如果升级到4.1的代码,就会用到这些配置
Options
    • -0
    • +124
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
    • -1
    • +183
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjyy/print/printConfig.js
    • -1
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js
    • -1
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/print/printConfig.js
    • -1
    • +485
    /ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js
    • -1
    • +485
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js
    • -1
    • +485
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
    • -1
    • +524
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/print/printConfig.js
    • -2
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
    • -1
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/dgjszx/print/printConfig.js
    • -1
    • +485
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/print/printConfig.js
    • -1
    • +485
    /ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/print/printConfig.js
    • -1
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/print/printConfig.js
2:13 下午

adairkang

珠江医院审核时打印标签
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
2:10 下午

wangyi

标志牌扫描提示修改
Options
    • -5
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
1:59 下午

wangyi

no_comment
Options
    • -4
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -4
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
12:45 下午

adairkang

修改名称
Options
    • -20
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
12:35 下午

adairkang

中山市中医院及珠江医院的项目配置
Options
    • -0
    • +2
    /ssts-web/src/main/resources/jdbc.properties
12:31 下午

adairkang

从中医药附3拷贝
Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/zjyy
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -0
    • +483
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
  4. /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print
12:29 下午

adairkang

从中医药附3拷贝
Options
  1. /ssts-web/src/main/resources/config/zjyy
  2. /ssts-web/src/main/resources/config/zjyy/mybatis
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/mybatis/SyncSupplierMapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/mybatis/syncFromHERP_DBD_Mapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/mybatis/syncFromHERP_CKD_Mapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/dataSyncConfig.json
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/writeBackInventoryConfig.json
    • -0
    • +0
    /ssts-web/src/main/resources/config/zjyy/importBaseDataConfig.json
11:59 上午

adairkang

no_comment
Options
  1. /ssts-web/src/main/resources/spring/projects/zjyy
    • -0
    • +-28
    /ssts-web/src/main/resources/spring/projects/zjyy/timer.xml
    • -0
    • +0
    /ssts-web/src/main/resources/spring/projects/zjyy/HIS.xml
    • -0
    • +0
    /ssts-web/src/main/resources/spring/projects/zjyy/HERP.xml
    • -0
    • +0
    /ssts-web/src/main/resources/spring/projects/zjyy/importBaseDataFromZip.xml
11:55 上午

adairkang

同步复大肿瘤入库单、调拨单、材料等的打印配置
Options
    • -1
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js
11:01 上午

wangyi

盘点生成盘盈盘亏赋值价格
Options
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
10:29 上午

wangyi

回收改造，去掉篮筐分组功能，增加按材料分类类型入筐功能
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -30
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
    • -6
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerGroupView.jsp
    • -27
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • -8
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -2
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -33
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerGroupView.js
    • -16
    • +0
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -2
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -180
    • +213
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
  16. … 32 more files in changeset.
Monday 02 May 2016
11:49 下午

shuyongfu

1.明细核算月报增加器械材料选项,选一次性物品、器械包等物品时,不查询材料的数据

2.结算管理功能调整

3.报表功能完善

Options
    • -12
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +28
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -2
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
6:50 下午

adairkang

一次性物品结算汇总分类过滤
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:12 下午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
2:33 上午

adairkang

统计汇总的新加列
Options
    • -7
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:15 上午

adairkang

盘点列表打印

发货出库统计

Options
    • -2
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/MonthGoodsDetailVo.java
    • -30
    • +213
    /ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jasper
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -1
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
1:13 上午

adairkang

盘盈盘亏的打印
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • -5
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
12:23 上午

adairkang

no_comment
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Sunday 01 May 2016
11:59 下午

adairkang

盘盈盘亏打印
Options
    • -7
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -0
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
11:40 下午

adairkang

一次性物品盘盈盘亏报表
Options
    • -1
    • +195
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/MonthGoodsDetailVo.java
    • -0
    • +186
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:57 上午

shuyongfu

1.新增一次性物品盘盈盘亏功能

2.调拨单按日期等条件查询功能完善

Options
    • -0
    • +49
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp
    • -0
    • +531
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -0
    • +81
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
Friday 29 Apr 2016
4:43 下午

adairkang

中山市中医院的大标签及发货计划的打印

打印器械包标签时，可以配置一次性物品是否要打印

Options
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -78
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
4:40 下午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/debug/print/print.jsp
4:33 下午

cherry

update
Options
    • -1
    • +1
    /build.gradle