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

Tuesday 10 May 2022
6:06 下午

zc.li

完善：GDSZYY-164 定制的【消毒供应中心工作量统计报表】，消毒班数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:02 下午

zc.li

完善：GDSZYY-164 定制的【消毒供应中心工作量统计报表】，剪刀班数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:54 下午

frank.qiu

解决了 SSTS-522 - 可多选的下拉框，勾选【全部】选项后，再去掉其中的一个或多个选中的选项，【全部】选项也应自动不被勾选
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
4:49 下午

zc.li

完善：GDSZYY-164 定制的【消毒供应中心工作量统计报表】，过滤处理科室调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:45 下午

li.wei

同步现场配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js
2:43 下午

li.wei

同步现场配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgfy/spring/timer.xml
Monday 09 May 2022
5:37 下午

shuyongfu

处理:NFYY-62 PDA发货任务模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.28_20220509_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.28_20220509_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.28_20220509_v4_1_6p_release.apk
5:34 下午

zc.li

修复(历史bug，与本问题无关，暂时挂在此问题上)：SZYK-64 质量监测报表合格和不合格改为统计材料数和包数。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:28 下午

frank.qiu

完善 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货(高级视图“发货计划管理”菜单分为“申领发货”和“借物单发货”两个菜单显示)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
3:25 下午

frank.qiu

完善 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货(高级视图“发货计划管理”菜单分为“申领发货”和“借物单发货”两个菜单显示)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
3:23 下午

shuyongfu

处理:ZJYY-70 PDA预回收界面增加手术间和病人信息

SZSDSRMYY-72 灭菌装载模块中，将篮筐物品统计信息和篮筐物品明细合并显示

ZSRY-31 PDA端【清洗任务】模块中【录入清洗记录】功能添加扫描固定条码可触发【提交】和【取消】功能

NFYY-62 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货

在"关于软件"页面对连续点击屏幕空白处时增加倒计时的提醒

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.28_20220509_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.28_20220509_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.28_20220509_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
2:45 下午

frank.qiu

完善 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
2:08 下午

zc.li

解决：SZYK-64 质量监测报表数量汇总统计错误
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:02 上午

yuandongxiao

提交selenium：登录功能测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestLogin.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktoppage/PersonalDesktopProxy.java
Saturday 07 May 2022
5:21 下午

zc.li

解决：GDSZYY-164 按省中医要求重新定制【消毒供应中心工作量统计报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadShowDetailsReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SecondColumnVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FirstColumnVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadShowDetailsReport_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadShowDetailsReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadShowDetailsReport_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
11:57 上午

frank.qiu

解决了 GDSZYY-153 - 器械包定义所属科室添加方式从搜索添加更改为可通过树状结构方式多选添加
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/changeDepartment.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/changeDepartment.jsp
11:36 上午

frank.qiu

解决了 GDSZYY-164 - 按省中医要求重新定制【消毒供应中心工作量统计报表】(点击20次改为大于等于20次)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.js
10:32 上午

yuandongxiao

提交selenium3下的测试套件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/AllTests.java
10:29 上午

yuandongxiao

删除selenium3下原有代码，重新搭建自动化测试框架
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/basepage/BasePage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/loginpage/LoginHandle.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/loginpage
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/applypage
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/basepage
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/washpage
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktoppage/PersonalDesktopPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktoppage/PersonalDesktopHandle.java
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/signpage
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recyclepage
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/demo.java
  16. … 17 more files in changeset.
10:24 上午

yuandongxiao

引入测试报告框架allure
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
10:21 上午

yuandongxiao

selenium提交：优化自动化测试代码
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/Review.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/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
Friday 06 May 2022
6:48 下午

frank.qiu

解决了 GDSZYY-153 - 器械包定义所属科室添加方式从搜索添加更改为可通过树状结构方式多选添加
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/changeDepartment.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/changeDepartment.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js
5:09 下午

jason

解决jira问题：BJ307YY-98 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
2:01 下午

jason

解决jira问题：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置(使用记录转申请单时，申请单上记录病人姓名)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:52 上午

frank.qiu

解决了 BJ307YY-98 - 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进（兼容enableForeignTousseApplyDepartment）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:45 上午

frank.qiu

解决了 GDSZYY-164 - 按省中医要求重新定制【消毒供应中心工作量统计报表】(兼容IE浏览器)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.js
11:34 上午

frank.qiu

解决了 GDSZYY-164 - 按省中医要求重新定制【消毒供应中心工作量统计报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.jsp
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.js
Thursday 05 May 2022
6:33 下午

frank.qiu

解决了 CDSLQYQYYY-108 - 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:35 下午

zc.li

解决：CDSLQYQYYY-108 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
5:35 下午

frank.qiu

解决了 CDSLQYQYYY-108 - 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js