forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 22 Feb 2019
8:39 下午

zc.li

修复：XJJQZYY-41。修复拆包后数据不正常的问题。

解决：XJJQZYY-39。在“消毒供应中心质量监测报表”中增加生物监测统计报表，目前仅仅xjjqzyy配置。

Options
    • -11
    • +17
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport-xjjqzyy.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport-xjjqzyy.jasper
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +9
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +68
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalStatementOfBiologicalMonitoringView.jsp
    • -0
    • +9
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +2
    /forgon-core/src/main/java/com/forgon/security/bean/ModuleOperationMapping.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/biologicalMonitoringReport.jasper
    • -6
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseApplicationVO.java
    • -0
    • +232
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalStatementOfBiologicalMonitoringView.js
    • -39
    • +67
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
    • -0
    • +112
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/BiologicalMonitoringReportVo.java
    • -0
    • +231
    /ssts-web/src/main/webapp/jasperRtp/biologicalMonitoringReport.jrxml
3:44 下午

shuyongfu

解决Jira问题:XJJQZYY-48 有标识牌的物品不扫描标识牌也能回收
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
Thursday 21 Feb 2019
11:21 上午

zc.li

解决：XJJQZYY-41。1.报表名称“外来器械申请单统计报表”改为“外来器械申请统计报表”；2.增加装配时间，器械重量(公斤)，消毒费用，物品件数，是否含有植入物，包装者，核对者等列； 3.增加装配开始结束时间的查询过滤条件；4.如外来器械包拆分为多个小包，则将物品名称字段分开多行显示，其余字段合并显示；5.按客户要求修改了报表格式。
Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu
    • -0
    • +178
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
    • -0
    • +752
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -0
    • +550
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport-xjjqzyy.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +84
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseApplicationVO.java
  7. /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport-xjjqzyy.jasper
    • -0
    • +90
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.jsp
    • -0
    • +374
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js
11:15 上午

zc.li

修复外来器械申请报表点击重置按钮出错的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
11:03 上午

zc.li

完善：XJJQZYY-26。装配时未配置显示重量下拉框时，使用包定义中的重量，否则使用下拉框的重量
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Wednesday 20 Feb 2019
10:20 下午

terrykwan

优化注释信息
Options
    • -2
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -1
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
7:33 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能 修改提示框自动隐藏
Options
    • -2
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
6:44 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
6:40 下午

zengyuan

下拉框插件
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-migrate-1.2.1.js
6:38 下午

zengyuan

下拉框插件
Options
    • -10
    • +5
    /ssts-web/src/main/webapp/dx-disinfectsystem/plugins/jquerySexyCombo/jquery.sexy-combo.js
6:14 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/toussePictures.png
6:08 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -0
    • +2
    /ssts-web/src/main/resources/systemset/portalPage.xml
6:03 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -8
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
5:58 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -0
    • +141
    /ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/toussePictures/dowm.png
  3. /ssts-web/src/main/webapp/disinfectsystem/toussePictures
5:54 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/homepage/portalPage.js
5:47 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-13 增加图谱功能
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js
3:38 下午

terrykwan

增加根据标识牌的条码，查询包定义的名字和id。SZSZLYY-13 增加图谱功能
Options
    • -3
    • +39
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
3:14 下午

terrykwan

增加非空检查代码
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
Tuesday 19 Feb 2019
8:57 下午

zc.li

部分解决：GZZYYFY-25。解决问题1：外来器械材料的清洗归类到外来器械项。问题2未处理，需求不明确。
Options
    • -1
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
8:24 下午

zc.li

完善兼容性：XJJQZYY-42。调整在各个分辨率下FormPanel控件的高度，避免任务组不显示。
Options
    • -4
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp
6:47 下午

yanweining

一次性物品同步入/退库：完善注释，返回的错误信息
Options
    • -161
    • +133
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -70
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
    • -4
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dwr/InventoryTableManager.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
5:53 下午

LiHaiFeng

修改快速入筐回收数量统计
Options
    • -20
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
4:57 下午

shuyongfu

删除错误提交的apk更新包
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.54_20181126_v4_1_debug.apk
4:54 下午

shuyongfu

解决Jira问题:GZZYYFY-15 一次性物品增加固定条码使用功能

pda使用记录的一次性物品数据修改问题处理

同时版本号调整为4.6.63,包含以下新开发的功能:

器械包发货遵循先失效先发货原则

pda增加一次性物品固定条码发货功能

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.63_20190219_v4_1_release.apk
4:38 下午

terrykwan

根据包实例的条码，即输入器械包外标签的条码，返回包定义的JSON对象
Options
    • -0
    • +33
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
4:26 下午

shuyongfu

解决Jira问题:GZZYYFY-15 一次性物品增加固定条码使用功能

pda使用记录的一次性物品数据修改问题处理

同时版本号调整为4.6.63,包含以下新开发的功能:

器械包发货遵循先失效先发货原则

pda增加一次性物品固定条码发货功能

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.54_20181126_v4_1_debug.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
Monday 18 Feb 2019
10:18 下午

zengyuan

新疆军区总医院 XJJQZYY-26 外来器械增加重量字段 优化代码
Options
    • -6
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
7:24 下午

LiHaiFeng

更换快速入筐背景图/调整尺寸
Options
    • -1580
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionInthaBox.js
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/express_into_basket.jpg
    • -243
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionInthaBox.jsp
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css
7:05 下午

LiHaiFeng

添加快速入筐页面
Options
    • -0
    • +1647
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
    • -0
    • +241
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.jsp
7:01 下午

LiHaiFeng

替换文件路径expressIntoBasket.jsp
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp