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
Friday 25 Nov 2016
11:17 上午

zhonghaowen

1.科室申领的申请科室下拉框改成分页显示

2.科室申领申请物品添加页面校验重复功能

Options
    • -3
    • +7
    /ssts-web/src/main/webapp/js/Ext4CompUtil.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -23
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
  5. /forgon-tools/src/main/java/com/forgon/entity
    • -0
    • +78
    /forgon-tools/src/main/java/com/forgon/tools/util/PageUtil.java
    • -0
    • +80
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js
    • -0
    • +75
    /forgon-tools/src/main/java/com/forgon/entity/PageEntity.java
11:15 上午

zhonghaowen

科室申领一次性物品如果配置了申领规格，则名字显示成名字[申领规格]
Options
    • -6
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
10:35 上午

jeffli

退货增加单位，修改提示文字
Options
    • -5
    • +16
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsItemVO.java
    • -3
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
10:09 上午

chenjiaru

解决：DGZYY-35 外来器械供应商长期存放供应室备用包的生物监测
Options
    • -1
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java
    • 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/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:51 上午

adairkang

一次性物品申请单和发货单打印申领规格
Options
    • -0
    • +7
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoicePrintVo.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Thursday 24 Nov 2016
6:57 下午

zengjc

一次性物品导入导出添加‘申领规格’，申领规格、申领单位、申领单位转换系数，要么同时为空，要么全部都有值.
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
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