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 06 Jul 2016
6:27 下午

shuyongfu

东莞东华医院用户、科室、病人信息接口及一次性物品、材料入/退库单同步接口
Options
    • -2
    • +0
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/SyncOrgUnitAndUserDaoImpl.java
    • -1
    • +21
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/FindPatientInfoByHospitalNumDaoImpl.java
  3. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao
  4. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy
    • -1
    • +0
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +25
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/applicationContext-his.xml
    • -1
    • +3
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
    • -0
    • +23
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/WebServiceClientHelper.java
    • -0
    • +468
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy/InventoryDaoImpl.java
    • -0
    • +29
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntryItem.java
5:37 下午

shuyongfu

解决jira问题:ZSSZYY-31 器械包定义修改器械包类型，保存失败

器械包改名同时联动更新goodsStock表的器械包名称的值

Options
    • -1
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
5:37 下午

wangyi

工作质量收集报表 cssd包装物品总包数改为按包数量统计
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:21 下午

adairkang

加载材料图片前，判断id是否有效
Options
    • -5
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
5:12 下午

wangyi

快速回收回收数量可以弹出选择数量窗口修改
Options
    • -1
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
5:08 下午

adairkang

取消记录前面的加号
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
5:04 下午

zengjc

对待清洗状态的篮筐增加状态判断.
Options
    • -1
    • +1
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
4:11 下午

zengjc

1.清洗记录的待清洗篮筐排序。

2.修正不存在的待清洗篮筐显示的bug.

3.待清洗篮筐没有物品，不显示在列表中.

Options
    • -4
    • +12
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -3
    • +9
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
3:30 下午

wangyi

包装区工作量统计报表排序
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:29 下午

adairkang

装配界面添加材料的注意事项
Options
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -0
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
2:54 下午

wangyi

清洗工作量统计扣减植入物使用数量
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -3
    • +15
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -15
    • +0
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • -1
    • +9
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • -13
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
2:18 下午

shuyongfu

解决用户管理修改某个用户密码不成功的问题,由于ext的grid.getSelectValue(“key”)得到对应列单位格的值为数字型,所以需要加一个空文本转换成字符型后才能调用下一行的split方法
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/systemmanage/userExtView.js
11:11 上午

jeffli

添加灭菌物品装载到个人桌面

广东省人民医院GDSRMYY-70

Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/tabs_sterilizationLoading.png
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
10:36 上午

jeffli

解决bug：

普通物品转高值耗材时，如果一个批次库存下有多个价格，转出来的高值耗材只取了批次库存的价格，应该要分别取对应的价格。

Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -4
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
10:27 上午

wangyi

测试用例代码修改
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
10:18 上午

zengjc

解决jira问题GDSRMYY-59，提交漏提交文件.
Options
    • -0
    • +47
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
10:16 上午

zengjc

清洗消毒界面添加待清洗篮筐列表，运作监控管理中的->消毒供应中心未完成工作列表中添加加'待清洗篮筐列表'，解决jira上问题GDSRMYY-59
Options
    • -0
    • +101
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +8
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
    • -1
    • +66
    /ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
    • -330
    • +408
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +29
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
8:46 上午

adairkang

no_comment
Options
    • -2
    • +0
    /forgon-tools/src/main/java/com/forgon/tools/StrutsResponseUtils.java
Tuesday 05 Jul 2016
6:18 下午

adairkang

灭菌完成请求后台失败后的处理，添加判断
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
5:15 下午

adairkang

器械包库存，使用祖先id来进行入库和退库(还原这次的修改)
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -4
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
4:52 下午

adairkang

消毒物品材料的注意事项
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -16
    • +24
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -3
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
4:31 下午

jeffli

小榄医院外部代理灭菌小标签格式调整

中山市小榄人民医院ZSSXLRMYY-17

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
4:20 下午

wangyi

外来器械测试bug修复
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -4
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -0
    • +119
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
    • -3
    • +16
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
3:57 下午

jeffli

重构外部代理灭菌打印代码，参数改为json对象，增加标签类型支持。

小榄医院增加中标签配置

中山市小榄人民医院ZSSXLRMYY-16

Options
    • -0
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -1
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
    • -17
    • +15
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -3
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
3:37 下午

adairkang

材料定义添加注意事项，在回收的时候，点击材料显示注意事项
Options
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -5
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -5
    • +26
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
3:18 下午

adairkang

获取图片的代码改造，如果图片没有，则加载空图片，并判断最终的图片数据是否为空，避免空指针异常
Options
    • -5
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -4
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -4
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/staffArchives/action/StaffArchiveAction.java
    • -8
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -7
    • +2
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
    • -11
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -0
    • +26
    /forgon-tools/src/main/java/com/forgon/tools/ImageUtils.java
    • -4
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
2:27 下午

zengjc

修正待回收申请列表显示不了的问题.
Options
    • -1
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
11:31 上午

adairkang

器械包库存，使用祖先id来进行入库和退库
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
    • -6
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
Monday 04 Jul 2016
11:42 下午

wangyi

外来器械界面升级4.0
Options
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • -1
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -222
    • +277
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -381
    • +61
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
11:42 下午

wangyi

增加外来器械干预功能，去掉转换病人功能，外来器械界面升级到4.0，外来器械申请、回收界面合并成一个页面
Options
    • -0
    • +1344
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
    • -0
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • -0
    • +98
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js
    • -0
    • +2
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -25
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -203
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • -9
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -9
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
    • -3
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js
    • -2
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • --3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationForm.js
    • -0
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java