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

Friday 30 Apr 2021
5:42 下午

jason

解决jira问题：DGZYY-184 单点登录接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForDgszyy.jsp
3:49 下午

jason

解决jira问题：DGZYY-184 单点登录接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForDgszyy.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
3:15 下午

zc.li

修复oracle【清洗区材料类型工作量统计报表】按年份查询报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
12:02 下午

zc.li

优化：ZSSXLRMYY-209 在【清洗区材料类型工作量统计报表】里导出显示优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
12:00 下午

frank.qiu

优化了 ZSSXLRMYY-209 - 在【清洗区材料类型工作量统计报表】里增加柱状图
Options
    • ?
    /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/showEchartsAndTable.jsp
11:54 上午

zc.li

修复：ZSSXLRMYY-209 在【清洗区材料类型工作量统计报表】里导出时，表头不显示的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java
11:15 上午

frank.qiu

解决了 ZJJSRM-54 - 点击查看灭菌历史记录链接，应打开历史灭菌记录的查看界面，目前会打开重新灭菌界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
10:57 上午

zc.li

解决：ZSSXLRMYY-209 在【清洗区材料类型工作量统计报表】里增加柱状图
Options
    • ?
    /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/reportforms/service/ReportFormsManager.java
    • ?
    /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/reportforms/service/ConvertHtml2Excel.java
    • ?
    /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/reportforms/service/CrossRangeCellMeta.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
10:38 上午

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/config/zsxlrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
    • ?
    /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/materialTypeWorkloadReportView.jsp
10:27 上午

LJH

增加 //按机器号+开始时间匹配

sterilizaMatchPatternForDate:true,

//回收界面是否默认上一次的回收人

recyclePageRecyclingUserDefaultLastRecyclingUser : true,

//回收界面是否默认上一次的请点人

recyclePageOperatorDefaultLastOperator : true,

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
10:26 上午

jason

解决jira问题：GDSZYY-88 使用记录模块，外来器械包录入病人使用记录检查包关联的病人信息与使用记录中的病人信息是否一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 29 Apr 2021
4:17 下午

frank.qiu

代码没变，先格式化，方便处理ZSSXLRMYY-209
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
4:15 下午

frank.qiu

代码没变，先格式化，方便处理ZSSXLRMYY-207
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
3:19 下午

jason

解决jira问题：DGZYY-176 东莞中医院 灭菌扫描生物监测包和化学监测包的改进(每炉(第1炉除外))
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
11:33 上午

shuyongfu

解决:FSSZYY-27 PDA回收清点打开部分科室的单据，显示“足够长的测试”，点提交显示系统已停止运行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
11:31 上午

LJH

增加//是否启用“外来器械申请”的桌面图标

desktopShortcutIconsConfig:["外来器械申请"],

//如果一个用户属于多个科室，登录完系统需不需要弹出切换科室选项的小窗

defaultShowOrgChange:true,

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
Wednesday 28 Apr 2021
5:27 下午

jason

解决jira问题：SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
4:38 下午

huang.cl

佛山中医院logo文件提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/img/logo_fsszyy.png
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/img
3:44 下午

frank.qiu

优化了 SZSDSRMYY-51 - 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
Tuesday 27 Apr 2021
5:31 下午

jason

解决jira问题：SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
4:52 下午

frank.qiu

优化了 SZSDSRMYY-51 - 发货计划列表增加待发货物品已灭菌状态背景颜色显示(已灭菌物品科室列显示背景颜色)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
4:41 下午

frank.qiu

优化了 SZSDSRMYY-51 - 发货计划列表增加待发货物品已灭菌状态背景颜色显示(已灭菌物品科室列显示背景颜色)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
2:18 下午

frank.qiu

解决了 FSSZYY-26 - 系统自带的标签模板，7天有效期的物品打出来也有半年框线
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
10:12 上午

zc.li

解决：ZSSXLRMYY-205 质量监测定义里的元素是否在报表显示选的否，但还是会在质量监测项统计月报和质量监测报表里显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Monday 26 Apr 2021
11:47 下午

shuyongfu

解决:XKYY-184 现场发布包升级到4.1最新版

针对sqlserver数据库进行相应的调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_sqlserver.sql
8:40 下午

jason

解决jira问题：SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
8:05 下午

frank.qiu

解决了 SZSDSRMYY-51 - 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    /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/config/szsdsrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
5:48 下午

frank.qiu

解决了 FSSZYY-25 - 谷歌浏览器同步入库单时无法选择类别
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
5:32 下午

frank.qiu

优化ZSSXLRMYY-198：自动加急和手工加急的物品需要对加急颜色进行区分(回收页面的加急增加限制)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
4:51 下午

frank.qiu

解决ZSSXLRMYY-198：自动加急和手工加急的物品需要对加急颜色进行区分
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js