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
Thursday 07 Nov 2019
5:53 下午

yuandongxiao

selenium代码提交：自动化测试用例拆分（回收模块、清洗模块）
Options
    • -0
    • +86
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/tools/TestUtils.java
    • -0
    • +181
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestForeignTousseApplicationRecycled.java
    • -0
    • +44
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/factory/WaitFactory.java
    • -0
    • +258
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/tools/Path.java
    • -0
    • +667
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestComboApplicationRecycled.java
    • -0
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/AllTests.java
    • -0
    • +319
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/login/Login.java
    • -0
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/tools/LoginUtil.java
    • -0
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/wash/AllTests.java
    • -0
    • +98
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestRecycled.java
  11. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle
  12. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/login
    • -0
    • +166
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestDisinfectGoodApplicationRecycled.java
    • -0
    • +175
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestCustomApplicationRecycled.java
    • -0
    • +185
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/tools/SeleniumRuntimeData.java
  16. … 11 more files in changeset.
4:31 下午

shuyongfu

解决:GGSRMYY-112

灭菌装载和灭菌记录扫描灭菌入炉时，扫描不同灭菌方式的物品时的提示方式改为弹框

pda安装包重新打包

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.85_20191107_v4_1_release.apk
4:02 下午

shuyongfu

解决:GGSRMYY-112

灭菌装载和灭菌记录扫描灭菌入炉时，扫描不同灭菌方式的物品时的提示方式改为弹框

新提交pda安装包与在线升级配置文件

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.85_20191107_v4_1_release.apk
2:06 下午

shuyongfu

解决:GGSRMYY-112

灭菌装载和灭菌记录扫描灭菌入炉时，扫描不同灭菌方式的物品时的提示方式改为弹框

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
1:59 下午

shuyongfu

解决:GGSRMYY-112

灭菌装载和灭菌记录扫描灭菌入炉时，扫描不同灭菌方式的物品时的提示方式改为弹框

Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -6
    • +9
    /forgon-core/src/main/java/com/forgon/security/tools/CssdUtils2.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +18
    /forgon-tools/src/main/java/com/forgon/exception/SterilingModeNotTheSameException.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +52
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • -16
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -0
    • +13
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -1
    • +14
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • -37
    • +64
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +11
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
    • -0
    • +17
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
  16. … 8 more files in changeset.
1:41 下午

jason

解决jira问题：广东省人民医院GDSRMYY-513 通过省医集成平台和大成手麻做器械包字典信息接口和消毒包使用信息接口，用webservice方式和大成手麻系统做消毒包信息接口(单点登陆)
Options
    • -1
    • +2
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-dysyy.xml.back
1:38 下午

jason

解决jira问题：北京大学肿瘤医院BJDXZLYY-3 HIS单点登录接口开发
Options
    • -1
    • +1
    /ssts-web/build.gradle
    • -1
    • +1
    /build.gradle
    • -0
    • +128
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-bjdxzlyy.xml.back
Tuesday 05 Nov 2019
10:46 上午

shuyongfu

解决:ASSDGSZYY-74 外来器械包录入使用记录审核并转换成申请单之后包定义多一条同名记录
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Monday 04 Nov 2019
3:45 下午

zc.li

处理：ASSDGSZYY-73。明细核算月报消毒物品器按材料统计结果不正确的问题。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:24 上午

shuyongfu

解决:GGSRMYY-114 增加科室使用模块

解决只有"科室使用记录"权限时,使用记录模块未显示的问题

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
Friday 01 Nov 2019
8:16 下午

jason

解决jira问题：德阳市人民医院DYSYY-53 二期合同接口开发
Options
    • -0
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
    • -0
    • +4
    /ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his.xml
    • -0
    • +10
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java
    • -0
    • +58
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncDataFromHIPDao.java
    • -0
    • +26
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java
    • -0
    • +281
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java
    • -0
    • +1
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
    • -0
    • +21
    /ssts-web/src/main/resources/spring/projects/dysyy/webservice-cxf.xml
    • -0
    • +19
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebService.java
    • -0
    • +508
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java
  11. /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy
    • -0
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
    • -0
    • +214
    /ssts-web/src/main/webapp/logonSSOForDysyy.jsp
    • -0
    • +1
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
2:01 下午

shuyongfu

解决:

GGSRMYY-114 增加科室使用模

GDSRMYZHYY-7 PDA科室切换按钮改进

pda更新包,版本由4.6.83升级为4.6.84

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.84_20191101_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:47 上午

shuyongfu

解决:GGSRMYY-114 增加科室使用模块

高级视图页面的左边菜单代码进行了优化整合

Options
    • -2
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
    • -1
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -50
    • +78
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -0
    • +8
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • -70
    • +85
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -8
    • +21
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -3
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • -20
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
    • -98
    • +130
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
Thursday 31 Oct 2019
3:03 下午

zc.li

删除不使用的代码
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
2:41 下午

zc.li

上传配包视频代码优化
Options
    • -9
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
2:28 下午

zc.li

审核代码优化
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:23 下午

zc.li

解决：ASSFSFY-17。器械包审核之后今天本组装配记录中的审核人字段不会联动更新。
Options
    • -0
    • +6
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:29 上午

zc.li

解决：GDSRMYZHYY-5。发货物品统计月报增加全部灭菌程序并且可以多选灭菌程序，调整报表格式。
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jasper
    • -14
    • +22
    /ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml
11:14 上午

zc.li

完善：ASSKPSZXYY-19。移动K文件时，K文件不存在会报错的问题。
Options
    • -2
    • +12
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
Wednesday 30 Oct 2019
8:31 下午

yk

北京大学肿瘤医院发布包
Options
    • -1
    • +1
    /build.gradle
7:25 下午

zengyuan

广州市第八人民医院GZSDBRMYY-15 回收清点界面的篮筐列表可以通过选择的方式对篮筐重新置顶作为优先载入篮筐 修改参数名
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:33 下午

zc.li

解决发货单物品列表查询慢的问题(invoice2_id添加索引)
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
4:37 下午

zc.li

完善：ASSKPSZXYY-19。完善读取倍力曼文件保存时间时有末尾有空格的情况。
Options
    • -26
    • +22
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
4:08 下午

zc.li

完善：ASSKPSZXYY-19。灭菌记录的灭菌器参数曲线图x轴数据不正确；
Options
    • -1
    • +4
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
4:07 下午

zc.li

完善：ASSKPSZXYY-19。灭菌记录的灭菌器参数曲线图x轴数据不正确；倍力曼移动C开头文件时，一并移动对应的K开头文件。
Options
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManagerImpl.java
    • -0
    • +12
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManager.java
    • -3
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManager.java
3:47 下午

jason

解决jira问题：ASSFSFY-16 器械包信息和今日本组装配记录的器械包名称文本框，不能通过拼音码检索到包名后填入文本框
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:10 下午

zengyuan

广州市第八人民医院GZSDBRMYY-15 回收清点界面的篮筐列表可以通过选择的方式对篮筐重新置顶作为优先载入篮筐
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:27 上午

zc.li

解决：ASSKPSZXYY-19。系统更新后，灭菌记录的灭菌器参数不显示。（文件内容的时间格式与中六不一致）
Options
    • -20
    • +7
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
10:39 上午

zengyuan

售后-珠江医院ASSZJYY-4 外来器械自定义入筐双击装载入筐弹窗的“确认”按钮入筐数量翻倍 修改代码不合理的地方
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
9:57 上午

LJH

由于现场发货业务调整 开启辅助发货配置

//是否显示辅助发货按钮

showAuxiliaryInvoiceBtn : true,

Options
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/szsnsqxlrmyy/config.js