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
Tuesday 31 May 2016
2:53 下午

jeffli

增加高值耗材退库功能

重构退库代码

Options
  1. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/disposablegoods
    • -0
    • +4
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
  4. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/disposablegoods/service
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • -1
    • +37
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryDiposableGoodsItem.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +5
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -0
    • +183
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/disposablegoods/service/DisposableGoodsServiceContext.java
    • -0
    • +21
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • -0
    • +139
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -7
    • +108
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -0
    • +31
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
2:41 下午

adairkang

一次性物品导入，失效日期的检查，字符长度只能是yyyy-MM-dd的长度
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
2:16 下午

terrykwan

解决使用记录输入用户工号或者扫描条码查询时，后台提示：“SQLException: 'u' 附近有语法错误。”的问题
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
1:51 下午

wangyi

修复年度消毒中心指标工作量统计报表年度平均值未保留两位小数
Options
    • -3
    • +37
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jasper
11:07 上午

wangyi

番禺区中医药打印样式修改
Options
    • -0
    • +1219
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
    • -0
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
  3. /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print
  4. /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy
11:06 上午

wangyi

修改外来器械包装配类型
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
11:05 上午

wangyi

修复外来器械包查看追溯信息无清洗记录bug
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:10 上午

shuyongfu

1.解决jira问题:广州复大肿瘤医院 GZFDZL-30 外来器械、自定义器械包，回收后，没看到对应的装配任务

2.科室供应室配置的外来器械装配默认处理科室根据所选任务组赋值，并只读

3.查询仓库、供应室处理器械包、供应室服务临床科室配置等去掉按科室id的判断

Options
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -4
    • +6
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -5
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +25
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
    • -5
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
Monday 30 May 2016
6:49 下午

wangyi

修复标识牌丢失未入筐可以保存bug
Options
    • -8
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -28
    • +100
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
5:40 下午

zengjc

修正史帝瑞接口循环次数为空，读取数据时出错的问题.
Options
    • -2
    • +10
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
5:26 下午

adairkang

pda已装配的器械包不能添加灭菌记录
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:23 下午

jeffli

解决bug：

普通一次性物品无法退货

Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
5:21 下午

jeffli

解决bug：

普通一次性物品无法退货

Options
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
5:15 下午

adairkang

点击历史回收记录进入回收界面，隐藏终止按钮
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
1:59 下午

wangyi

科室互借扫描器械包条码，器械包状态增加已签收状态
Options
    • -1
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
Friday 27 May 2016
1:34 下午

adairkang

灭菌记录失败后可以重新灭菌
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
Thursday 26 May 2016
5:58 下午

adairkang

pda灭菌中的灭菌记录可以删除
Options
    • -1
    • +11
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -40
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -0
    • +43
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:52 下午

jeffli

优化发货功能：

高值耗材发货时，增加仓库校验。扫描的高值耗材和页面选择的仓库必须一致

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:39 下午

jeffli

在高值耗材界面增加打印的功能
Options
    • -0
    • +18
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsView.js
    • -1
    • +75
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
4:46 下午

jeffli

优化功能：

新增页面，能查看对应的高值耗材条码，状态等属性

去掉一次性物品库存管理界面多余的按钮。

Options
    • -37
    • +65
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
    • -0
    • +401
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsView.js
4:45 下午

jeffli

优化功能：

新增页面，能查看对应的高值耗材条码，状态等属性

去掉一次性物品库存管理界面多余的按钮。

Options
    • -0
    • +15
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -6
    • +63
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
3:28 下午

wangyi

修复hql查询报错bug
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:33 下午

adairkang

中山市中医院标签纸打印中，如果名称太长，换行的情况处理
Options
    • -19
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
Wednesday 25 May 2016
4:45 下午

wangyi

回收清点界面通过扫描标识牌条码找的该包对应的历史回收记录-GDSRMYY-19
Options
    • -4
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js
    • -5
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +15
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
4:20 下午

jeffli

解决bug：

待装配的回收时间为回收日期的零点

消毒追溯系统V4.1稳定版SSTS-55

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:54 下午

adairkang

pda已签收的物品可以退货(ZSYKZX-18)
Options
    • -2
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
1:57 下午

adairkang

中山市中医院标签要打印一次性物品
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
10:42 上午

shuyongfu

中山市中医院病人接口增加住院次数
Options
    • -2
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -0
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
    • -1
    • +3
    /ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -1
    • +3
    /ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
Tuesday 24 May 2016
6:34 下午

wangyi

修复器械包追溯信息清洗记录一个包分多个篮筐清洗看到多条清洗记录
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -36
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -34
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -17
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -1
    • +33
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -2
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.7_4.1.8.sql
5:20 下午

adairkang

同步4.0中灭菌记录只加载灭菌失败的器械包，没有加载新添加的器械包问题(ZSYKZX-12)

灭菌完成灭菌失败上传图片的功能，添加开关配置（ZSSZYY-7）

Options
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -1
    • +45
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -6
    • +18
    /ssts-web/src/main/java/com/forgon/disinfectsystem/mobileClient/action/MobileClientSettingAction.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -26
    • +43
    /ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js