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 17827 is being indexed.

Tuesday 18 Apr 2017
6:26 下午

chenjiaru

解决jira问题：ZSSZYY-102 发货单Item对应的器械包实例为空bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
6:24 下午

cherry

优化代码

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
6:23 下午

cherry

优化代码 增加等待页面加载
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Apply.java
6:13 下午

jeffli

解决：ZSYY-61

自定义装配的标识牌名称字符长度需要加大否则无法打印标签

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
5:43 下午

wangyi

修复删除清洗记录时，如果篮筐实例并非最新的篮筐实例，这个时候不能回滚篮筐状态
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
5:37 下午

shuyongfu

测试用例性能优化调整:测试用例的基础数据初始化插入由容器启动时调用一次不需要每个测试方法运行都全删除然后再插入、每运行一个测试用例方法仅删除业务数据表的数据,不删除基础数据

清洗机与清洗程序、灭菌炉与灭菌程序的中间表基础数据不能删除

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
5:33 下午

adairkang

修改注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManager.java
4:34 下午

zengjc

解决jira问题DGDHYY-104，质量监测、定期监测项定义添加排序号，用户可以定义监测项的排序.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java
4:33 下午

shuyongfu

解决jira问题:CDSLQYQYYY-6 使用记录改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
3:59 下午

shuyongfu

测试用例性能优化调整:测试用例的基础数据初始化插入由容器启动时调用一次不需要每个测试方法运行都全删除然后再插入、每运行一个测试用例方法仅删除业务数据表的数据,不删除基础数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/AllTests.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml
3:57 下午

shuyongfu

测试用例性能优化调整:测试用例的基础数据初始化插入由容器启动时调用一次不需要每个测试方法运行都全删除然后再插入、每运行一个测试用例方法仅删除业务数据表的数据,不删除基础数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/test/applicationContext-test.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
  16. … 12 more files in changeset.
2:52 下午

wangyi

完成：DGDHYY-18，清洗完成后支持可以删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
2:49 下午

wangyi

一次性物品盘点js页面提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
12:41 下午

adairkang

申请单中TousseItem未设置包定义id导致空指针异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
12:33 下午

adairkang

申请单中TousseItem未设置包定义id导致空指针异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java
11:27 上午

wangyi

完成：DGDHYY-103。一次性物品增加是否盘点属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
10:58 上午

chenjiaru

修正注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
10:57 上午

chenjiaru

修正注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
10:42 上午

adairkang

申请单中TousseItem未设置包定义id导致空指针异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java
Monday 17 Apr 2017
8:21 下午

zengjc

解决jira问题GDSRMYY-307，‘质量监测’、‘定期监测’重新装配生成的包，把该包条码记录到监测记录和废弃的包的器械包信息里面.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
4:49 下午

zhonghaowen

回滚all.java
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
3:37 下午

adairkang

回收重新设置申请项价格的时候，判断是否是一次性物品，如果是，那就跳过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:27 下午

adairkang

回收重新设置tousseItem的价格，在打印的时候，取包数量与tousseItem单价和乘积为小计价格
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:20 下午

chenjiaru

解决jira问题：ZSYY-51 灭菌卸载会修改当前器械包其他包状态 比如“已废弃”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:48 下午

zengjc

解决jira问题ZSSXLRMYY-128，修复灭菌页面添加质量检测，抽检器械下拉列表显示不了完整名称的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
1:05 下午

adairkang

消毒物品回收修改材料数量后，tousseItem的单价也跟着修改。在打印的时候，根据单价与数量算出总价
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
11:43 上午

chenjiaru

解决jira问题：ZSSXLRMYY-129 清洗消毒列表的鼠标悬停显示明细需要增加配置项。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
11:07 上午

chenjiaru

解决jira问题：ZSYY-47 灭菌管理任务界面增加灭菌开始时间筛选灭菌记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
10:05 上午

zengjc

调整清洗区工作量不合格率月报清洗总数的列顺序.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:42 上午

jeffli

解决：ZSWY-70

发货计划:点击打开中心手术室，右边的待发货物品加载时间很长

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java