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
Thursday 24 Nov 2016
6:46 下午

jeffli

新增申领规格属性
Options
    • -1
    • +1
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +10
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/DisposableGoodsUtils.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
    • -2
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -3
    • +3
    /ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/settlement/service/SettlementWriteBackManagerImplForGYEY.java
    • -3
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
6:20 下午

chenguina

PDA更新版本
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.6_20161123.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.8_20161124.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
6:03 下午

zengjc

清洗记录列表，添加显示'今天'还是'全部'记录的过滤,添加配置清洗记录列表是否默认显示当天的，目前只有惠州中心人民医院配置，解决jira问题HZSRMYY-3.
Options
    • -2
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • -1
    • +32
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
5:38 下午

zengjc

修改注释.
Options
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
4:43 下午

jeffli

解决PDA扫描发货物品报错问题
Options
    • -2
    • +11
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
4:21 下午

jeffli

解决扫描固定条码报错问题
Options
    • -9
    • +10
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
3:52 下午

jeffli

解决扫描固定条码报错问题
Options
    • -14
    • +5
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
3:36 下午

chenjiaru

修改了发货管理的UI
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
3:27 下午

chenjiaru

修改了发货管理的UI
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
3:16 下午

chenjiaru

修改了发货管理的UI
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
3:04 下午

chenjiaru

解决：JMSRMYY-20 在发货管理页面，增加【打印时间】字段，放【打印】和【备注】的中间
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -4
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
2:52 下午

adairkang

一次性物品规格的打印数据
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:49 下午

adairkang

跟申请相关的数据验证及显示规格
Options
    • -0
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
11:51 上午

jeffli

重构一次性物品代码，增加申请规格属性的处理
Options
    • -1
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
11:38 上午

jeffli

解决发货扫描报错
Options
    • -2
    • +8
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
11:18 上午

jeffli

重构获取一次性物品名字方法，优先使用包装规格，包装规格为空时使用最小规格。
Options
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -3
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
10:05 上午

jeffli

一次性物品【能否科室申请】字段改为否后，无法做该物品的退货

江门市人民医院JMSRMYY-23

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
9:23 上午

jeffli

同名器械包发货问题

番禺区中医院PYQZYY-116

Options
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
Wednesday 23 Nov 2016
7:32 下午

adairkang

用户登录信息中添加是否一级供应室属性

webservice添加获取config.js的配置的接口

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
    • -0
    • +12
    /forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
5:27 下午

chenjiaru

修复了"使用记录录入统计报表"合计数量有误的问题
Options
    • -14
    • +14
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalView.jasper
5:00 下午

adairkang

一次性物品发货计划打印列宽调整
Options
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
4:59 下午

adairkang

自定义装配选择科室(DGZYY-34)
Options
    • -0
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
    • -0
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -27
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
4:56 下午

jeffli

外部代理灭菌单发货扫描物品不是对应单上的，给出提示

东莞东华医院DGDHYY-85

Options
    • -1
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • -0
    • +7
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:17 下午

chenjiaru

解决：JMSRMYY-21 在器械包定义里，增加器械包的几个属性字段显示
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
3:11 下午

cherry

更新PDA版本 PDA支持清洗交接
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.4_20161115.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.6_20161123.apk
11:43 上午

zengjc

解决ie6下登录页logo变灰的问题.
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/logon.jsp
11:25 上午

zhonghaowen

江门市人民医院,一次性物品管理->入库单管理增加校验生产厂家
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
10:23 上午

zengjc

修正科室申领界面显示不了器械包图片的问题.
Options
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
9:55 上午

shuyongfu

解决jira问题:

SSTS-79 消毒物品A改名成消毒物品B，再改名成A，再另存为B，发货时扫描B的固定条码显示的是A的包，提交无法发货

以及与消毒物品有关的固定条码问题

Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -1
    • +36
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -5
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
9:37 上午

chenjiaru

"使用记录人员汇总报表" 报表名称写错了
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js