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 21 Sep 2016
11:10 上午

wangyi

报损去掉recyclingDamageRecord表
Options
    • -5
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +11
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.6_4.3.7.sql
    • -11
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.js
    • -6
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -1
    • +69
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/recyclingRecordView.jsp
    • -44
    • +0
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
    • -1
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • -2
    • +0
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -10
    • +0
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingItemVo.java
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageRecord.java
    • -76
    • +41
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js
  16. … 26 more files in changeset.
11:07 上午

zhonghaowen

解决SSTS-70:借物管理，申请多个物品，部分发货后，归还一部分发货的物品，再发货，无法再次归还
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Tuesday 20 Sep 2016
5:42 下午

adairkang

东华医院外部代理灭菌小标签和普通器械包小标签的打印
Options
    • -13
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
5:17 下午

shuyongfu

解决灭菌装载扫灭菌筐后篮筐物品明细未显示出来的问题
Options
    • -15
    • +7
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
4:40 下午

zengjc

质量监测和定期监测，监测类型为器械包时，可以输入数量.
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
4:39 下午

jeffli

根据打印模板生成打印函数

普通器械包打印时，优先根据模板打印

Options
    • -19
    • +76
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -1
    • +5
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
    • -17
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • -0
    • +53
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
    • -1
    • +26
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
    • -8
    • +42
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.js
4:38 下午

adairkang

代码重构,统一一次性物品和器械包的浮动价格的计算
Options
    • -4
    • +0
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • -3
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -8
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
    • -6
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -9
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -36
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
  16. … 13 more files in changeset.
12:08 下午

zengjc

解决打开定期监测项配置，标题显示‘质量监测’的问题.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.js
10:30 上午

zhonghaowen

修复中包装单位装换单位系数校验
Options
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
9:57 上午

adairkang

print函数打印页脚时,pre标签内容自动换行。备注信息太长的时候，需要换行，不然会把表格顶出
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
9:23 上午

jeffli

保存设计器代码到数据库

根据保存的程序代码初始化设计器界面

设计器界面的控件改为ext4

Options
    • -0
    • +8
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
    • -0
    • +99
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • -134
    • +237
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -1
    • +2
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
    • -0
    • +13
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
Monday 19 Sep 2016
6:46 下午

shuyongfu

解决中大五院回收保存时报undefined错误
Options
    • -34
    • +36
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:20 下午

shuyongfu

灭菌装载的提示信息调整
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
4:59 下午

shuyongfu

解决省医jira问题:

GDSRMYY-149 灭菌装载界面中使用篮筐状态为"灭菌"能继续装载器械包(BUG)

GDSRMYY-150 灭菌装载界面增加刷新按钮

GDSRMYY-152 灭菌装载使用的灭菌篮筐筐内如果有器械包未发货,弹出提示框(改进)

Options
    • -22
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -1
    • +33
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
4:49 下午

zhonghaowen

解决PYQZYY-84:器械包库存页面增加“设置统计的器械包品名” 按钮 ，类似于器械包工作量统计报表的那个按钮。
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java
    • -1
    • +18
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -3
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
    • -3
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
4:15 下午

jeffli

打开标签设计器界面时自动关联模板

用模板的宽和高初始化设计器界面大小

Options
    • -2
    • +102
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
    • -28
    • +25
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • -0
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.js
2:14 下午

zhonghaowen

桌面物品签收更改图标和权限
Options
    • -1
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
2:09 下午

shuyongfu

增加物品签收模块的个人桌面图标
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/tabs_invoiceSign.png
1:55 下午

zhonghaowen

个人桌面新增物品签收图标
Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
1:53 下午

shuyongfu

解决未配置科室的用户登录时报错的紧急处理,调用方法前未变量判空引起
Options
    • -2
    • +1
    /ssts-web/src/main/webapp/openSystemMainPage.jsp
11:53 上午

cherry

更新PDA版本
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.32_20160918.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.30_20160912.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:48 上午

shuyongfu

解决未配置科室的用户登录时报错的紧急处理
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/openSystemMainPage.jsp
9:33 上午

jeffli

优化科室供应室配置保存时，页面提交的速度
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
12:26 上午

terrykwan

增加保存模板和恢复模板的样例语句
Options
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/LodopFuncs.js
Sunday 18 Sep 2016
10:22 下午

chenjiaru

改善：PYQZYY-59 人员所属科室绑定电脑物理地址。或者当用户所属多个科室时每次登录默认弹出切换科室选项
Options
    • -2
    • +5
    /ssts-web/src/main/webapp/openSystemMainPage.jsp
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManager.java
    • -7
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManagerImpl.java
6:45 下午

terrykwan

提交标签模板自定义设计的初步代码
Options
    • -0
    • +94
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.js
    • -0
    • +88
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java
    • -0
    • +65
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • -0
    • +218
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
    • -0
    • +16
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
    • -0
    • +3
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +24
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  8. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
  10. /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/dwr
  11. /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action
  12. /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/dwr/table
    • -0
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
  14. /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign
    • -0
    • +100
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
  16. … 7 more files in changeset.
4:56 下午

wangyi

材料定义form表单样式修改
Options
    • -56
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
4:41 下午

shuyongfu

解决中山中医院住院病人接口取不到连接的问题,连接字符串改成与中山眼科的path库连接url类似,带上用户名和密码
Options
    • -1
    • +2
    /ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his.xml
4:40 下午

adairkang

代理灭菌单干预管理
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -4
    • +29
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -0
    • +987
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereProxyDisinfectionView.js
    • -1
    • +18
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereProxyDisinfectionView.jsp
    • -0
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
    • -2
    • +142
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • -0
    • +44
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
4:38 下午

jeffli

优化科室供应室配置序号设置方式，在页面上计算序号，后台保存时不需要每次查找最大序号

优化科室供应室配置，参数改为json格式

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
    • -64
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -8
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -63
    • +58
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java