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
Wednesday 15 May 2019
2:42 下午

zengyuan

加急功能：加急级别，科室申领，回收，装配，以及其他config.js的配置项修改
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -2
    • +0
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/config.js
    • -13
    • +104
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -8
    • +189
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -14
    • +104
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -29
    • +169
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -33
    • +70
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp
    • -2
    • +153
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:08 下午

zc.li

解决：GZYKDXFSKQ-48，GZZYYFY-52。新增限制入筐的消毒物品不能修改消毒物品材料，要先把要修改的消毒物品从篮筐中删除才可以修改。

保存回收记录的时候，修改包的材料定义。

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
1:51 下午

zc.li

提交后台代码
Options
    • -1
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -3
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
    • -1
    • +28
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • -1
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -3
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -0
    • +11
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • -0
    • +33
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -3
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
  16. … 16 more files in changeset.
9:53 上午

yanweining

加急功能：

1）审核打包后台获得加急信息

2）灭菌装载后台获得加急信息

3）灭菌管理后台获得加急信息

4）灭菌记录增加、删除加急器械包时，需要联动修改灭菌记录的加急状态。干预灭菌记录时，如果该记录关联的加急包有变化，也需要修改灭菌记录的加急状态

Options
    • -8
    • +17
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -1
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -7
    • +17
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -3
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
    • -0
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
9:28 上午

yanweining

加急功能：器械包实例,灭菌记录添加关联加急对象
Options
    • -4
    • +33
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -0
    • +58
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/vo/UrgentLevelVo.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -3
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
    • -0
    • +14
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/vo/TousseInstanceVo.java
  6. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/vo
Tuesday 14 May 2019
9:02 下午

shuyongfu

李伟20190508新疆军区总医院现场配置文件
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
    • -30
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -2
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
8:46 下午

shuyongfu

陈翠婷20190313发回来的东莞康华医院现场配置文件
Options
    • -2
    • +14
    /ssts-web/src/main/resources/config/dgskhyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
8:43 下午

shuyongfu

赖家豪20190313发回来的深圳南山人民医院现场配置文件
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
5:30 下午

zengyuan

修改配置项拼写错误
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
3:06 下午

jason

no_comment
Options
    • -0
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
9:53 上午

zengyuan

提交桂港启用加急功能的配置项
Options
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
Monday 13 May 2019
6:39 下午

jason

解决jira问题：GZSDBRMYY-13 材料发货增加包定义作为关联(发货单打印 增加器械包名称作为显示)
Options
    • -0
    • +25
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoicePrintVo.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzsdbrmyy/print/printConfig.js
    • -1
    • +15
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
    • -22
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
    • -2
    • +8
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java
3:32 下午

shuyongfu

解决Jira问题:ZSYY-263 手术仪器管理的发货时可以切换目的位置（PDA）
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.75_20190513_v4_1_release.apk
11:41 上午

shuyongfu

解决Jira问题:ZSYY-265 辅助发货功能改造

包定义的隐藏辅助发货默认选项改为"否"

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Friday 10 May 2019
3:22 下午

jason

解决jira问题：GZSDBRMYY-13材料发货增加包定义作为关联
Options
    • -0
    • +30
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -0
    • +42
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -0
    • +16
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -20
    • +180
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
11:12 上午

yk

深圳肿瘤医院发布包
Options
    • -1
    • +1
    /build.gradle
10:09 上午

shuyongfu

解决Jira问题:ZSYY-265 辅助发货功能改造

更新后的项目针对已经建好的角色权限都默认赋予"辅助发货"

Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • -0
    • +5
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.32_4.9.33.sql
9:27 上午

shuyongfu

解决Jira问题:DGZYY-155 辅助发货查询数据过多会超时没有显示

ZSYY-265 辅助发货功能改造

Options
    • -1
    • +9
    /ssts-web/src/main/webapp/js/common.js
9:26 上午

shuyongfu

解决Jira问题:DGZYY-155 辅助发货查询数据过多会超时没有显示

Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +15
    /forgon-tools/src/main/java/com/forgon/tools/db/DatabaseUtil.java
    • -9
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
    • -3
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -13
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Thursday 09 May 2019
4:00 下午

zengyuan

加急图标
Options
    • binary
    /ssts-web/src/main/webapp/images/web/urgent-red.png
2:07 下午

zengyuan

加急黄色图标
Options
    • binary
    /ssts-web/src/main/webapp/images/web/urgent-yellow.png
Wednesday 08 May 2019
8:54 下午

yuandongxiao

自动化测试代码提交，解决问题：

1.升级selenium到3.141.59

2.加入monteScreenRecorder视频录制

3.一次性物品不能成功入库的问题

4.申请外来器械时不能稳定编辑表单的问题

5.不能成功申请自定义器械包的问题

6.自定义入筐不能点开新窗口的问题

7.灭菌时灭菌目的不能成功输入的问题

Options
    • -4
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Regular_Monitor.java
    • -4
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
    • -4
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Login.java
    • -3
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/GdsyApplyTest.java
    • -4
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • binary
    /localrepo/org.seleniumhq.selenium/selenium-server-standalone/3.141.59/selenium-server-standalone-3.141.59.jar
    • -3
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/ApplyTest.java
    • -4
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Reject.java
    • -4
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Disinfection.java
    • -3
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/apply/ApplyTest.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java
    • -4
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Set_manager.java
    • -4
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium2/Review.java
    • -9
    • +30
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • -4
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/ComboApplyTest.java
  16. … 39 more files in changeset.
8:24 下午

zc.li

完善：GGSRMYY-82。核算月报格式选择固定，不允许自定义。
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
8:16 下午

zc.li

解决：GGSRMYY-82。核算月报改为支持新旧两种模式。不在通过配置项applyMonthReportOnlyPriceTemplate设置，配置项applyMonthReportOnlyPriceTemplate删除。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • -1
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
6:29 下午

shuyongfu

解决Jira问题:XMDXFSXAYY-6 用户登录名太长，使用PDA扫描标签条码登录系统时会报错

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
3:59 下午

zc.li

解决：GGSRMYY-81。科室申领的借物单列表，增加查看收费单功能。
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
3:10 下午

zc.li

广医二院，中山眼科中心config.js添加生物阅读器相关配置。（enableBioreaderInterface：true）
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
11:25 上午

jason

解决“发货管理”页面，“器械包退货”报错问题
Options
    • -1
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
    • -1
    • +9
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
9:22 上午

jason

解决jira问题：GZZYYFY-49 物品签收增加消毒物品类型
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
9:20 上午

shuyongfu

解决Jira问题:

ZSYY-266 器械包信息列表的回收时间取值错误

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java