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

Wednesday 11 Oct 2023
5:48 下午

zc.li

解决：GYKQ-87 【质量监测报表】报表中的“合计”行改进为一直显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java
4:29 下午

jason

解决jira问题：GDSRMYY-568 开发接收第三方消毒供应中心（聚力康公司）的器械包基础信息（含材料定义和包定义信息）的Web Services接口(增加dataSource字段，区分包定义是否聚力康推送的)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
4:27 下午

jason

解决jira问题：GDSRMYY-568 开发接收第三方消毒供应中心（聚力康公司）的器械包基础信息（含材料定义和包定义信息）的Web Services接口(增加dataSource字段，区分包定义是否聚力康推送的)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
4:07 下午

zc.li

解决 GDSZYY-233 【核算月报】报表统计项类型支持多院区报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
3:02 下午

frank.qiu

解决了 GYEY-809 - 自定义报表中“一次性物品申领情况查询报表”无法显示查询的数据内容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.js
12:27 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码（增加蓝牙连接）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js
Tuesday 10 Oct 2023
4:54 下午

zc.li

完善：GMQRMYY-29 职业暴露发生率根据配置项enableMonthlyPeopleCountManagementFunction控制科室总人数数据来源
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java
1:54 下午

zc.li

解决：GMQRMYY-29 设备维护完成次数名字变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SupplyRoomQualityQuota.java
1:46 下午

zc.li

解决：GMQRMYY-29 职业暴露发生率查询改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java
11:54 上午

jason

解决jira问题：GDSRMYY-568 开发接收第三方消毒供应中心（聚力康公司）的器械包基础信息（含材料定义和包定义信息）的Web Services接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/JLKBasicDataPushWebServiceImpl.java
11:19 上午

jason

解决jira问题：BJCYZXYYY-7 【门诊患者和住院患者信息的webservice接口】增加手术间字段：oproomid
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/bjcyzxyyy/FindPatientInfoByHospitalNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/bjcyzxyyy/FindPatientInfoByTreatmentNumDaoImpl.java
11:13 上午

jason

解决jira问题：SZLGEY-13 美雅洁清洗机MAG-120的接口对接开发（120csv格式）(timer.xml)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/spring/timer.xml
10:54 上午

jason

解决：器械包退货报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
Monday 09 Oct 2023
6:22 下午

frank.qiu

解决 ZJYY-134 - 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类”（发货计划补充参数）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
6:11 下午

shuyongfu

处理 ZJYY-134 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类” 发货计划后台过滤的重构与功能实现
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/InvoiceModule.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/InvoicePlanController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SearchInvoicePlanOrGoodsParams.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:01 下午

jason

解决jira问题：SZLGEY-13 美雅洁清洗机MAG-120的接口对接开发（接口文件为csv格式）(定时器时间还原)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
5:54 下午

frank.qiu

解决 GDSZYY-233 【核算月报】报表新增可扩展查询项“统计项类型”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
5:45 下午

zc.li

解决 GDSZYY-233 【核算月报】报表新增可扩展查询项“统计项类型”
Options
    • ?
    /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/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
5:44 下午

zc.li

解决：GMQRMYY-29 月度人数统计设置功能完成后，报表支持职业暴露发生率查询
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SupplyRoomQualityQuota.java
5:42 下午

zc.li

解决：GMQRMYY-29 月度人数统计设置功能完成后，报表支持职业暴露发生率查询
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java
5:17 下午

frank.qiu

解决了 BJCYZXYYY-4 - 【科室问题反馈】功能出现首次上传附件失败的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js
4:54 下午

jason

解决jira问题：GDSRMYY-568 开发接收第三方消毒供应中心（聚力康公司）的器械包基础信息（含材料定义和包定义信息）的Web Services接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/JLKBasicDataPushWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/JLKBasicDataPushWebService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/spring/webservice-cxf.xml
4:33 下午

shuyongfu

处理 ZJYY-134 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类” 公共方法完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/RequestUtils.java
3:44 下午

frank.qiu

解决 ZJYY-134 - 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类”（发货计划参数instrumentSetTypeId改为instrumentSetTypeIds）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:43 下午

zc.li

解决：GMQRMYY-29 设备维护指标查询异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java
2:42 下午

frank.qiu

解决 ZJYY-134 - 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类”（补充回收模块的）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
2:34 下午

jason

解决jira问题：SZLGEY-13 美雅洁清洗机MAG-120的接口对接开发（120csv格式）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java
2:16 下午

frank.qiu

解决 ZJYY-134 - 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类”（补充回收模块的）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
2:15 下午

frank.qiu

解决 ZJYY-134 - 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类”（补充回收模块的）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js
2:08 下午

zc.li

解决 ZJYY-134 - 配置项“enableInstrumentSetTypeSetting”改进在多个功能模块显示筛选项“器械包种类”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/RecyclingModule.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/BorrowingReportReportHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/AwaitForRecyclingInvoicePlanParamVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ReportSqlUtil.java