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

Monday 10 Jul 2017
4:34 下午

zengjc

质量监测重新装配外来器械包，如果包定义的申请单id为空，则找包实例的申请单id.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:41 下午

chenjiaru

灭菌模块自动化测试代码的优化
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/sterilizationRecordCompleteForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
2:12 下午

zhonghaowen

满意度调查表下的自定义表改成单允许不填
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateCustomForm.js
2:11 下午

zengjc

修正质量监测扫描包条码，有时候重新装配的包，没有在质量监测记录写入备注的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
11:22 上午

zhonghaowen

修改一次性物品绑定查询物品时候的参数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsConfig.js
Sunday 09 Jul 2017
11:28 下午

terrykwan

将运行失败后的截图的存放位置修改为build/tmp文件夹，便于jenkins通过邮件将图片作为附件发送
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
9:59 下午

terrykwan

增加对一个gradle编译参数的解析：hibernate.show_sql
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
Saturday 08 Jul 2017
11:49 下午

terrykwan

排除模板下的.svn文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
4:05 下午

terrykwan

修改默认服务器地址
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
4:05 下午

terrykwan

增加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
3:56 下午

terrykwan

触摸屏清洗服务地址改为相对地址
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
3:55 下午

terrykwan

触摸屏清洗服务地址改为相对地址
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
3:48 下午

shuyongfu

解决jira问题:QYSRMYY-1 清远市人民医院调用his系统webservice接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/DatasyncConstant.java
3:03 下午

terrykwan

提交配置文件，去掉双斜线注释符号，该符号会导致编译报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
1:30 下午

terrykwan

优化截图的代码，正常运行通过不需截图
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
Friday 07 Jul 2017
11:44 下午

terrykwan

增加包引用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
8:15 下午

zengjc

定期检测，定期检测添加质量监测，新建记录默认选择一个监测项.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
6:51 下午

cherry

针对ie8的修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
5:02 下午

zhonghaowen

优化计算一次性物品库存的方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
4:40 下午

zengjc

修改质量监测录了包和材料，保存打开再保存，再打开没有显示材料的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
4:02 下午

adairkang

添加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
2:36 下午

zhonghaowen

HZSRMYY-26:记录修改日志的时候增加判断
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
11:24 上午

adairkang

丢失报损数量为0,不生成清洗交接分配的丢失报损记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/IdCardMaterialErrorDamageManagerImpl.java
10:54 上午

adairkang

局部变量重命名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 06 Jul 2017
9:01 下午

adairkang

1、物品没还完，如果归还状态为“归还待确认”（即：在待回收有申请还物单没回收），回收添加同种物品，保存后的归还状态为“部分归还”

2、一个科室有两张有着相同物品的借物单，未归还，回收添加相同物品，会提示有两张单，保存后出现两张还物单，一张有数量，一张没数量，待回收列表也有一张没数量的 还物单

3、回收了不小心添加相同物品，然后删除了那个物品，点保存还是有归还提示

4、保存还物单后修改，修改数量大于借物单的发货数量，可以保存成功，在借物管理界面可以看到归还数量大于发货数量

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingAutoReturnBorrowTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.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/invoicemanager/InvoicePlan.java
6:51 下午

zengjc

修复质量监测，定期监测添加质量监测，录入包和关联的材料时，保存打开在保存不了的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
5:56 下午

zengjc

解决清洗界面添加质量监测，脚本报错问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
5:15 下午

zengjc

定期监测为不合格添加的质量监测也允许选择外来器械包进行登记.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
5:08 下午

zengjc

解决jira问题PYQZYY-156,质量监测支持不扫条码录入外来器械包.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • ?
    /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
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
4:15 下午

cherry

1.装配增加alert的判断

2.utils的tag_a因为申请的终止原因无法使用去掉,tag_img因为灭菌的重新灭菌按钮无法使用去掉

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java