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

Friday 08 Mar 2019
4:17 下午

shuyongfu

解决Jira问题:STDXYXYFSZ-6 系统上所有报表都要可以导出成WEB、EXCEL、PDF 格式

增加itextpdf jar的依赖配置

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
  2. /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/itextpdf
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportHtmlReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportPdfReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/itextpdf/ExcelToPdf.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportReport.jsp
4:05 下午

terrykwan

返回材料类型给前端，用于快速入筐按材料类型过滤。 XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:53 下午

zc.li

解决：STDXYXYFSZ-6。系统报表提供导出成WEB格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/exportHtmlReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp
2:36 下午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-42 发货计划发货界面，增加扫码切换科室功能以及直接输入“999999999”以后，清空输入框
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
12:08 下午

LiHaiFeng

修改快速入筐器械包入筐之后不能清点确认
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:38 上午

LiHaiFeng

修改快速入筐问题：器械包全部入筐不能做清点确认、快速入筐回收数量弹窗数量问题、多单保存时进度条不关闭
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
10:37 上午

yanweining

4.9.29_4.9.30:orcale升级语句更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_oracle.sql
12:25 上午

terrykwan

增加聚合包发货时的提示信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Thursday 07 Mar 2019
10:31 下午

terrykwan

增加扫描科室条码，返回给前台的科室信息。GZYKDXFSKQ-42
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
7:26 下午

LiHaiFeng

快速入筐增加判断材料类型和篮筐类型，回收数量修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
7:09 下午

terrykwan

增加科室编码的属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
7:01 下午

terrykwan

增加扫描科室条码，返回给前台的科室信息。解决gson转换的空指针问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
5:45 下午

zc.li

解决：ASSGXZYY2-13。修复工作质量持续统计报表跟器械包工作量统计报表中外来器械清洗件数相差很大的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
5:39 下午

zc.li

解决：ZSYKZX-108。1：整年搜索新增对各个指标年度合计,2：按灭菌炉分组细分普通灭菌和代理灭菌。3：修复部分数据不统一的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/BaseUtils.java
3:35 下午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮 修复辅助发货不能发货的问题和增加光标定位
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:31 下午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮 修复辅助发货不能发货的问题和增加光标定位
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js
3:26 下午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮 修复辅助发货不能发货的问题和增加光标定位
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
Wednesday 06 Mar 2019
3:25 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
2:15 下午

yanweining

解决：、一次性物品退货失败报错：Format specifier '%s'
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
2:00 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
1:57 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
Tuesday 05 Mar 2019
3:55 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复缺少文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/tousseQualityMonitoring.jsp
3:35 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复扫描责任人条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/tousseQualityMonitoring.jsp
3:33 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复扫描责任人条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/tousseQualityMonitoring.jsp
2:18 下午

yanweining

GZZYYFY-28：自定义器械包增加包定义的默认值设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:34 上午

yanweining

GDSRMYY-474：器械包定义修改的日志记录优化
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-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodsInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
11:30 上午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
11:29 上午

zengyuan

深圳市肿瘤医院 SZSZLYY-20 仪器图谱增加登记材料质量监测录入功能 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussePictures/tousseQualityMonitoring.jsp
11:14 上午

weizhenyu

GZYKDXFSKQ-32：增加了一个配置项，以确定是否启用异常物品列表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:02 上午

shuyongfu

解决Jira问题:SZSZLYY-18 灭菌记录添加时进行每天提醒的灭菌程序检查（PDA优先）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.66_20190304_v4_1_release.apk