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

Saturday 15 Apr 2017
10:14 上午

adairkang

保存器械交接申请单的接口定义
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
10:11 上午

adairkang

器械交接申请单PO类及对应的Manager方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlan.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManager.java
Friday 14 Apr 2017
6:49 下午

chenjiaru

解决jira问题：ZSYY-47 灭菌管理任务界面增加灭菌开始时间筛选灭菌记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
6:48 下午

zhonghaowen

selenium科室申领相关代码提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/ApplyTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/bo/ApplyGoodBo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
6:31 下午

shuyongfu

对po类中已经删除的字段,对应的索引配置也删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
6:10 下午

zhonghaowen

selenium科室申领相关代码提交
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/bo
  2. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/helper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants/ApplyEnum.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/bo/ApplyGoodBo.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/ApplyTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
  11. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants
  12. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
  16. … 5 more files in changeset.
3:54 下午

chenjiaru

补：删除科室的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
3:13 下午

jeffli

解决：GDSRMYY-277

退货记录信息中的‘退货人科室’改为‘退货科室’

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
2:55 下午

adairkang

核算月报对消毒物品的数量的计算，整包取包数量，拆包取材料数量

回收及预回收保存，消毒物品的价格计算

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.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-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:52 下午

chenjiaru

完善测试用例的基础数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java
12:00 下午

shuyongfu

解决jira问题:GDSRMYY-304 召回信息中导出的表格与器械包召回的包不符

保存前的搜索结果与保存后记录导出分开处理

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java
10:33 上午

jeffli

解决：ZSYY-50

加急物品打印的标签增加标识符号

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
10:33 上午

jeffli

解决：ZSYY-50

加急物品打印的标签增加标识符号

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • ?
    /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/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
Thursday 13 Apr 2017
11:07 下午

chenjiaru

解决jira问题：ZSYY-47 灭菌管理任务界面增加灭菌开始时间筛选灭菌记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
5:39 下午

adairkang

拆包的消毒物品，价格不对的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:39 下午

wangyi

回收测试用例优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/ALL.java
4:37 下午

chenjiaru

补：修改科室的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
3:06 下午

jeffli

解决退货测试用例通不过问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ApplicationSpecificationHelper.java
2:21 下午

shuyongfu

解决jira问题:GDSRMYY-304 召回信息中导出的表格与器械包召回的包不符

召回项的科室及统计数量调整为不统计状态为已使用或已废弃的包及聚合包内的包实例

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
2:19 下午

cherry

去掉不需要的数据 以免有误解
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/zjyy
  2. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/zsykzx
  3. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gxzyyf1
  4. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dgszyy
  5. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dysyy
  6. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dgjszx
  7. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/hdqrmyy
  8. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/sznsfy
  9. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/zsly
  10. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/dgsdhyy
  11. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gzzyyfs
  12. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gzspyqzyy
  13. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/gd2zyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
  15. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1/config/jmrmyy
  16. … 9 more files in changeset.
11:09 上午

jeffli

如果不是供应室用户，隐藏申请单退货按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
9:36 上午

jeffli

普通退货和申请单退货增加申领规格的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.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/entity/assestmanagement/ApplicationSpecificationHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
Wednesday 12 Apr 2017
7:21 下午

wangyi

回收测试用例优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Recyle.java
7:10 下午

adairkang

成都龙泉医院包定义配置了不打印科室，但是却打出了科室的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
7:06 下午

shuyongfu

小黎发回来的现场配置,广东省医增加申领物品显示一次性物品外部编码的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
7:02 下午

shuyongfu

陈国强发回来的现场配置,中大附一增加加急功能配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
7:02 下午

adairkang

ZSSZYY-99 一次性物品发货单、一次性物品入库单格式修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
6:35 下午

wangyi

回收测试用例修复
Options
    • ?
    /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/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
5:22 下午

shuyongfu

解决二级供应室的使用记录转申请单的测试用例不通过的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
5:03 下午

zhonghaowen

修复oracle下科室申领测试用例不通过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisposableGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestTousseRecyclingApplication.java