forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
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
Wednesday 11 Oct 2017
5:05 下午

shuyongfu

解决jira问题:FSFY-5 手术间使用记录转申请单的功能优化（合并申请单成一张大单）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
4:41 下午

shuyongfu

解决jira问题:FSFY-5 手术间使用记录转申请单的功能优化（合并申请单成一张大单）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
4:20 下午

shuyongfu

解决jira问题:FSFY-5 手术间使用记录转申请单的功能优化（合并申请单成一张大单）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
3:53 下午

shuyongfu

解决jira问题:FSFY-5 手术间使用记录转申请单的功能优化（合并申请单成一张大单）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordMergeConvert.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
1:32 下午

yanweining

GDSRMYY-388：一次性物品规格问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
11:57 上午

chenjiaru

增加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/disposablegoods/service/DisposableGoodsServiceContext.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Tuesday 10 Oct 2017
6:19 下午

cherry

增加江门市中心医院的配置和更新版本号
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/jmszxyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/jmszxyy/HIS.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/print/printConfig.js
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/jmszxyy/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/jmszxyy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/jmszxyy/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/jmszxyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/jmszxyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/jmszxyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/jmszxyy
6:11 下午

cherry

1.优化材料发货

2.增加定期监测场景

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Regular_Monitor.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
3:14 下午

shuyongfu

库存对比功能的语句调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
2:24 下午

chenjiaru

修复借物单添加空的物品报错的bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
2:24 下午

yanweining

GZFDZL-108:一次性物品盘点管理导出的表格里也要有失效日期。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java
10:49 上午

shuyongfu

省医物资接口地址调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/helper/WebServiceClientHelper.java
10:47 上午

shuyongfu

省医物资推送入库出现异常时,增加日志信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java
10:45 上午

shuyongfu

解决jira问题:ZJYY-6 制作webservice登陆认证接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/zjyy/WebServiceClientHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/zjyy/SSOAuthenticationServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/HisWebService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/GetUserListResponseGetUserListResult.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/GetUserList.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/HisWebServiceSoapStub.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/HisWebServiceSoapProxy.java
  8. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/HisWebServiceSoap.java
  10. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/HisUserLoginResponseHisUserLoginResult.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/HisWebServiceLocator.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/org/tempuri/GetUserListResponse.java
10:43 上午

shuyongfu

增加从xml里获取某个tag标签的方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
10:40 上午

shuyongfu

广东省医一次性物品发货回写相同sourceId与batchId的物资数量合并
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java
10:19 上午

yanweining

GZFDZL-110:一次性物品入库单修改了失效期，但再查看失效期比实际改后的失效期小一天解决
Options
    • ?
    /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/interfere/godownEntryView.js
Monday 09 Oct 2017
6:08 下午

cherry

1.代码优化

2.增加材料发货、退货、退库的场景

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials_Godown_Entry.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
4:46 下午

shuyongfu

解决jira问题:ZJYY-6 制作webservice登陆认证接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/zjyy/SSOAuthenticationServiceImpl.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zjyy/sso.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logon.jsp
  7. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/zjyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-standard.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web.xml
4:11 下午

shuyongfu

日志管理的模块查询下拉框增加"物资同步"选项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/log/loggrid.js
4:04 下午

shuyongfu

解决省医发货回号的多个发货单号合并的文本太长导致回写失败的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:06 下午

yanweining

解决一次性物品入库管理：添加入库单时修改失效日期会减少一天的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
3:02 下午

chenjiaru

解决jira问题：ZSSXLRMYY-146 设备维护与监测管理中的设备维护登记信息界面调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java
1:47 下午

yanweining

一次性物品入库单干预管理失效日期显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js
10:49 上午

jeffli

中山一院消毒供应项目ZSYY-160

装配记录内修改配包人后页面信息没有同步

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Saturday 30 Sep 2017
5:55 下午

yanweining

GZFDZL-110:一次性物品入库单修改了失效期，但再查看失效期比实际改后的失效期小一天
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js
5:30 下午

cherry

优化ie8领用功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
3:20 下午

cherry

自动化装配优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
2:09 下午

jeffli

解决bug：

自定义装配时修改了灭菌日期，重新打印时还是取装配日期

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
1:48 下午

shuyongfu

陈国强发回来的东莞中医院现场配置:禁用科室、人员同步功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js