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

Thursday 06 Jul 2023
3:00 下午

zc.li

处理SSTS-610 优化部分单个包入灭菌篮筐的场景是会做多余查询的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Wednesday 05 Jul 2023
4:31 下午

zc.li

倍力曼灭菌炉设备接口优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
3:52 下午

frank.qiu

解决了 GDSRMYY-552 - 新增打印标签输出打印机设置功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
3:15 下午

frank.qiu

解决了 CDSLQYQYYY-123 - 【器械包维修记录报表】去除过滤条件以及增加查询项“审核状态”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentRepairReportView.js
12:04 下午

frank.qiu

解决了 JMSZXYY-103 - 请修复【核算月报】报表没有【合计】行的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
12:03 下午

frank.qiu

解决了 ZJYY-136 - 部分报表导出的EXCEL文件无法直接打开
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js/sheetjs/xlsxStyle.utils.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js/sheetjs/xlsxExport.utils.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSupplierStatisticsReport.js
11:35 上午

zc.li

解决JMSZXYY-103 - 请修复【核算月报】报表没有【合计】行的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportHelper.java
11:32 上午

zc.li

解决JMSZXYY-103 - 请修复【核算月报】报表没有【合计】行的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
11:06 上午

jason

解决jira问题：QYSRMYY-60 【外来器械申请单】通过接口转换的外来申请单自动进行提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/qysrmyy/HIPMessageWebServiceImpl.java
10:47 上午

zc.li

删除多余代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:42 上午

zc.li

解决：CDSLQYQYYY-123 【器械包维修记录报表】去除过滤条件以及增加查询项“审核状态”
Options
    • ?
    /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/util/InstrumentRepairReportHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
10:19 上午

jason

解决jira问题：ZSLY-393 - 外来器械包录入使用记录并审核转换申请单后未生成回收任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.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-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
Tuesday 04 Jul 2023
6:12 下午

frank.qiu

解决了 ZJYY-136 - 部分报表导出的EXCEL文件无法直接打开
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js/sheetjs/xlsxExport.utils.js
    • ?
    /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/foreignTousseSupplierStatisticsReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp
  16. … 7 more files in changeset.
5:14 下午

zc.li

解决：KSDQDYRMYY-22 请修复科室借还物品统计报表显示总价异常问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/BorrowingReportReportHelper.java
4:58 下午

zc.li

修复历史bug SZSDSRMYY-113 有标识牌的器械包退货时选择重装与重发后，重新装配打印的标签未和标识牌关联上(原因是退货时产生的装配任务上没有标识牌信息)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
4:57 下午

feng.rui

selenium3提交：增加保存回收单前的等待，增强稳定性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecycleProxy.java
Monday 03 Jul 2023
6:25 下午

zc.li

数据看板待发货增加对消毒物品的统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java
1:56 下午

zc.li

解决：GDSZYY-224 按省中医要求修改【消毒供应中心工作量统计报表】的表格项名称【口腔班】修改为【口腔器械】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportHelper.java
Friday 30 Jun 2023
2:37 下午

zc.li

历史代码位置调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
2:10 下午

jason

ZSRY-53 【加急级别管理】新增可配置加急功能扩展信息(“加急时间”、“加急人”和“加急手术间”)(代码优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:06 上午

jason

解决jira问题：KLMYSRMYY-22 【外来器械申请单】更改病人信息时不限制必须勾选器械包以及增加日志管理(备注修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
Thursday 29 Jun 2023
5:50 下午

yeah.lin

提交中大五院现场的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
2:24 下午

feng.rui

selenium3提交：增加添加一次性物品退库单用例的等待，增强稳定性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/disposablegoodsmanagement/DisposableGoodsOutStockProxy.java
11:01 上午

zc.li

历史代码调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
9:51 上午

yeah.lin

提交河北大学医院的现场文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbdxfsyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper2.xml
1:10 上午

terry.kwan

demo项目的实时看板，更新为广医二院的实时看板效果
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/images
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/fonts/icomoon.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/fonts/icomoon.woff
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/css
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/fonts/icomoon.ttf
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/images/line.png
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/fonts
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/images/user.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/images/logo.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/js/index.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/js/jquery.min.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/js/echarts.min.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/images/loading.gif
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboards/fonts/icomoon.svg
  16. … 8 more files in changeset.
Wednesday 28 Jun 2023
6:34 下午

frank.qiu

解决了 HBTSGRYY-19 - 消毒供应室工作量统计报表时间不能选择为双数月份(控件存在的bug)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/js/ext-all.js
6:30 下午

zc.li

SSTS-609 回收模块打开待回收申请单与对比申请单修改结果代码拆离和优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/OpenToBeRecycledRecordVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
6:07 下午

yeah.lin

修改河北大学附属医院的文件路径
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbdxfsyy/spring/HIS.xml
5:58 下午

yeah.lin

修改河北附属大学医院的文件里的路径
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbdxfsyy/spring/HIS.xml