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 08 Feb 2017
7:29 下午

wangyi

增加回收器械外来明细报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +70
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/recycleMaterialDetailView.jsp
    • -0
    • +60
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RecycleMaterialVo.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/recycleMaterialReport.jasper
    • -0
    • +134
    /ssts-web/src/main/webapp/jasperRtp/recycleMaterialReport.jrxml
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +250
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/recycleMaterialDetailView.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +11
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
6:45 下午

zengjc

灭菌炉使用次数统计报表做如下修改：

1.默认开始时间为当月的第一天.

2.灭菌目的添加全部，并默认为全部.

3.添加汇总和明细查询选项，统计灭菌炉使用次数，生物监测次数.

解决jira问题DGZYY-74

Options
    • -3
    • +40
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java
    • -2
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +182
    /ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml
    • -6
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
    • -0
    • +19
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
5:15 下午

wangyi

修复外来器械干预，修改器械包名称后，包实例没有联动修改
Options
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
5:03 下午

wangyi

修复干预功能修改外来器械包名称后发不了货问题
Options
    • -0
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
3:59 下午

shuyongfu

解决长沙中心医院灭菌炉灭菌次数统计报表查询不出数据的问题
Options
    • -1
    • +10
    /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
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:52 下午

shuyongfu

解决器械包定时废弃时如果包已发货但仓库id为空时的报错的异常
Options
    • -3
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
2:40 下午

jeffli

发货时，聚合包实例不记住发货单id
Options
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:31 上午

wangyi

部分回收增加配置项
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
10:52 上午

shuyongfu

解决jira问题:SSTS-76 灭菌时，【一键入炉】按钮并未将所有待灭菌物品全部加载到灭菌物品列表中
Options
    • -1
    • +423
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
10:43 上午

shuyongfu

解决长沙中心医院科室人员同步失败的问题
Options
    • -2
    • +14
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java
    • -1
    • +4
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/CommonVo.java
10:09 上午

shuyongfu

灭菌装载注释调整
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
10:06 上午

shuyongfu

申请项与发货项增加索引
Options
    • -1
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
Tuesday 07 Feb 2017
9:22 下午

chenjiaru

修改注释
Options
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java
9:13 下午

chenjiaru

解决：ZSSZYY-93 器械包信息列表，支持多次扫描器械包查询
Options
    • -8
    • +15
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java
    • -105
    • +137
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
7:02 下午

jeffli

发货时，聚合包实例记住发货单id
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:45 下午

terrykwan

每循环100次打印一次，减少控制台的输出
Options
    • -2
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/SerialNumberInvoker.java
11:50 上午

zhonghaowen

1.修改聚合包列表显示列

2.聚合包下的器械包增加过滤已停用的器械包

Options
    • -4
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
    • -11
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
10:45 上午

shuyongfu

解决花都区人民医院同步入库单失败的问题
Options
    • -2
    • +22
    /ssts-web/src/main/resources/config/hdqrmyy/mybatis/syncFromHERP_Mapper.xml
Monday 06 Feb 2017
11:37 下午

shuyongfu

更改器械包名称的联动修改增加对聚合包的处理
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
9:57 下午

chenjiaru

1、在器械包信息列表屏蔽掉聚合包里面的包实例 2、并且改造了包类型为聚合包的追溯窗口
Options
    • -0
    • +24
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -554
    • +638
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
4:33 下午

zhonghaowen

聚合包删除时增加删除聚合包的中间表数据
Options
    • -3
    • +20
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManager.java
3:02 下午

zhonghaowen

1.屏蔽聚合包定义的器械包总件数、器械包种类

2.修复聚合包改名或者另存为拼音码不会跟着改

3.聚合包下的器械包只显示器械包和敷料包

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -4
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
    • -40
    • +47
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
10:46 上午

zhonghaowen

修复聚合包保存了处理科室和任务组，下次再打开显示不了的问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
10:15 上午

shuyongfu

聚合包定义处理科室与任务组的取值与设置
Options
    • -27
    • +25
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
Sunday 05 Feb 2017
9:55 下午

chenjiaru

去除多余的测试代码
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
9:43 下午

chenjiaru

优化报表“设置物品”的那个窗口
Options
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -50
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
    • -27
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setDepartmentOption.js
    • -0
    • +6
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -9
    • +1
    /ssts-web/src/main/webapp/systemmanage/operationNameView.js
    • -3
    • +6
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -2
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
Saturday 04 Feb 2017
11:16 下午

chenjiaru

1、增加注释

2、修改UI按钮的名称

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/MathTools.java
    • -0
    • +6
    /forgon-core/src/main/java/com/forgon/security/tools/Util.java
    • -3
    • +31
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
10:23 下午

wangyi

修复聚合包测试用例通不过问题
Options
    • -4
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/ComboToussePackingTests.java
9:04 下午

zhonghaowen

修复po类中有logger属性在gson转换下报错
Options
    • -1
    • +27
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -0
    • +21
    /forgon-tools/src/main/java/com/forgon/annotations/GsonIgnore.java
  3. /forgon-tools/src/main/java/com/forgon/annotations
8:30 下午

wangyi

聚合包内普通器械包相关属性赋值
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java