forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
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
Tuesday 24 Mar 2020
12:34 下午

shuyongfu

针对 GDSRMYY-523 软件版本4.6.89的app扫描发货计划单上的条码直接停止工作,SZSDSRMYY-8待发货物品颜色状态显示 这两个问题增加未扫码时的已灭菌状态的默认蓝色背景色，版本号4.6.90不变
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.90_20200323_v4_1_release.apk
    • ?
    /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.90_20200324_v4_1_release.apk
Monday 23 Mar 2020
5:00 下午

shuyongfu

解决:GDSRMYY-523 软件版本4.6.89的app扫描发货计划单上的条码直接停止工作
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.90_20200323_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
12:41 下午

frank

解决ASSZDFY-51:自定义装配界面，灭菌日期的时间自动刷新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
10:12 上午

frank

解决GDSRMYY-522:器械包信息中无法正常废弃器械包，点击废弃按钮后界面空白
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
8:55 上午

zc.li

报表优化ASSZDFY-58,ASSZDFY-59,ASSZDFY-61,ASSZDFY-60。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.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/yearWorkloadReport2.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jasper
    • ?
    /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/test/java/test/forgon/disinfectsystem/reports/dataindex/DataIndexTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • ?
    /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/jasperRtp/useRecordItemViewSub.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
Friday 20 Mar 2020
8:14 下午

frank

解决GDSRMYY-521:低分辨率电脑无法正常显示打印发货计划-器械包分组打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseGroup.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
7:18 下午

frank

解决GDSRMYY-521:低分辨率电脑无法正常显示打印发货计划-器械包分组打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseGroup.jsp
6:58 下午

frank

解决GDSRMYY-521:低分辨率电脑无法正常显示打印发货计划-器械包分组打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
11:09 上午

jason

解决jira问题：ZSYY-261 中山一院消毒供应项目 灭菌记录增加扫描监测包功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ItemDefinitionVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
9:36 上午

frank

解决ZSYY-261:灭菌保存的时候添加一个生物包监测码的参数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
Thursday 19 Mar 2020
7:53 下午

frank

解决ZSYY-261：生物监测包条码支持自定义标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.jsp
    • ?
    /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/labelTemplateDesign/dataSource.js
1:53 下午

jason

解决jira问题：ZSYKZX-118 中山大学中山眼科中心 同步组织机构时，增加参数控制是否自动添加相关配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
11:19 上午

frank

解决ZSYY-261:灭菌记录页面多了逗号在IE8打不开的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
Wednesday 18 Mar 2020
5:09 下午

jason

解决jira问题：GGSRMYY-122 贵港市人民医院 一次性物品入库时更改价格后，在科室申领处看见的还是更改之前的价格。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
4:34 下午

jason

解决jira问题：GGSRMYY-118 贵港市人民医院 退货重发的器械包，在发货管理里打印第一次不会显示该器械包，第二次会显示，退货重发的消毒物品，在发货管理里打印始终无法显示该消毒物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:52 下午

frank

解决ZSYY-261:灭菌记录增加扫描监测包功能(1，灭菌管理模块的视图列表的工具栏显示打印监测包条码按钮；2，灭菌记录的登记表单显示生物监测包文本框；3，灭菌炉管理显示监测包扫描提示默认值选项；4，灭菌记录保存时添加扫描监测包限制)
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
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
9:30 上午

frank

解决SZNSRMYY-22:发货物品查询报表的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.jsp
Tuesday 17 Mar 2020
7:54 下午

jason

解决jira问题：GGSRMYY-122 贵港市人民医院 一次性物品入库时更改价格后，在科室申领处看见的还是更改之前的价格(申请模板一次性物品单价)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
2:11 下午

jason

解决jira问题：ZYYFS-132 中医药附三消毒供应系统 消毒供应中心物品领用单在干预管理里删除失败(优化谷歌浏览器的界面显示)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
Monday 16 Mar 2020
11:48 下午

terrykwan

解决FSFY-66 打印器械包明细和发货单时默认打印机和非默认打印机打印格式不一致

通过Lodop API设置了打印纸张的大小，宽度为65mm，高度设置为了自适应高度

Options
    • ?
    /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/config/fsfy/print/printConfig.js
9:28 下午

terrykwan

解决FSFY-66 打印器械包明细和发货单时默认打印机和非默认打印机打印格式不一致

通过Lodop API设置了打印纸张的大小，高度设置为了自适应高度

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

shuyongfu

解决:GYEY-743一次性物品结算明细报表增加供应商列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/MonthGoodsDetailVo.java
2:30 下午

shuyongfu

解决:GYEY-743一次性物品结算明细报表增加供应商列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/stocktakereport_includesupplier.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/stocktakereport_includesupplier.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
    • ?
    /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/disinfectsystem/config/gyey/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
2:27 下午

frank

解决DGSFYBJY-35:IE8优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
2:26 下午

zc.li

完善：HZSRMYY-46：灭菌情况报表里的时间选项兼容ie浏览器。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
12:36 下午

jason

广医二院发货管理发货单打印时增加返回签收人(receiptor)、签收时间(receiptingTime)两个属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
12:34 下午

frank

解决SZNSRMYY-22:IE8优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/log/loggrid.js
Friday 13 Mar 2020
10:23 下午

shuyongfu

解决:GGSRMYY-123已灭菌的敷料包在辅助发货不显示。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js
9:44 下午

shuyongfu

解决:QYSRMYY-22 第一次登录是否需要强制修改密码的参数不生效。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
5:10 下午

frank

解决SZNSRMYY-22:页面适应性修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/log/loggrid.js