forgon-ssts-v4.1 / SterileSupplySystem / branches / V4.1.0 / ssts-web / src / main

webapp

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 11
Total Committers: 58
Last Commit: 14 Feb 16
Commits this week: 11
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 35618 is being indexed.

Friday 14 Apr 2023
7:00 下午

zc.li

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

未解决前 先还原代码

Options
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jasper
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jasper
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jrxml
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jrxml
6:42 下午

zc.li

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

未解决前 先还原代码

Options
    • ?
    ./jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jasper
    • ?
    ./jasperRtp/monthReportShowApplicationDepart.jrxml
    • ?
    ./jasperRtp/supplyRoomQualityQuota.jasper
    • ?
    ./jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jrxml
    • ?
    ./jasperRtp/monthIntegralReport.jasper
    • ?
    ./jasperRtp/monthReportBranche.jrxml
    • ?
    ./jasperRtp/monthReportHideApplicationDepart.jrxml
    • ?
    ./jasperRtp/strengthenStatisticalWorkloadDisposableGood.jasper
    • ?
    ./jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml
    • ?
    ./jasperRtp/statisticalWorkload.jrxml
    • ?
    ./jasperRtp/statisticalWorkload.jasper
    • ?
    ./jasperRtp/strengthenStatisticalWorkload.jasper
    • ?
    ./jasperRtp/monthReportShowBrevityCode.jasper
    • ?
    ./jasperRtp/monthReportShowBrevityCode.jrxml
    • ?
    ./jasperRtp/monthReportBranche.jasper
  16. … 11 more files in changeset.
5:53 下午

zc.li

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

zc.li

SSTS-592 升级之后虽然解决了一些问题，但是出现了新的问题。未解决前 先还原代码
Options
    • ?
    ./jasperRtp/exportPdfReport.jsp
    • ?
    ./jasperRtp/jasperreportsView.jsp
    • ?
    ./jasperRtp/exportHtmlReport.jsp
    • ?
    ./jasperRtp/exportReport.jsp
  5. … 6 more files in changeset.
5:07 下午

frank.qiu

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

frank.qiu

解决了 ZSRY-47 - PDA端【预回收】页面新增提醒功能（第三点）
Options
    • ?
    ./disinfectsystem/config/zsdxfsdeyy/config.js
    • ?
    ./disinfectsystem/common/selectUserExt4.js
    • ?
    ./disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.js
    • ?
    ./disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp
    • ?
    ./disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js
    • ?
    ./disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorForm.js
Thursday 13 Apr 2023
3:05 下午

frank.qiu

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

frank.qiu

解决了 NFYY-69 - 【一次物品出入库记录】按物品名称搜索结果排序优化
Options
    • ?
    ./disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
Wednesday 12 Apr 2023
6:41 下午

frank.qiu

解决了 ZYYFS-172 - 【明细核算月报】新增可扩展表格列“器械包分组”
Options
    • ?
    ./disinfectsystem/config/gzzyyfs/config.js
    • ?
    ./disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
2:57 下午

zc.li

完善：SSTS-592 tomcat运行项目查询报表时 有的报表（如核算月报）出现乱码的问题，打印时的预览出现乱码
Options
    • ?
    ./jasperRtp/jasperreportsView.jsp
  2. … 1 more file in changeset.
2:28 下午

frank.qiu

解决了 CDSLQYQYYY-114 - 新增器械维修记录报表功能
Options
    • ?
    ./disinfectsystem/reportforms/instrumentRepairReportView.js
2:24 下午

frank.qiu

解决了 ZSWY-187 - 明细核算月报表增加可扩展查询项
Options
    • ?
    ./disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
Tuesday 11 Apr 2023
5:45 下午

frank.qiu

解决了 SSTS-589 - 回收模块添加带标识牌的物品，回收拍摄会弹出选择的改进
Options
    • ?
    ./disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
Monday 10 Apr 2023
2:48 下午

frank.qiu

解决了 ZSYKZX-167 - 【材料管理】的材料列表新增表格列“是否可拆”、“可拆卸数量”
Options
    • ?
    ./disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
11:18 上午

zc.li

完善：DGSDBZXYY-206 修复【设备维护报表】列名调整
Options
    • ?
    ./jasperRtp/deviceMaintenanceCusReport.jasper
    • ?
    ./jasperRtp/deviceMaintenanceCusReport.jrxml
11:16 上午

zc.li

完善：DGSDBZXYY-206 修复【设备维护报表】备注列会合并的问题
Options
    • ?
    ./jasperRtp/deviceMaintenanceCusReport.jasper
    • ?
    ./jasperRtp/deviceMaintenanceCusReport.jrxml
11:15 上午

jason

解决jira问题：JYSRMYY-22 科室供应室设置里的“是否清洗时间结束后装配”改进为在清洗机定义中进行配置
Options
    • ?
    ./dataUpdater/sqls/5.0.7_5.0.8.sql
Friday 07 Apr 2023
4:57 下午

zc.li

暂挂本问题上SSTS-592 jasperreport升级后边距设置功能生效，工作量积分统计表改为新方式设置
Options
    • ?
    ./jasperRtp/workloadScoreStatisticReport.jasper
    • ?
    ./jasperRtp/workloadScoreStatisticReport.jrxml
  3. … 1 more file in changeset.
4:51 下午

zc.li

