forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 23779 is being indexed.

Thursday 19 Jul 2018
5:40 下午

niutou_ren

sqlserver数据库升级语句在每行末尾处加上分号
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.20_4.9.21_sqlserver.sql
1:47 下午

alan.lee

增加根据包条码 获取包的二次回收记录方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Wednesday 18 Jul 2018
8:17 下午

simon.bai

更新JR问题：GGSRMYY-35 科室申领配置增加默认结算科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
6:28 下午

alan.lee

去除多余的代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
5:25 下午

shuyongfu

处理Jira问题:GYEY-701 外来器械、外部代理灭菌实现多个供应室处理

科室供应室配置增加外来器械包处理的供应室及任务组(多个,json格式)字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
2:43 下午

simon.bai

更新JR问题：GGSRMYY-35 科室申领配置增加默认结算科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
10:59 上午

jeffli

解决bug：

中六申请消毒物品报错

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:52 上午

alan.lee

洁定灭菌炉代码优化，
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
10:00 上午

niutou_ren

根据供应商的renttousse类型，设置新增字段isManufacturer,isSupplier的属性值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.21_4.9.22.sql
10:00 上午

yanweining

复大肿瘤:一次性物品入库校验改造
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanFrom.js
Tuesday 17 Jul 2018
9:53 下午

shuyongfu

中山眼科中心科研项目下拉框增加下拉选项的宽度、解决打开申请单时科研项目名称赋值显示问题的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
9:51 下午

shuyongfu

解决Jira问题:SZSZYY-9 深圳市中医院增加单点登陆功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForSzszyy.jsp
9:47 下午

shuyongfu

解决Jira问题:SZSZYY-9 深圳市中医院增加单点登陆功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org/tempuri/CSSDServiceSoap.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org/tempuri/CSSDServiceSoapProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org/tempuri/CSSDServiceSoapStub.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org/tempuri/CSSDServiceLocator.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org/tempuri/CSSDService.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso/org/tempuri
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl/szszyy/DHC.Published.CSSDService.BS.CSSDService_SSO.wsdl
  9. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-szszyy-impl/src/main/java/sso
9:44 下午

shuyongfu

解决Jira问题:DGZYY-144 更新后器械清洗工作量及不合格率月报 外来器械包的工作没统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:59 下午

yanweining

高值耗材:实例页面修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstance/expensiveGoodsInstanceView.js
10:58 上午

jeffli

东莞中医院DGZYY-146

新增包定义，带有某些特殊符号不能保存，想把这个“/”这个特殊符号取消掉

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
10:44 上午

jeffli

东莞中医院DGZYY-146

新增包定义，带有某些特殊符号不能保存，想把这个“/”这个特殊符号取消掉

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
10:35 上午

terrykwan

提交.classpath文件，避免新同步下来的项目，类路径不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-expensivegoods/.classpath
10:24 上午

jeffli

重构代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/system/activity/service/ActivityAspect.java
9:52 上午

simon.bai

更新JR问题：GGSRMYY-35 科室申领配置增加默认结算科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
Monday 16 Jul 2018
8:49 下午

yanweining

GZSZYYGZHC-29：高值耗材实例列表功能增强
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstance/expensiveGoodsInstanceInfoTab.js
8:11 下午

jeffli

广东省人民医院GDSRMYY-450

申请单查询模块查看退货记录报错

优化申请单查看退货记录速度

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/controller/ReturnGoodsRecordController.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/controller
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/viewReturnGoodsRecord.js
8:11 下午

jeffli

广东省人民医院GDSRMYY-450

申请单查询模块查看退货记录报错

优化申请单查看退货记录速度

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/SpringUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/SpringResponseUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/RequestUtils.java
7:48 下午

adairkang

打印会修改TousseItem,需要锁定对象
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
6:20 下午

yanweining

GZSZYYGZHC-29:高值耗材实例列表功能增强
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstance/expensiveGoodsInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
4:22 下午

jeffli

广东省人民医院GDSRMYY-450

申请单查询模块查看退货记录报错

优化申请单查看退货记录速度

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
4:21 下午

jeffli

重构代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
3:40 下午

jeffli

重构代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
2:45 下午

jeffli

重构代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
2:40 下午

adairkang

KPSZXYY-5 装配后修改回收数量，发货计划单打印全部物品后仍显示部分打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java