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
Tuesday 04 Sep 2018
9:45 下午

adairkang

监测项为无就不过滤
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
8:51 下午

adairkang

PDA版质量监测，灭菌和质量检测列表添加分布显示的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/servlet/UploadServlet.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
8:08 下午

terrykwan

增加try catch方法，捕获异常信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
8:04 下午

terrykwan

在Class上增加@Component的注解，解决TestNG运行时它的objectDao属性为null的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:10 下午

shuyongfu

解决Jira问题:ZSSXLRMYY-164 装配页面增加返回器械包图片按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:54 下午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
3:43 下午

jeffli

广州中医药大学第一附属医院GZZYYFY-11

外来器械标签模板补充字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
2:25 下午

shuyongfu

装配生成包实例(装配任务装配、外来器械装配、聚合包装配、外部代理灭菌装配、干预修改灭菌记录等)时根据灭菌程序设置灭菌方式的性能优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:25 下午

jeffli

广州中医药大学第一附属医院GZZYYFY-11

外来器械标签模板补充字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
11:19 上午

adairkang

牟立婷修改的调拨单打印，增大字体并删除了两列内容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/print/printConfig.js
11:05 上午

yanweining

更新新疆军区总医院现场接口文件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml
10:18 上午

jeffli

广州中医药大学第一附属医院GZZYYFY-11

外来器械标签模板补充字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
Monday 03 Sep 2018
4:49 下午

simon.bai

SSTS-Rebuild:基础目录结构搭建、公共文件上传
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/test/libs/bootstrap222/img
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/src/inputs/datetime/bootstrap-datetimepicker/css/datetimepicker.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/js/bootstrap-transition.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/less-ie6/responsive-768px-979px.less
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/less/pager.less
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/.gitignore
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/test/libs/bootstrap221/js/bootstrap.min.js
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/test/unit
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/test/libs/poshytip/tip-yellowsimple/tip-yellowsimple_arrows.gif
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/test/jquery-1.7.1/unit/traversing.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/js/tests/unit/bootstrap-carousel.js
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/src/inputs/select2/lib/select2x2.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/Respond-master/test/unit/test-with-comment.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select/dist/js/i18n/defaults-ro_RO.js
  16. … 871 more files in changeset.
4:30 下午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:15 下午

yanweining

JMSZXYY-73：所有材料库存盘点为0后,导出的报表里的材料数量为未盘点前
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
3:42 下午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:40 上午

shuyongfu

解决Jira问题:SZNSRMYY-14 录使用记录-关联的病区名字录不进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
11:04 上午

shuyongfu

巫劲锋8月31日发回来的东莞附幼稚保健医院现场config.is配置文件.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js
11:01 上午

shuyongfu

罗乐8月31日发回来的中山小榄人民医院现场config.is配置文件.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
10:56 上午

shuyongfu

李伟8月23日发回来的贵港市人民医院现场config.is与printConfig.js配置文件.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/print/printConfig.js
Saturday 01 Sep 2018
7:26 下午

terrykwan

解决默认值为null，导致测试用例判断大小时报空指针的错误问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
5:50 下午

jeffli

测试用例不启用乐观锁
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
5:49 下午

terrykwan

测试用例运行时，暂时修改为不进行乐观锁的判断
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
12:44 上午

terrykwan

解决测试用例通不过的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/tools/date/DateToolsTests.java
Friday 31 Aug 2018
9:52 下午

terrykwan

改为调用logger类输出日志
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
5:28 下午

shuyongfu

解决审核不能通过的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
3:16 下午

adairkang

质量监测的Manager重构
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringWithNoLogonAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
2:28 下午

jeffli

索引改名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstanceUseRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
1:34 下午

terrykwan

修复外来器械处理科室的编码和名称弄反的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
12:48 下午

adairkang

打开待签收列表，由于id过多导致oracle数据库异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java