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 11 May 2016
5:57 下午

zengjc

1.添加灭菌炉,清洗机接口代码.

2.支持基础数据整理工具数据的导入.

Options
    • -0
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/dwr/table
    • -0
    • +16
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcess.java
  4. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/dwr
    • -0
    • +95
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importBasedata.jsp
    • -0
    • +121
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/taskGroup/TaskGroup.java
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +25
    /forgon-core/src/main/java/com/forgon/attachfile/service/AttachFileManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
  12. /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service
    • -0
    • +2
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
  14. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData
    • -1
    • +1
    /build.gradle
  16. … 66 more files in changeset.
5:30 下午

jeffli

解决bug：

外来器械申请单添加新材料，或者修改已有材料的数量后，点打印，打印的总数不对。

Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
5:04 下午

adairkang

中大五院发货单打印
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
3:11 下午

adairkang

中山市中医院审核必须入框改为false
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
2:20 下午

adairkang

中大五院发货单打印超出纸张宽度
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
11:15 上午

adairkang

灭菌程序的灭菌目的为空的处理
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
11:12 上午

adairkang

灭菌程序的灭菌目的为空的处理
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
10:54 上午

cherry

第三方讯飞语音
Options
    • binary
    /ssts-web/src/main/webapp/thirdpartyAPP/讯飞语音+ 1.1.1045.apk
10:27 上午

jeffli

新增项目配置：

中山小榄人民医院 zsxlrmyy

sql server数据库

Options
    • -0
    • +1303
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
  2. /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy
    • -0
    • +15
    /ssts-web/src/main/resources/config/zsxlrmyy/dataSyncConfig.json
  4. /ssts-web/src/main/resources/config/zsxlrmyy
  5. /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/img
    • -0
    • +89
    /ssts-web/src/main/resources/spring/projects/zsxlrmyy/applicationContext-his-gzfdzl.xml
    • -0
    • +55
    /ssts-web/src/main/resources/spring/projects/zsxlrmyy/timer.xml
    • -0
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
  9. /ssts-web/src/main/resources/spring/projects/zsxlrmyy
    • -0
    • +22
    /ssts-web/src/main/resources/config/zsxlrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +22
    /ssts-web/src/main/resources/config/zsxlrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/img/logo.jpg
    • -0
    • +28
    /ssts-web/src/main/resources/config/zsxlrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
  14. /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print
  15. /ssts-web/src/main/resources/config/zsxlrmyy/mybatis
Tuesday 10 May 2016
6:14 下午

adairkang

自定义器械包没有看到装配任务的问题
Options
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
5:10 下午

wangyi

导入导出基础数据增加材料分类类型
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • -6
    • +7
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
3:45 下午

wangyi

二级供应室回收科室处理
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:13 下午

jeffli

优化功能：

调整发货界面表单左边列文本的宽度，让文本不换行。

Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:11 下午

wangyi

还物单设置处理科室
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:02 下午

jeffli

优化功能：

器械包退货，去掉包围库存处理方法的try-catch

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
3:02 下午

jeffli

优化功能：

器械包退货，去掉包围库存处理方法的try-catch

Options
    • -14
    • +4
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
2:53 下午

adairkang

pda从服务器加载灭菌目的

加载灭菌程序的同时，加载灭菌程序的默认灭菌目的

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:38 下午

wangyi

修复申请单干预修改数量后变成NaN
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js
2:23 下午

wangyi

触摸屏功能按包名称查询改成按id查询
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -54
    • +41
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -2
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -6
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -3
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
11:36 上午

jeffli

解决bug：

盘点记录查看时，只能查看到默认仓库的

Options
    • -3
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java
11:16 上午

jeffli

4.0升级4.1脚本更新。
Options
    • -1
    • +11
    /ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/配置一级供应室的器械包及服务临床脚本_oracle.sql
    • -0
    • +14
    /ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/配置一级供应室的器械包及服务临床脚本_sqlserver.sql
11:08 上午

jeffli

解决bug：

一个供应室有多个仓库时，其他仓库添加的盘点记录无法看到。

Options
    • -4
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/dwr/table/InventoryRecordTableManager.java
    • -8
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
Monday 09 May 2016
11:20 下午

adairkang

外来器械包申请单处理科室为科室供应室设置里设置的外来器械包处理科室

自定义器械包可选择一级供应室或者二级供应室为处理科室

代理灭菌单和外部代理灭菌单的处理科室为当前登录用户的科室，并且列表按处理科室过滤

Options
    • -1
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -1
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/dwr/table/ProxyDisinfectionTableManager.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -1
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • -0
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
9:25 下午

jeffli

解决bug：

一次性物品盘点，盘亏，把一个账面非0数，改为0，提示库存不足

Options
    • -21
    • +47
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
8:56 下午

wangyi

触摸屏回收根据器械包id查询器械包信息
Options
    • -10
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -6
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -1
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -4
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
7:16 下午

shuyongfu

供应室领用功能修复
Options
    • -8
    • +8
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
7:11 下午

wangyi

材料定义非空验证
Options
    • -2
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
7:00 下午

wangyi

申请单干预功能
Options
    • -25
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • -1
    • +48
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +77
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +532
    /ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js
    • -0
    • +257
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
6:41 下午

adairkang

一次性物品导入格式
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/diposable.xls
6:40 下午

adairkang

标签材料添加规格
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js