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
Saturday 26 Nov 2016
3:04 下午

zhonghaowen

1.解决SSTS-78:xp ie6 只能访问内网的情况下 登陆后加载首页很慢，进入页面也很慢

2.解决GDSRMYY-210:申请单填写页面的申请科室输入框要等待10秒左右才能聚焦

Options
  1. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo
    • -0
    • +66
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/GoodBindHelper.java
    • -0
    • +70
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java
    • -2
    • +24
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -1
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/util/PageUtil.java
    • -42
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java
    • -0
    • +25
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/ctrl/GoodsBindingCtrl.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/service/GoodsBindSrv.java
    • -6
    • +68
    /ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js
2:28 下午

chenguina

PDA版本更新 灭菌任务添加灭菌炉分组
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.8_20161124.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.10_20161126.apk
12:27 下午

zengjc

添加是否责任环节带出监测项配置，目前只有中山市中医院配置，解决jira问题JMSRMYY-24.
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • -67
    • +102
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
12:24 下午

shuyongfu

灭菌装载扫描包实例条码的重复判断往后调,放到这行数据要添加到grid的那行代码之前
Options
    • -14
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
12:04 下午

adairkang

灭菌炉分组不使用id进行数据交换，只能使用名称(因为每次修改数据都是先删除再添加)
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
11:56 上午

jeffli

外部代理灭菌单不能同时打印多个科室的申请单的问题

江门市人民医院JMSRMYY-14

Options
    • -12
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
11:44 上午

shuyongfu

灭菌装载快速扫描漏掉包实例的问题修复
Options
    • -30
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
11:06 上午

zengjc

完善申领规格，申领单位，申领单位转换系数的校验.
Options
    • -4
    • +10
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -10
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
Friday 25 Nov 2016
5:26 下午

zengjc

1.规格跟申领规格相同，提示是否保存.

2.校验申领规格、申领单位、申领单位转换系数,只能同时为空或者同时有值.

3.申领单位转换系数如果有值，要大于0.

Options
    • -6
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
4:19 下午

jeffli

解决bug：

发货后，待发申领数量还是未发货之前的

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:11 下午

zengjc

导出整形数据时，如果字段为空，不默认为0.
Options
    • -2
    • +6
    /forgon-tools/src/main/java/com/forgon/tools/excel/ExcelHelper.java
4:10 下午

jeffli

消毒物品标签去掉失效日期行

中山五院ZSWY-53

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
4:06 下午

adairkang

灭菌炉分组过滤(HZSRMYY-2）
Options
    • -0
    • +9
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -6
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +9
    /forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java
3:44 下午

jeffli

解决bug：

发货界面，库存显示为空

Options
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:03 下午

jeffli

一次性物品库存页面，一次性物品信息页面需要增加打印批次按钮。

中山市小榄人民医院ZSSXLRMYY-95

Options
    • -16
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
2:53 下午

shuyongfu

东莞中医院接口文件少了一个逗号,现补上
Options
    • -1
    • +1
    /ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
2:43 下午

wangyi

装配界面增加申请科室字段
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:15 下午

shuyongfu

省医接口调整:物资数据入库至供应室后增加生产厂家字段属性
Options
    • -8
    • +10
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java
    • -4
    • +4
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java
11:50 上午

zhonghaowen

科室申领帮助类修改校验方法
Options
    • -13
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js
11:41 上午

zhonghaowen

修改科室申领帮助类
Options
    • -18
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js
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