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

Tuesday 04 Apr 2017
6:13 下午

terrykwan

增加selenium-test项目
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/localrepo/org.seleniumhq.selenium/selenium-server-standalone/3.3.1/selenium-server-standalone-3.3.1.jar
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/zd5y/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/gyey/config.js
  4. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/zd5y
  5. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/gzspyqzyy
  6. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/jmrmyy
  7. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/zsszyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/hdqrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Gdsy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/One_use.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/all/settings.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Login.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/gzzyyfs/config.js
  15. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/config/hdqrmyy
  16. … 96 more files in changeset.
11:50 上午

terrykwan

优化代码逻辑，增加注释信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
9:46 上午

shuyongfu

解决基础数据导出测试用例通过不了的问题,是因为基础数据导入导出的几个表如httpOption、taskGroup、supplier等表每个测试用例运行都会初化一定数量的数据,但清除时并没有delete表的处理,现补上
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
9:24 上午

shuyongfu

解决基础数据导出测试用例通过不了的问题,是因为基础数据导入导出的几个表如httpOption、taskGroup、supplier等表每个测试用例运行都会初化一定数量的数据,但清除时并没有delete表的处理,现补上
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
1:07 上午

shuyongfu

解决基础数据导出测试用例通过不了的问题,是因为httpOption表每个测试用例运行都会初化6条数据,但清除时并没有delete httpOption表的处理,现补上
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
Saturday 01 Apr 2017
6:37 下午

shuyongfu

陈国强提供的中大附一现场config.js配置文件:自定义装配后是否保留灭菌日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
6:09 下午

shuyongfu

罗乐提供的广州第十二人民医院现场接口配置文件(已调通)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gzs12rmyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
5:44 下午

wangyi

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
5:18 下午

wangyi

修复批量加急只加急了一个包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
5:11 下午

wangyi

增加触摸屏回收扫描器械包条码包类型是否符合该回收单验证
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
3:54 下午

chenjiaru

解决jira问题：HDQRMYY-24 系统中所有报表的【时间】过滤，默认时间为00：00
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
3:22 下午

zengjc

修复jira问题:ZSYY-43.质量检测重新回收标准牌的包，生成的装配任务点击时，自动显示标识牌条码.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:43 下午

wangyi

修改：PYQZYY-149，停用的外来器械包在外来器械包管理里面不显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
2:38 下午

wangyi

完成：ZSSXLRMYY-98，器械包加急功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
2:24 下午

chenjiaru

解决jira问题：HDQRMYY-24 系统中所有报表的【时间】过滤，默认时间为00：00

并且把时间精度精确到天的时间控件的xtype属性从“datefieldWithMin”改成“datefield”

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/apparatusInfusionisTypeView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/borrowReportView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/recycleMaterialDetailView.js
  16. … 7 more files in changeset.
10:24 上午

chenguina

PDA版本更新至4.5.50
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.48_20170328.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.50_20170331.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:16 上午

jeffli

新增测试用例：

扫描固定条码的消毒物品

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerTests.java
Friday 31 Mar 2017
10:16 下午

chenjiaru

修复新增科室的测试用例在oracle通不过的缺陷
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
9:41 下午

chenjiaru

解决jira问题：HDQRMYY-25 器械包工作量报表，查询【牙科门诊下颌托盘一槽（25个）】时名称不全
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
8:38 下午

adairkang

修改局部变量名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java
6:18 下午

chenjiaru

解决jira问题：GDSRMYY-299 ‘器械消毒灭菌检查情况报表’增加灭菌目的查询项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/AllTests.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/directory/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSterilizationInspectSituation.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/service
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/directory
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/directory/service/AllTests.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/OrgUnitManagerTest.java
5:51 下午

wangyi

丢失、报损页面修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
4:52 下午

zengjc

规范设备接口处理写日志方式.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/model/Log.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
4:42 下午

cherry

增加省妇幼番禺分院项目配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sfypyfy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sfypyfy/config.js
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sfypyfy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sfypyfy/mybatis/SyncOrgUnitAndUserMapper.xml
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sfypyfy/mybatis
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sfypyfy
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/sfypyfy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sfypyfy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/sfypyfy/applicationContext-his.xml
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sfypyfy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sfypyfy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sfypyfy/dataSyncConfig.json
4:00 下午

zengjc

解决jira问题：ZSYY-43、SSTS-91,修复带标识牌的器械包在质量监测、定期监测重新装配后，产生的装配任务无法再装配的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
12:33 下午

chenjiaru

补上：添加科室时的测试用例
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/OrgUnitManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
12:29 下午

adairkang

ZSYY-41 PDA端使用记录提交后没有刷新列表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:41 上午

shuyongfu

科室干预功能完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ProcessSameOrgunitNameController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
11:39 上午

zhonghaowen

解决SSTS-110:日志管理的数据查询效率太低,需要优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/log/loggrid.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/forgonDateSetting.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/log/loggrid.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/helper/LogQueryHelper.java
  5. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/helper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/log/logForm.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/dwr/table/LogTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/model/Log.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/include_Ext2_Js.jsp
11:33 上午

shuyongfu

解决jira问题:CSSZXYY-121 与移动护理的接口
Options
    • ?
    /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/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.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-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebService.java