解决：DGSDBZXYY-206 【设备维护报表】启用配置项“isDeviceMaintenanceCus”时新增表格列“备注”
Options
    • ?
    ./jasperRtp/deviceMaintenanceCusReport.jasper
    • ?
    ./jasperRtp/deviceMaintenanceCusReport.jrxml
  3. … 2 more files in changeset.
4:12 下午

jason

解决jira问题：JYSRMYY-22 科室供应室设置里的“是否清洗时间结束后装配”改进为在清洗机定义中进行配置
Options
    • ?
    ./dataUpdater/sqls/5.0.7_5.0.8.sql
3:42 下午

jason

解决jira问题：JYSRMYY-22 科室供应室设置里的“是否清洗时间结束后装配”改进为在清洗机定义中进行配置
Options
    • ?
    ./dataUpdater/sqls/5.0.7_5.0.8.sql
  2. … 5 more files in changeset.
3:15 下午

frank.qiu

解决了 GDSZYY-217 - 【外来器械处理汇总单】中记录的同张申请单申请同个供应商多套外来器械后装配拆小包的数量有误
Options
    • ?
    ./disinfectsystem/print/print.js
3:08 下午

zc.li

暂挂本问题上SSTS-592 jasperreport升级后边距设置功能生效，核算月报 供应室护理指标报表 消毒供应中心员工绩效评分表 改为新方式设置
Options
    • ?
    ./jasperRtp/monthReportGroupBySterilizationMode.jrxml
    • ?
    ./jasperRtp/supplyRoomQualityQuota.jrxml
    • ?
    ./jasperRtp/monthReportHideApplicationDepart.jrxml
    • ?
    ./jasperRtp/monthReportShowApplicationDepart.jrxml
    • ?
    ./jasperRtp/monthReportBranche.jasper
    • ?
    ./jasperRtp/monthReportShowBrevityCode.jasper
    • ?
    ./jasperRtp/monthIntegralReport.jrxml
    • ?
    ./jasperRtp/supplyRoomQualityQuota.jasper
    • ?
    ./jasperRtp/strengthenStatisticalWorkload.jrxml
    • ?
    ./jasperRtp/monthReportShowApplicationDepart.jasper
    • ?
    ./jasperRtp/statisticalWorkload.jrxml
    • ?
    ./jasperRtp/statisticalWorkloadDisposableGood.jrxml
    • ?
    ./jasperRtp/strengthenStatisticalWorkloadDisposableGood.jasper
    • ?
    ./jasperRtp/monthReportShowBrevityCode.jrxml
    • ?
    ./jasperRtp/monthIntegralReport.jasper
  16. … 7 more files in changeset.
2:46 下午

frank.qiu

解决了 JYSRMYY-22 - 科室供应室设置里的“是否清洗时间结束后装配”改进为在清洗机定义中进行配置
Options
    • ?
    ./disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • ?
    ./disinfectsystem/basedatamanager/rinser/rinserForm.js
2:27 下午

zc.li

暂挂本问题上SSTS-592 jasperreport升级后边距设置功能生效，消毒供应室工作量统计报表改为新方式设置
Options
    • ?
    ./jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jrxml
    • ?
    ./jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jasper
  3. … 1 more file in changeset.
1:51 下午

frank.qiu

解决了 GYEY-782 - 增加RFID阅读器的“感应范围调节”（RSSI值设置）功能，以及RFID标签读取代码中，增加根据RSSI值进行RFID标签过滤
Options
    • ?
    ./disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
12:21 下午

shuyongfu

处理:QYSRMYY-54 PDA【预回收】新增扫码可增加或减少预回收数量
Options
    • ?
    ./mobileClient/SterileSupplySystem_Android_V4.7.33_20230403_v4_1_nologo_release.apk
    • ?
    ./mobileClient/SterileSupplySystem_Android_V4.7.33_20230403_v4_1_release.apk
    • ?
    ./mobileClient/SterileSupplySystem_Android_V4.7.33_20230403_v4_1_6p_release.apk
    • ?
    ./mobileClient/clientForAndroid.json
    • ?
    ./mobileClient/SterileSupplySystem_Android_V4.7.33_20230407_v4_1_release.apk
    • ?
    ./mobileClient/SterileSupplySystem_Android_V4.7.33_20230407_v4_1_nologo_release.apk
Thursday 06 Apr 2023
6:19 下午

zc.li

解决：DGSDBZXYY-194 【灭菌炉使用次数统计报表】的“汇总”统计类型中新增空炉统计
Options
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jasper
    • ?
    ./disinfectsystem/reportforms/sterilizingStoveUseCountView.js
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount_child.jrxml
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jasper
    • ?
    ./jasperRtp/sterilizingStoveEmptyFurnaceUseCount.jrxml
    • ?
    ./disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp
  7. … 2 more files in changeset.
6:08 下午

shuyongfu

处理 QYSRMYY-54 PDA【预回收】新增扫码可增加或减少预回收数量
Options
    • ?
    ./mobileClient/clientForAndroid.json
    • ?
    ./mobileClient/SterileSupplySystem_Android_V4.7.33_20230406_v4_1_6p_release.apk
  3. … 1 more file in changeset.
5:16 下午

frank.qiu

解决了 ZSYY-319 - 【发货管理】模块新增发货总数量说明
Options
    • ?
    ./disinfectsystem/invoice/invoiceView.js