forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 67
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 67
Total Lines of Code (LoC): 4,801,740
Net change in LoC this week: 2,371

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
Wednesday 09 Jun 2021
4:05 下午

jason

解决jira问题：GGSRMYY-133 清洗机和灭菌器的属性中增加【使用状态】属性以及增加拖动排序功能
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -1
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
    • -1
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • -0
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -0
    • +43
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
    • -1
    • +4
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.76_4.9.77.sql
    • -0
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
    • -1
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
3:40 下午

frank.qiu

解决了 GGSRMYY-133 - 清洗机和灭菌器的属性中增加【使用状态】属性以及增加拖动排序功能
Options
    • -1
    • +76
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -1
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
    • -0
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -5
    • +82
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js
11:16 上午

frank.qiu

优化 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面(解决IE兼容的问题)
Options
    • -29
    • +8
    /ssts-web/src/main/webapp/js/showUploadImagesForExtWin.js
11:01 上午

frank.qiu

优化 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面(解决IE兼容的问题)
Options
    • -0
    • +7
    /ssts-web/src/main/webapp/js/showUploadImagesForExtWin.js
10:47 上午

frank.qiu

优化 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面(解决IE兼容的问题)
Options
    • -29
    • +16
    /ssts-web/src/main/webapp/js/showUploadImagesForExtWin.js
Tuesday 08 Jun 2021
6:14 下午

jason

解决jira问题：ASSFDZLYY-44 干预一次性物品入库单时，如果入库后系统产生了结算数据，则应不允许干预修改入库单上物品的单价和数量
Options
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
6:01 下午

jason

解决jira问题：ASSFDZLYY-44 干预一次性物品入库单时，如果入库后系统产生了结算数据，则应不允许干预修改入库单上物品的单价和数量
Options
    • -0
    • +4
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
5:32 下午

jason

解决jira问题：ASSFDZLYY-44 干预一次性物品入库单时，如果入库后系统产生了结算数据，则应不允许干预修改入库单上物品的单价和数量
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
5:10 下午

jason

解决jira问题：ZSSXLRMYY-200 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面
Options
    • -2
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
4:52 下午

frank.qiu

解决了 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面（整合了预览图片的代码，包括清洗记录图片，灭菌记录图片，生物监测图片，高值耗材发票图片以及质量监测图片）
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
4:34 下午

jason

解决jira问题：ZSSXLRMYY-200 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面
Options
    • -1
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
4:34 下午

frank.qiu

解决了 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面（整合了预览图片的代码，包括清洗记录图片，灭菌记录图片，生物监测图片，高值耗材发票图片以及质量监测图片）
Options
    • -10
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
4:21 下午

frank.qiu

解决了 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面（整合了预览图片的代码，包括清洗记录图片，灭菌记录图片，生物监测图片，高值耗材发票图片以及质量监测图片）
Options
    • -0
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
2:49 下午

frank.qiu

解决了 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面（整合了预览图片的代码，包括清洗记录图片，灭菌记录图片，生物监测图片，高值耗材发票图片以及质量监测图片）
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/qualitymonitoringView.jsp
2:48 下午

frank.qiu

解决了 ZSSXLRMYY-200 - 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面（整合了预览图片的代码，包括清洗记录图片，灭菌记录图片，生物监测图片，高值耗材发票图片以及质量监测图片）
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/customform/forminstanceView.jsp
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
    • -147
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/showUploadIamge.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js
    • -148
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/showSterilizationUploadIamge.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/qualitymonitoringInstanceForm.js
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp
    • -95
    • +54
    /ssts-web/src/main/webapp/js/showUploadImagesForExtWin.js
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -152
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/showExpensiveGoodsBillUploadIamge.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/showUploadIamge.js
2:14 下午

frank.qiu

优化DGSETYY-3：登记清洗记录时，改进为支持空炉清洗（补充干预清洗记录的场景）
Options
    • -11
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
1:42 下午

jason

解决jira问题：ZSSXLRMYY-200 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面
Options
    • -2
    • +323
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.76_4.9.77.sql
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
Monday 07 Jun 2021
7:12 下午

shuyongfu

解决:GDSZYY-89 从病人信息接口获取手术单号信息，并给使用记录表单的手术单号输入框赋值

处理pda根据诊疗号同步到病人信息号手术单号没有值的问题

Options
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
7:05 下午

shuyongfu

解决:GDSZYY-89 从病人信息接口获取手术单号信息，并给使用记录表单的手术单号输入框赋值

处理pda根据诊疗号同步到病人信息号手术单号没有值的问题

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
4:56 下午

shuyongfu

解决:GDSZYY-89 从病人信息接口获取手术单号信息，并给使用记录表单的手术单号输入框赋值
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210607_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_nologo_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210607_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210607_v4_1_nologo_release.apk
    • -3
    • +3
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_release.apk
4:47 下午

shuyongfu

解决:SSTS-389 PDA修改不追溯物品已扫数量，提示“物品【测试包A】库存不足”
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:46 下午

jason

解决jira问题：GDSZYY-93 外来器械包录入使用记录，将住院号/诊疗号填写到使用记录表单以及核对病人信息时需要去掉前缀
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Friday 04 Jun 2021
7:03 下午

jason

解决：清洗机数据接口不会自动创建backUp文件夹
Options
    • -0
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java
    • -0
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImplForFJSSSYY.java
6:36 下午

jason

解决jira问题：XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持
Options
    • -2
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
6:11 下午

frank.qiu

searchComboTousseData接口添加参数onlySearchCssdHandleTousses
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js
6:03 下午

shuyongfu

解决:GDSZYY-89 从病人信息接口获取手术单号信息，并给使用记录表单的手术单号输入框赋值

DGSRKYY-2 kaicom H702 PDA接口的扫描接口开发

LCXZYY-2 PDA（未知品牌，型号：X5）的扫描接口开发

MMSRMYY-4 PDA程序增加对iData 55 Series型号的支持

SSTS-382 PDA修改一次性物品已扫数量，提示“物品“一次性气囊尿管（20#）”库存不足”

GDSZYY-95 用户登录成功后如果检查密码到不符合复杂度要求，则强制用户修改密码

DGSETYY-3 登记清洗记录时，改进为支持空炉清洗

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +167
    /forgon-tools/src/main/java/com/forgon/tools/json/AESTest.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_release.apk
    • -0
    • +8
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_nologo_release.apk
    • -4
    • +4
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
4:30 下午

jason

解决jira问题：SSTS-387 将福建石狮市医院的个性化定时器（deviceInterfaceDataProcessTimerTaskForFJSSSYY）去掉，改为使用通用的设备接口定时器（deviceInterfaceDataProcessTimerTask
Options
    • -16
    • +46
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
4:25 下午

jason

解决jira问题：ASSFDZLYY-44 干预一次性物品入库单时，如果入库后系统产生了结算数据，则应不允许干预修改入库单上物品的单价和数量
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
3:51 下午

frank.qiu

解决了 XKYY-190 - PC端的退货功能增加对外部代理灭菌包的支持（ 2. 外部代理灭菌包退货时不需要显示“是否重装”和“是否重发”按钮）
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
3:31 下午

zc.li

回收代码整理，删除无用代码，便于后续写测试用例
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java