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 05 Apr 2019
4:44 下午

terrykwan

删除几个不需要的测试用例类
Options
  1. /ssts-web/src/test/java/test/forgon/security
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestInvoiceItem.java
  3. /ssts-web/src/test/java/test/forgon/junit4
  4. /ssts-web/src/test/java/test/forgon/security/acl
    • -25
    • +0
    /ssts-web/src/test/java/test/forgon/junit4/MyTest1.java
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/junit4/Junit4MultiTest.java
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/junit4/Junit4Test.java
Thursday 04 Apr 2019
9:59 下午

zc.li

解决：ASSGGSRMYY-25。解决消毒供应中心运作监控查到器械包回收和发货数量跟器械包工作量统计报表不一致的问题。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -1
    • +3
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -1
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -1
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
9:16 下午

zc.li

代码优化
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -113
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.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
6:00 下午

shuyongfu

解决Jira问题:XJJQZYY-68 满意度调查表增加查看未填写科室按钮
Options
    • -1
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.js
    • -0
    • +80
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTemplateAction.java
    • -3
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManager.java
    • -12
    • +3
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • -12
    • +18
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java
    • -3
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManager.java
5:58 下午

shuyongfu

解决:GZZYYFY-31 PDA发货一次性物品时增加一键扫描一次性物品功能按钮

一键扫描一次性按钮的隐藏与否的补充

版本号调整为4.6.70,提供给某些4.6.69版本进行此功能的更新

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
5:21 下午

weizhenyu

GZZYYFY-35:装配界面的打印回收清单格式改进
Options
    • -18
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
4:11 下午

zc.li

完善：GDSZYY-2。对器械包，敷料包，消毒物品，外部代理灭菌申请，回收时使用资产归属过滤。
Options
    • -0
    • +114
    /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/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:04 下午

zc.li

代码优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
3:01 下午

yanweining

GDSZYY-2：包定义增加资产归属管理

1】器械包定义新增字段：

belongDepart：所属科室(可多选)

2】config.js新增配置项：

//是否启用器械包定义所属科室过滤(默认为false不启用)

enableTousseDefinitionBelongDepartFilter: true,

//器械包定义是否显示所属科室属性(默认为false不显示)

showTousseDefinitionBelongDepart:true

3】增加权限管理：是否查看所有科室所属器械包定义

4】器械包定义页面显示：新增过滤条件

1.有权限：是否查看所有科室所属器械包定义

则：不需按所属科室过滤

2.无权限：是否查看所有科室所属器械包定义

则：1）需要按当前登录用户科室过滤器械包定义所属科室

2）若当前登录用户为一级供应室则：增加条件：显示所属科室为空的器械包定义

Options
    • -0
    • +241
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -0
    • +55
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +24
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • -2
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
2:39 下午

shuyongfu

解决Jira问题:GDSRMYY-487 回收清点进入快速回收界面时，不能扫描十位数的清洗篮筐条码
Options
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
12:19 下午

zc.li

完善：XJJQZYY-70。修改职称设置的所处的位置，前移。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
12:15 下午

zc.li

完善：GDSRMYY-488。容器清洗类型为空时，也给classifyBasket的清洗类型赋值。
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
11:54 上午

shuyongfu

解决:GZZYYFY-31 PDA发货一次性物品时增加一键扫描一次性物品功能按钮

一键扫描一次性按钮的隐藏与否的补充

版本号调整为4.6.70,提供给某些4.6.69版本进行此功能的更新

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.70_20190403_v4_1_release.apk
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:22 上午

zc.li

注释修改
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/staffArchives/action/StaffArchiveAction.java
10:21 上午

zengyuan

新疆军区总医院 XJJQZYY-60外来器械包拆包增加检查人字段 修改配置项命名
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
1:59 上午

terrykwan

将testng的api修改为Junit
Options
    • -9
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
1:09 上午

shuyongfu

解决Jira问题:ASSGGSRMYY-26 回收时系统提醒还物后点击是，生成的回收申请单中归还物品回收数量不对
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
12:19 上午

terrykwan

改为JUnit运行测试用例
Options
    • -20
    • +10
    /ssts-web/build.gradle
Wednesday 03 Apr 2019
11:11 下午

terrykwan

解决如下问题：1、解决辅助发货正在做生物监测的物品添加没有提示；2、PC端发货计划，灭菌筐生物监测不合格，扫物品正常，扫篮筐没有阻止发货等问题。 SZSZLYY-23
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
9:44 下午

yanweining

时间工具类补充：根据给定的时间格式，把String型转成Date类型

包含yyy/mm/dd h:mm:ss 等格式

Options
    • -0
    • +23
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
8:23 下午

zc.li

解决：GDSRMYY-488。入清洗篮筐时提示缺少装载【平面类】类型的篮筐的问题。
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
7:19 下午

zengyuan

新疆军区总医院 XJJQZYY-70 人员档案管理，职称改为组合框
Options
    • -14
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/staffArchives/staffArchiveForm.js
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
5:39 下午

weizhenyu

GZZYYFY-35:装配界面的打印回收清单格式改进
Options
    • -1
    • +272
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
4:27 下午

zc.li

处理：XJJQZYY-70。参数设置页面添加职称设置，后台提供接口获取职称数据。
Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -2
    • +3
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -2
    • +8
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -1
    • +4
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/staffArchives/action/StaffArchiveAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
4:10 下午

zengyuan

新疆军区总医院 XJJQZYY-60外来器械包拆包增加检查人字段
Options
    • -7
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
1:12 上午

terrykwan

提示消息加上器械包的条码。 SZSZLYY-23
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
1:11 上午

terrykwan

解决自定义发货没有生物监测结果提醒的问题SZSZLYY-23
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
Tuesday 02 Apr 2019
9:40 下午

weizhenyu

审核打包，打开质量检测后再点击审核会报错的问题
Options
    • -0
    • +2810
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js
9:40 下午

weizhenyu

审核打包，打开质量检测后再点击审核会报错的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
8:59 下午

yanweining

GZSDBRMYY-1：科室人员导入导致科室编码重复的问题

1.新写了人员，科室导入excel的方法

2.新的人员，科室excel导入模板

3.导入页面显示成功失败的信息

Options
    • -15
    • +56
    /forgon-core/src/main/java/com/forgon/directory/controller/UserImportController.java
    • -39
    • +257
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
    • -1
    • +54
    /ssts-web/src/main/webapp/common/commonImport.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/userAndOrgUnitDemo.xls
    • -1
    • +11
    /forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • -9
    • +9
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/Constants.java
    • -1
    • +14
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/directory/service/SysUserManager.java
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java