forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Friday 14 May 2021
6:58 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已接收申请单支持拆分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:15 下午

shuyongfu

解决:SSTS-372 自定义发货时，一套外来器械所有的拆分小包都已经扫进了发货列表，但是发货时系统还是提示缺少拆分小包，发货不成功
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:08 下午

shuyongfu

解决:SSTS-372 自定义发货时，一套外来器械所有的拆分小包都已经扫进了发货列表，但是发货时系统还是提示缺少拆分小包，发货不成功
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
4:47 下午

terry.kwan

修改清洗区材料类型工作量统计报表的查询页面的标题，改为和菜单的名字一致。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
3:39 下午

frank.qiu

解决了 MMSRMYY-3 - 开启配置项notRememberFilterConditionWhenExitRecyclingModule后，待回收列表中的申请单会重复显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
11:11 上午

frank.qiu

解决了 SSTS-367 - 清洗失败的清洗记录点击重新清洗，系统提示undefined
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
10:27 上午

jason

解决jira问题：GDSZYY-92 外来器械申请单增加【接口推送】属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
Thursday 13 May 2021
7:03 下午

frank.qiu

优化图表，质量监测统计月报增加导出的功能
Options
    • ?
    /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/qualityMonitoringMonthView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp
    • ?
    /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/qualityMonitoringMonthView.js
6:20 下午

zc.li

解决：DGSDBZXYY-171。灭菌情况报表改进：查询条件增加【器械包类型】，查询结果表格增加【材料数量】列。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
6:19 下午

zc.li

解决：DGSDBZXYY-171。灭菌情况报表改进：查询条件增加【器械包类型】，查询结果表格增加【材料数量】列。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper
    • ?
    /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/javabeansource/SterilizationRecordItenBean.java
5:15 下午

shuyongfu

解决:GDSZYY-88 使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致。版本由4.7.19调整为4.7.20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.20_20210513_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.20_20210513_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.20_20210513_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
Wednesday 12 May 2021
10:27 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已接收申请单先不拆分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
9:44 下午

shuyongfu

解决:GDSZYY-88 使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致(处理pda添加使用记录页面姓名文本框不能输入中文的情况)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210512_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210512_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210512_v4_1_nologo_release.apk
9:37 下午

yuandongxiao

启用已灭菌（含已消毒）物品变色功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
8:41 下午

frank.qiu

优化GDSZYY-88：使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
8:28 下午

frank.qiu

IE不显示图表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
8:18 下午

frank.qiu

优化GDSZYY-88：使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致（添加外来器械拆分小包的判断）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
8:05 下午

frank.qiu

解决拆分小包删除图片时取消背景颜色的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
7:57 下午

frank.qiu

优化GDSZYY-88：使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致（添加外来器械拆分小包的判断）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
7:13 下午

shuyongfu

解决:GDSZYY-88 使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210512_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210512_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210512_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
6:55 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已回收申请单先不拆分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:06 下午

frank.qiu

解决ZSSXLRMYY-207 ：在“质量监测项统计月报”的折线图和柱状图下面增加表格同时显示(兼容IE，IE浏览器用echart，谷歌用amchart3D图表)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.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/qualityMonitoringMonthView.js
5:14 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已回收申请单的拆分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
5:08 下午

frank.qiu

优化GDSZYY-88：使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
5:06 下午

jason

解决jira问题：GDSZYY-87 或导入进来的账号，在经过系统管理员在用户管理页面修改保存用户信息后，登录名中的大写字母会变为小写字母的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
5:03 下午

frank.qiu

优化GDSZYY-88：使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:16 下午

zc.li

导出图表代码改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java
3:58 下午

frank.qiu

优化 ZSSXLRMYY-209 - 在【清洗区材料类型工作量统计报表】里增加柱状图
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp
3:57 下午

zc.li

解决：ZSSXLRMYY-209，在【清洗区材料类型工作量统计报表】修改导出表尾样式。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java
3:43 下午

frank.qiu

优化 ZSSXLRMYY-209 - 在【清洗区材料类型工作量统计报表】里增加柱状图
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js