forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Friday 29 Jan 2021
1:52 下午

terrykwan

发布包文件名称增加发布包编译日期的字符串，格式为yyyyMMdd
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
12:37 下午

terrykwan

退出回收模块后，不记住回收界面的过滤条件。SZSDSRMYY-47
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/config.js
11:50 上午

shuyongfu

解决:SSTS-293 PC端，当一次性物品批次条码和固定条码一起使用时，发货计划中的发货单明细计算不正确
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:38 上午

zc.li

部分解决：DGSFYBJY-44。1.定期监测定义元素排序问题；4、新增定期检查的监测范围选择【灭菌炉记录】，登记后，在报表中展示灭菌炉相关炉号、炉次。灭菌日期未使用，使用监测登记日期。注：2未重现；3暂不支持。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
11:23 上午

frank

解决SZSDSRMYY-44:登录系统后，直接关闭浏览器，系统要有一个弹出框提示“确定要关闭窗口吗？”，用户点击确定后，才可以关闭浏览器
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
11:07 上午

frank

解决ZYYFS-148:系统自带小标签在谷歌浏览器下打印表格线打印不全
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
Thursday 28 Jan 2021
8:39 下午

jason

zc.li提交： 修复FSSZYY-15 工作量积分统计报表有时候查询不出数据的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
8:31 下午

jason

解决jira问题：SZHZ-6 修改外来器械供应商的名字后，要联动修改外来器械包定义的供应商名称，以及外来器械包申请单上的供应商名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
7:47 下午

frank

解决KLMYSRMYY-11：谷歌浏览器外来器械拆包页面不显示拆包按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
7:03 下午

jason

解决jira问题：BJ307YY-58 一次性物品出入库增加多种查询条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
6:20 下午

frank

解决BJ307YY-58:一次性物品出入库增加多种查询条件
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/disposableGoods/storageRecordView.jsp
2:51 下午

zc.li

DGSFYBJY-44:修复监测报表有的列不显示的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:28 上午

zc.li

FTP获取文件代码调整(可能解决克拉玛依获取文件时异常的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
10:59 上午

zc.li

增加报错信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
Wednesday 27 Jan 2021
7:25 下午

jason

解决jira问题：SSTS-285 修改材料定义的消毒价格时的联动修改引用该材料的消毒物品的价格
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
7:18 下午

LJH

增加两个配置项

//ftp连接

setPassiveModeAfterLogin: true,

//清洗机日志

enableDetailedDeviceInformation: true,

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
7:15 下午

jason

解决jira问题：SSTS-285 修改材料定义的消毒价格时的联动修改引用该材料的消毒物品的价格(只修改页面显示的包定义)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
6:42 下午

shuyongfu

解决:处理深圳三院单点登录配置导致密码未传完后台导致后台解密出现异常的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
5:45 下午

shuyongfu

解决:处理深圳三院单点登录配置导致密码未传完后台导致后台解密出现异常的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
4:43 下午

jason

解决jira问题：SSTS-294 消毒供应中心领用材料保存时提示"empty string"
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
4:40 下午

zc.li

解决：FSSZYY-15 增加工作量积分统计报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/workloadScoreStatisticView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/workloadScoreStatisticView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkloadScoreStatisticReportVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workloadScoreStatisticReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workloadScoreStatisticReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:10 下午

frank

解决了 ASSDGSZYY-90：清洗触摸屏界面的“开始时间”及“结束时间”未实时更新，导致保存会出现清洗记录时的清洗时间早于回收时间的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
3:15 下午

shuyongfu

解决:处理深圳三院单点登录配置导致密码未传完后台导致后台解密出现异常的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
3:05 下午

jason

解决jira问题：HZSRMYY-67 器械包导出
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:00 下午

frank

解决了 HZSRMYY-67 - 器械包信息在表格列的过滤条件中输入的条件，导出按钮会忽略掉，导出的内容比查询的结果多
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
2:43 下午

frank

解决SSTS-297:材料发货管理，材料数量为0时，发货出现undefined
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
2:19 下午

frank

解决了SSTS-296:在清洗记录干预界面点击清洗参数图标有JS报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
1:54 下午

frank

解决了 HZSRMYY-67 - 器械包信息在表格列的过滤条件中输入的条件，导出按钮会忽略掉，导出的内容比查询的结果多
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
1:32 下午

jason

解决jira问题：HZSRMYY-67 器械包信息在表格列的过滤条件中输入的条件，导出按钮会忽略掉，导出的内容比查询的结果多
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
Tuesday 26 Jan 2021
9:40 下午

jason

解决jira问题：HZSRMYY-67 器械包信息在表格列的过滤条件中输入的条件，导出按钮会忽略掉，导出的内容比查询的结果多
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java