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

Saturday 30 Mar 2019
2:27 下午

terrykwan

去掉科室没有绑定的篮筐的提醒信息。GZYKDXFSKQ-31
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
Friday 29 Mar 2019
5:35 下午

yanweining

解决：材料退货记录，退货明细点击删除图标时js报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js
5:17 下午

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能 调整序号

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

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能 调整每页的行数

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

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:39 下午

weizhenyu

ASSJMSZXYY-20

材料出库单的打印格式优化（数量和金额靠右对齐）

对 优化了一下代码

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:29 下午

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
2:29 下午

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js
1:46 下午

weizhenyu

ASSJMSZXYY-20

材料出库单的打印格式优化（数量和金额靠右对齐）

对 加了一些判断和对变量的约束

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

zc.li

解决：SZSSKRMYY-32。解决使用记录录入统计报表只能查询一两行数据，后台报错的问题。优化了查询效率。
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/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
10:23 上午

weizhenyu

ASSJMSZXYY-20：材料出库单的打印格式优化（数量和金额靠右对齐）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
10:22 上午

weizhenyu

ASSJMSZXYY-20：材料出库单的打印格式优化（数量和金额靠右对齐）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
10:18 上午

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordView.jsp
10:15 上午

weizhenyu

ASSGGSRMYY-11

材料退货记录模块增加打印功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js
10:11 上午

weizhenyu

ASSJMSZXYY-20

材料出库单的打印格式优化（数量和金额靠右对齐）

ASSGGSRMYY-11

材料退货记录模块增加打印功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
Thursday 28 Mar 2019
7:22 下午

zc.li

解决：ASSLQYQRZ-11。修复清洗区工作量及不及格月报跟器械包工作量报表中清洗工作量不符合的问题，优化器械包工作量报表中设置统计器械包的数据来源。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
7:19 下午

zc.li

解决：SZSSKRMYY-25.器械包工作量统计报表,消毒供应中心工作量统计报表器械包类型添加聚合包，修改统计方式。修正部分统计列。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
6:14 下午

shuyongfu

处理Jira问题:GDSRMYY-479 满意度调查表功能验证及打印格式优化

解决满意度调查表保存时填表时间为00:00的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
4:24 下午

zengyuan

广东省人民医院 GDSRMYY-479 满意度调查表功能验证及打印格式优化(第5点)即支持单独打印每个科室填写的满意度调查报表（而不是汇总的），报表中的自定义的调查项也必须打印出来。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
10:23 上午

shuyongfu

处理Jira问题:GDSRMYY-479 满意度调查表功能验证及打印格式优化

满意度调查表保存时增加满意度调查数据对象的返回

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
10:11 上午

yanweining

ASSZJYY-3 :灭菌报告问题

1.打印获取更多峰值数据

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
Wednesday 27 Mar 2019
8:26 下午

weizhenyu

GZZYYFY-31：PDA发货一次性物品时增加一键扫描一次性物品功能按钮。是否启用按钮的配置项。

Options
    • ?
    /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.6.68_20190327_v4_1_release.apk
6:53 下午

zengyuan

售后-珠江医院 ASSZJYY-3 灭菌报告问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/echarts-4.2.1/echarts.min.js
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/echarts-4.2.1
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
6:10 下午

yanweining

ASSZJYY-3：灭菌报告问题

1.timer.xml

获取灭菌炉信息接口方法改为1分钟调用

2.XinHuaDataManagerImpl:

新华灭菌炉获取灭菌参数改为,允许多次读取同一个txt文件，直到阶段为结束才把源文件复制到backup文件夹中

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerFileName.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zjyy/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java
5:36 下午

shuyongfu

解决Jira问题:XJJQZYY-49 满意度调查表自定义项目没有保存成功
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
4:41 下午

yanweining

ASSGGSRMYY-22：打印一次性物品退货单的经办人是备注里头的内容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:30 下午

yanweining

ASSGGSRMYY-11:材料退货记录模块增加打印功能

ReturnMaterialRecordAction：新增打印材料退货单接口

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java
11:55 上午

zengyuan

更改关闭按钮大小和颜色
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/magnificPopup/magnific-popup.css
Tuesday 26 Mar 2019
11:08 下午

shuyongfu

语音播报由同步改为异步,解决发货时提示内容较多导致页面慢的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/speaker.js
10:01 下午

shuyongfu

解决:添加灭菌记录、选择灭菌炉后反应慢的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js