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 16 Nov 2016
4:24 下午

jeffli

自定义标签模板文件改为英文名
Options
    • -0
    • +12
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -4
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/C420283489E07C19F96042E5C225E533
    • -0
    • +10
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/普通中标签
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/842546067B069765692FF6FF1D76834A
    • -0
    • +15
    /forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/DF36F57E8C46F51F799FDCDF6E71D311
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/7D6092E7E5F552331A5D8ED443E0BC0A
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/普通小标签
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外部代理灭菌小标签
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外来器械中标签
    • -1
    • +10
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
3:07 下午

adairkang

添加清洗交接模块权限
Options
    • -0
    • +5
    /ssts-web/src/main/resources/systemset/operationDefine.xml
2:53 下午

chenjiaru

解决：HDQRMYY-3 改进使用记录，无需录入住院号或诊疗号。
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js
2:44 下午

adairkang

清洗交接功能
Options
    • -0
    • +149
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
    • -0
    • +22
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionMaterialManager.java
    • -1
    • +2
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
  4. /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service
    • -0
    • +39
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionRecordManager.java
    • -0
    • +98
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/WashTransitionItem.java
  7. /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition
    • -0
    • +49
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManager.java
    • -2
    • +19
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -0
    • +99
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/WashTransitionRecord.java
    • -0
    • +114
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionRecordManagerImpl.java
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -0
    • +83
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionMaterialManagerImpl.java
    • -0
    • +47
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +9
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
  16. … 4 more files in changeset.
2:35 下午

jeffli

解决bug：

消毒物品没有标签配置时，装配那里无法打印

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
11:27 上午

wangyi

修复清洗装载的篮筐，添加清洗记录是提示该篮筐已装配不能扫描
Options
    • -0
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -18
    • +26
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
10:33 上午

jeffli

优化自定义标签，提示文字经改到右上角，放在中间会被控件挡住

江门市人民医院JMSRMYY-8

Options
    • -15
    • +75
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -0
    • +5
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +37
    /ssts-web/src/main/webapp/ext/example/examples.js
9:42 上午

jeffli

改进：

自定义标签，材料表格支持一行打印多个材料

Options
    • -9
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
    • -4
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
Tuesday 15 Nov 2016
6:49 下午

adairkang

清洗扫描添加日志记录
Options
    • -17
    • +42
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
6:12 下午

adairkang

OrgUnitAction日志添加客户端类型
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
6:10 下午

adairkang

logAction添加客户端类型
Options
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/log/service/LogManager.java
    • -1
    • +8
    /forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
6:09 下午

adairkang

logAction添加客户端类型
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/log/action/LogAction.java
5:56 下午

zengjc

一次性物品导入导出添加"申领单位","申领单位转换单位系数"属性，解决jira问题GDSRMYY-207.
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
5:45 下午

wangyi

回收、清洗扫描添加日志
Options
    • -1
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:17 下午

wangyi

1024*768下审核并打印标签按钮看不到
Options
    • -5
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
5:08 下午

zhonghaowen

科室申领遮罩层新增判断ie6和非ie6的处理方法
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:07 下午

chenjiaru

选了生物监测的开始时间，根据科室供应室配置的默认生物监测时间，自动把生物监测的结束时间填上
Options
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +29
    /ssts-web/src/main/webapp/ext/ext_datefield/Datetime.js
11:42 上午

wangyi

科室供应室配置加滚动条
Options
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:25 上午

wangyi

清洗器械入筐bug修复
Options
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -3
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
11:02 上午

wangyi

番禺中医院打印配置bug
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
Monday 14 Nov 2016
8:18 下午

chenjiaru

解决：SSTS-72 清洗登记时扫描非本科室人员条码提示信息的改进

清洗消毒、装配管理、审核打包、灭菌管理、发货计划，这几个都改了

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -14
    • +14
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/directory/service/SysUserManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -12
    • +12
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
6:59 下午

wangyi

修复清洗添加的材料未统计清洗工作量
Options
    • -2
    • +9
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
6:14 下午

wangyi

导出excelisMonthCheck报错
Options
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
6:12 下午

zhonghaowen

修复一次性申请单合并时,中包装单位,单位,中包装单位装换系数,中包装数量不准确问题
Options
    • -11
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:44 下午

jeffli

解决bug：

标签模板设计，删除表格后保存报错

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
5:18 下午

jeffli

解决bug：

点击同步表格到lodop设计窗口按钮后，会出现多个表格。

暂时屏蔽此按钮。已出现的表格要在设计器里面全部删除（左边列表选中表格，点删除所选项）

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
5:10 下午

wangyi

修复盘点js报错
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
4:23 下午

zhonghaowen

修复申请数量大于最大可申请数量会报错问题,漏提交js
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:07 下午

zhonghaowen

修复申请数量大于最大可申请数量会报错问题
Options
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
2:54 下午

wangyi

器械是否月盘点按供应室类型设置
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -3
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.4.3_4.4.4_sqlserver.sql
    • -8
    • +89
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -2
    • +20
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.4.3_4.4.4_oracle.sql
    • -4
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp