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

Friday 07 May 2021
10:14 上午

jason

解决jira问题：GDSZYY-64 提交一次性物品申请单时需要检查该科室是否已有【打印状态为否，发货状态为待发货，终止状态为空】的申请单(暂存的一次性物品申请单提交时也要检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
9:41 上午

terry.kwan

提交demo项目的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
Thursday 06 May 2021
4:02 下午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:34 下午

zc.li

变量名修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:31 下午

zc.li

解决：DGSDBZXYY-169。清洗情况报表包名称列里有数据显示为null。和单独清洗的材料不查询的问题；
Options
    • ?
    /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/WashAndDisinfectRecordReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml
3:26 下午

frank.qiu

解决了 DGSDBZXYY-168 - 外来器械包定义在IE11版本浏览器上传图片和说明书失败
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js
3:14 下午

frank.qiu

解决了 SSTS-370 - tomcat8下，IE浏览器无法上传聚合包图片，后台报java.lang.IllegalArgumentException: Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
3:10 下午

frank.qiu

解决了 DGSDBZXYY-165 - 满意度调查表选择科室问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp
2:23 下午

jason

解决jira问题：SZYK-37 手麻系统对接，提供数据库视图给手麻系统(如果发货单的物品来源于多张申请单，需要把所有申请单的单号条码都打印出来)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
1:44 下午

jason

解决jira问题：SZYK-37 手麻系统对接，提供数据库视图给手麻系统(如果发货单的物品来源于多张申请单，需要把所有申请单的单号条码都打印出来)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/BatchPrintInvoiceVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoicePrintVo.java
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