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

Thursday 08 Jun 2017
11:53 上午

jeffli

解决：ZSYY-74

PC上手术预约发货功能改进

Options
    • ?
    /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/operationreservation/OperationReservation.java
10:40 上午

jeffli

解决：ZSYY-74

PC上手术预约发货功能改进

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.js
10:40 上午

jeffli

解决：ZSYY-74

PC上手术预约发货功能改进

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationreservation/model/OperationReservationInvoiceGoodsDetail.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/OperationReservationInvoiceGoodsDetail.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
9:54 上午

adairkang

删除selenium测试用例的项目编译脚本，不然会报目录不存在
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
9:52 上午

zhonghaowen

修复申请单打开报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
Wednesday 07 Jun 2017
6:02 下午

shuyongfu

解决添加灭菌记录扫描首尾篮筐后,提示结果不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
4:30 下午

adairkang

删除没有用的属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
3:45 下午

adairkang

检索仓库和手术间的代码重构
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
3:42 下午

zengjc

1.添加多个包和材料时，点‘添加抽检器械’添加的材料不受包里面包含材料的限制。

2.回收添加质量监测界面的‘保存’和‘取消’按钮，文字居中。

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
1:54 下午

adairkang

外来器械添加材料界面重置按钮没有文字的问题及窗口内容居中显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp
11:33 上午

adairkang

选择手术间的重置按钮文字
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp
11:27 上午

zengjc

修复回收添加质量监测，监测项选为是否入框时，在清洗篮筐扫描条码没反应的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
11:14 上午

shuyongfu

解决添加灭菌记录扫描首尾篮筐后,已扫器械包列表里的科室列的值不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
9:52 上午

shuyongfu

该工程的代码已经迁移到ssts_web工程下,所以进行删除
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test
Tuesday 06 Jun 2017
9:01 下午

terrykwan

删除掉ssts-selenium-test项目中的测试代码，因为该代码迁移到了ssts-web项目中
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test_4_1
  2. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1
  3. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test
8:11 下午

adairkang

手术仪器管理记录的备注字段类型修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.8.3_4.8.4_oracle.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.8.3_4.8.4_sqlserver.sql
6:56 下午

zengjc

解决jira问题DGZYY-92，回收清点界面增加添加质量监测功能，目前只有东莞中医院进行配置，配置项为:recycleAddQualityMonitoring
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.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/touchScreen/recycle/1980/images/addQualityMonitoring.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/includeExtJsAndCssSize17.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/includeCoreExtJsAndCssSize17.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/addQualityMonitoringHovert.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:55 下午

zhonghaowen

修复科室申领某些同名的一次性物品不能添加和添加后显示不正常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:38 下午

adairkang

手术仪器管理窗口标题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js
4:22 下午

adairkang

手术仪器管理的签收功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/TousseOperationVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/position/TousseOperation.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
2:26 下午

shuyongfu

删除没有调用且存在风险的方法及调用代码、优化效率低的方法代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/service/LogManager.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/message
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/message/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/message/service/SystemMessageManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/problemreportmanager
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/problemreportmanager/problemreport
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/problemreportmanager/problemreport/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/problemreportmanager/problemreport/service/ProblemManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/message/service/SystemMessageManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/problemreportmanager/problemreport/service/ProblemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
1:50 下午

zhonghaowen

解决GDSRMYY-324:科室申领界面中用鼠标指着‘一次性物品申领单’显示弹出框显示的数量单位为申领单位
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
1:35 下午

shuyongfu

省医的几个配置项还原至之前的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
11:12 上午

zhonghaowen

GDSRMYY-326:修复一次性物品某些价格显示不对
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
10:42 上午

chenjiaru

解决jira问题：SSTS-115 消毒供应质量追溯管理系统的各个菜单模块的开放限制做成有配置项进行自行配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portal.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/operationFormByExt.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
  16. … 8 more files in changeset.
Monday 05 Jun 2017
6:48 下午

adairkang

HDQRMYY-32 装配时打印标签，使用标签类型【加大标签】时无法打印材料中的一次性物品到标签纸上
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js
5:43 下午

zhonghaowen

GDSRMYY-326:修复查看申请数量不正确
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/vo/ApplicationItemVO.java
5:27 下午

zhonghaowen

GDSRMYY-326:修复申请数量大于库存数量时，添加的物品后合计金额没显示出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:22 下午

adairkang

PDA添加对模块白名单的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:54 下午

jeffli

解决bug：

获取上一个包实例的查询sql和代码问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java