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

Monday 20 Feb 2023
6:16 下午

jason

解决jira问题：SSTS-584 自定义发货的包，包内的器械实例的已使用次数没有增加的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:25 下午

zc.li

解决HDQRMYY-57 外来器械包申请单的物品搜索 的排序需求
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Friday 17 Feb 2023
2:17 下午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
2:15 下午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
2:11 下午

zc.li

代码调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:55 下午

zc.li

暂挂本问题下DGSDBZXYY-208 修复消毒供应中心年度工作量统计报表有时因月份和天数带0导致报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:21 上午

zc.li

解决：DGSETYY-60 回收清点模块的确认沟通功能，改为可通过配置项控制未确认沟通时不隐藏装配任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:50 上午

zc.li

解决HDQRMYY-57 按包名称进行搜索时搜索结果的排序优化（包括在【回收清点】模块中添加回收记录等界面） 新增自定义装备和外来器械包申请时物品过滤排序
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Thursday 16 Feb 2023
5:14 下午

zc.li

解决：DGSDBZXYY-196 【质量监测报表】统计“器械清洗不合格”数据显示错误：同一炉清洗的器械包，只有一种器械显示了清洗情况中的清洗机信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:08 下午

kaking.lu

现场文件拷贝回SVN
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js
4:56 下午

zc.li

解决DGSDBZXYY-208 消毒供应中心年度工作量统计报表中灭菌外来手术器械包数统计包含了聚合包的问题
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/dataindex/DataIndex.java
3:32 下午

jason

解决jira问题：SZSDSRMYY-108 使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
3:12 下午

frank.qiu

解决了 SZSDSRMYY-108:使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
2:51 下午

frank.qiu

解决了 SZSDSRMYY-108

使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
11:15 上午

jason

解决jira问题：SZSDSRMYY-108 使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:05 上午

jason

解决jira问题：SZSDSRMYY-108 使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:04 上午

jason

解决jira问题：SZSDSRMYY-108 使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
10:41 上午

zc.li

解决：DGSDBZXYY-193 【灭菌炉使用次数统计报表】中选择供应室为“全部”时无查询结果
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCount.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCount.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Wednesday 15 Feb 2023
6:21 下午

frank.qiu

解决了 CDSLQYQYYY-113 - 【质量监测管理】模块的“定期监测”新增定期弹窗提醒功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
6:11 下午

jason

解决jira问题：SZSDSRMYY-108 使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题;DGSETYY-56新增申请物品按照是否加急进行拆分合并申请单功能(使用记录按照加急情况拆分转换申请单)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
5:00 下午

frank.qiu

解决了 SZSDSRMYY-108

使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:07 下午

shuyongfu

处理:SZSSKRMYY-46 PDA【签收】和【科室签收】模块的“器械包签收”功能新增器械包签收数量汇总
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230210_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230210_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230210_v4_1_release.apk
4:06 下午

shuyongfu

处理:SZSSKRMYY-46 PDA【签收】和【科室签收】模块的“器械包签收”功能新增器械包签收数量汇总
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_nologo_release.apk
4:01 下午

frank.qiu

解决了 ZSYY-323 - 清洗和灭菌干预记录的开始、结束时间控件改为获取服务器时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/ext_datefield/DatetimeForServerTop.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
2:23 下午

frank.qiu

解决了 ZSYY-323 - 清洗和灭菌干预记录的开始、结束时间控件改为获取服务器时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/ext_datefield/DatetimeForServer.js
1:47 下午

shuyongfu

处理:GYEY-786 【发货管理】模块新增“一次性物品自定义批量发货”功能 增加对科室、一次性物品的停用的业务判断处理

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
11:42 上午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:23 上午

zc.li

解决SZSDSRMYY-107 装配管理模块当器械包有丢失\报损的备注信息时，增加手动输入备注信息后重新补打印标签时无法将手动输入的备注信息打印出来且备注框中也不显示手动输入的备注信息的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:04 上午

zc.li

解决SZSDSRMYY-107 装配管理模块当器械包有丢失\报损的备注信息时，增加手动输入备注信息后重新补打印标签时无法将手动输入的备注信息打印出来且备注框中也不显示手动输入的备注信息的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:56 上午

frank.qiu

解决了 ZSYY-323 - 清洗和灭菌干预记录的开始、结束时间控件改为获取服务器时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp