forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 40
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 40
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
Monday 05 Sep 2022
6:32 下午

zc.li

完善：GDSZYY-163 清洗中的物品装配时提示异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:09 下午

zc.li

优化 SZSDSRMYY-85 器械包返消统计报表显示修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseReturnDisinfectionDetail.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseReturnDisinfectionDetail.jasper
6:01 下午

zc.li

修复 SZSDSRMYY-85 器械包返消统计报表查询异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:17 下午

frank.qiu

解决了 SZSDSRMYY-85 - 器械包返消统计报表增加【返消申请时间】列，以及将返消的【录入时间】改为【申请时间】的相关改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
2:19 下午

frank.qiu

解决了 QYSRMYY-38 - 系统漏洞和安全问题整改（连续登录失败的次数以及锁定账户的时间改为可配置，以及增加超时退出功能）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
1:59 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码(IE不引入setPlugInRFID.js)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
1:47 下午

zc.li

完善：GDSZYY-163 增加灭菌中的时间提醒
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:57 上午

zc.li

完善：GDSZYY-163 删除已灭菌包的处理异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Friday 02 Sep 2022
6:54 下午

zc.li

完善：GDSZYY-163 增加灭菌中的检查
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:33 下午

frank.qiu

解决了 QYSRMYY-38 - 系统漏洞和安全问题整改（连续登录失败的次数以及锁定账户的时间改为可配置，以及增加超时退出功能）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
Thursday 01 Sep 2022
2:55 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码(IE不引入setPlugInRFID.js)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • ?
    /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/awaitForRecycleList.jsp
10:58 上午

frank.qiu

解决了 QYSRMYY-38 - 系统漏洞和安全问题整改（连续登录失败的次数以及锁定账户的时间改为可配置，以及增加超时退出功能）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
10:23 上午

frank.qiu

解决了 QYSRMYY-38 - 系统漏洞和安全问题整改（连续登录失败的次数以及锁定账户的时间改为可配置，以及增加超时退出功能）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
Wednesday 31 Aug 2022
10:04 下午

frank.qiu

解决了 QYSRMYY-38 - 系统漏洞和安全问题整改（连续登录失败的次数以及锁定账户的时间改为可配置，以及增加超时退出功能）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
7:09 下午

jason

解决jira问题：QYSRMYY-38 系统漏洞和安全问题整改（连续登录失败的次数以及锁定账户的时间改为可配置）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
Tuesday 30 Aug 2022
6:43 下午

frank.qiu

解决了 DGSHLYY-10 - 定制明细核算月报的打印格式（每个科室的数据单独打印）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
5:06 下午

frank.qiu

解决了 DGSHLYY-10 - 定制明细核算月报的打印格式（每个科室的数据单独打印）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
4:46 下午

zc.li

解决 BJCYLYY-47(提交后台代码) 灭菌装载应支持扫描固定条码进行装载
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
3:24 下午

frank.qiu

灭菌管理保存监测结果时添加等待框
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
3:17 下午

frank.qiu

解决今日本组装配记录导出excel有时会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:08 下午

jason

解决jira问题：XJJQZYY-115 千樱脉动真空灭菌器获取灭菌参数不稳定，不定时有无法获取参数的情况出现(PDA录的灭菌记录不能同步到灭菌参数)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:58 下午

frank.qiu

解决今日本组装配记录导出excel有时会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:38 下午

zc.li

完善：DGSHLYY-10 有规格时，编码不显示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:26 下午

frank.qiu

解决了 DGSHLYY-10 - 定制明细核算月报的打印格式（每个科室的数据单独打印）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
1:47 下午

zc.li

解决：DGSHLYY-10 定制明细核算月报的打印格式（每个科室的数据单独打印）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
1:47 下午

zc.li

解决：DGSHLYY-10 定制明细核算月报的打印格式（每个科室的数据单独打印）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java
    • ?
    /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
1:43 下午

frank.qiu

解决了 DGSHLYY-10 - 定制明细核算月报的打印格式（每个科室的数据单独打印）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
Monday 29 Aug 2022
6:14 下午

yuandongxiao

selenium3解决冲突文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.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/testscript/TestQualityMonitoring.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringHandle.java
6:10 下午

yuandongxiao

selenium3提交：质量监测模块测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestReturnGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/interventionmanagement/ForeignTousseInterventionManagerHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/wash/WashProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/AllTests.java
3:34 下午

jason

解决jira问题：SSTS-564 退货记录信息页面页码条数展示不正确
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java