forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
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 35628 is being indexed.

Monday 17 Apr 2023
4:29 下午

frank.qiu

解决了 QYSRMYY-49 - PDA“器械包签收”功能新增手写签名功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
4:25 下午

frank.qiu

解决了 QYSRMYY-49 - PDA“器械包签收”功能新增手写签名功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
3:56 下午

zc.li

解决：SSTS-596 【灭菌炉管理】中灭菌炉视图列表的字段“序号”为空时查询的数据存在重复和缺失现象
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/component/grid/GridManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js
3:51 下午

frank.qiu

解决了 QYSRMYY-49 - PDA“器械包签收”功能新增手写签名功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
3:39 下午

frank.qiu

解决了 QYSRMYY-49 - PDA“器械包签收”功能新增手写签名功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
3:23 下午

jason

解决jira问题：QYSRMYY-49 PDA“器械包签收”功能新增手写签名功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
3:06 下午

feng.rui

修复自动化测试代码获取元素：添加外来器械材料数量的定位错误
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java
2:50 下午

zc.li

SSTS-592 ireport代码调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreport1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreport1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport.jasper
2:31 下午

zc.li

SSTS-592 ireport代码调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
2:29 下午

frank.qiu

解决了 QYSRMYY-49 - PDA“器械包签收”功能新增手写签名功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
Friday 14 Apr 2023
7:00 下午

zc.li

SSTS-592 升级之后虽然解决了一些问题，但是出现了新的问题。

未解决前 先还原代码

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jrxml
6:42 下午

zc.li

SSTS-592 升级之后虽然解决了一些问题，但是出现了新的问题。

未解决前 先还原代码

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
  16. … 11 more files in changeset.
6:33 下午

jason

解决jira问题：ZSRY-47 PDA端【预回收】页面新增提醒功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroupWarnUser.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/dwr/table/DepartmentGroupTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
5:54 下午

zc.li

SSTS-592 升级之后虽然解决了一些问题，但是出现了新的问题。

未解决前 先还原代码

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
5:53 下午

zc.li

SSTS-592 升级之后虽然解决了一些问题，但是出现了新的问题。未解决前 先还原代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/tempTable.html
5:52 下午

zc.li

SSTS-592 升级之后虽然解决了一些问题，但是出现了新的问题。未解决前 先还原代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/FileUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportPdfReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportHtmlReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/excel/ParerUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/dwr/table/JasperreportsTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/itextpdf/ExcelToPdf.java
5:07 下午

frank.qiu

解决了 GYEY-798 - 在装配界面使用平板RFID阅读器自动读取RFID时，当平板接收信息错误后无法继续使用RFID阅读器
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
5:06 下午

frank.qiu

解决了 ZSRY-47 - PDA端【预回收】页面新增提醒功能（第三点）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/selectUserExt4.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorForm.js
4:57 下午

jason

修改注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
Thursday 13 Apr 2023
6:07 下午

zc.li

完善：ZYYFS-172 【明细核算报表】新增可扩展表格列“器械包分组” 修复showMaterialsAmountColumnOfDetailMonthReport异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
5:58 下午

zc.li

完善：ZYYFS-172 【明细核算报表】新增可扩展表格列“器械包分组” 修复showMaterialsAmountColumnOfDetailMonthReport异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
5:41 下午

zc.li

完善：ZYYFS-172 【明细核算报表】新增可扩展表格列“器械包分组” 修复showMaterialsAmountColumnOfDetailMonthReport异常的问题
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
3:55 下午

jason

解决jira问题：NFYY-69 【一次物品出入库记录】按物品名称搜索结果排序优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
3:05 下午

frank.qiu

解决了 NFYY-70 - “能否申请”属性为“否”的一次性物品在【一次性物品出入库记录】中按物品名称搜索时的无法搜索，以及“能否申请”属性统一名称为“能否被科室申请”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
2:16 下午

frank.qiu

解决了 NFYY-69 - 【一次物品出入库记录】按物品名称搜索结果排序优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
11:15 上午

zc.li

设备接口代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
11:08 上午

zc.li

历史BUG修复:GGSRMYY-11 在基础数据导入导出中增加手术名称导入，导出功能(手术名称已存在时无法保存)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
11:02 上午

zc.li

历史代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java
10:40 上午

zc.li

历史代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:32 上午

zc.li

历史代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java