forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 63
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 63
Total Lines of Code (LoC): 4,800,943
Net change in LoC this week: 2,958

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 10 Dec
11:35 上午

jason

解决jira问题：GDSZYY-270【接口对接】【发货计划】【退货管理】带CHAS管控标识一次性物品发货、退货时向“CHAS与低值耗材的接口”推送领用、退回信息。
Options
    • -0
    • +410
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/ChasDisposableGoodsPushDaoImpl.java
    • -0
    • +96
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +6
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/disposableGoodsChas.xml
    • -0
    • +63
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dto/ChasDisposableGoodsDto.java
  7. /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dto
    • -0
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +40
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/ChasDisposableGoodsPushDao.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • too large
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +19
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/controller/DisposableGoodsController.java
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
  16. … 3 more files in changeset.
11:19 上午

frank.qiu

解决了 GDSFYBJY-42 - 【回收清点】科室快速回收新增多项改进(加急、添加物品、快速删除、入筐优化、支持标识牌、拆单优化)(提交第一到第五点改进)
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js
11:19 上午

einstein.kang

GDSFYBJY-28 拆单返回信息为空时，清空之前记录的数据
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:57 上午

zc.li

GDSFYBJY-42 - 【回收清点】科室快速回收新增多项改进(加急、添加物品、快速删除、入筐优化、支持标识牌、拆单优化)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:57 上午

zc.li

GDSFYBJY-42 - 【回收清点】科室快速回收新增多项改进(加急、添加物品、快速删除、入筐优化、支持标识牌、拆单优化)
Options
    • -0
    • +41
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressRecyclingVo.java
9:51 上午

einstein.kang

GDSFYBJY-28 回收申请单在获取参数之前先检查是否会拆单，解决用户在关闭拆单提醒后又增加新物品而没有考虑新加物品的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
Tuesday 09 Dec
6:51 下午

zc.li

GDSFYBJY-44 【装配管理】待装配任务列表的清洗时间与回收时间两字段增加时间筛选功能
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:24 下午

frank.qiu

解决了 GDSFYBJY-45 - 清洗消毒、灭菌管理、装配管理、器械包信息需要调整为在加大字体下，表格主要字段的内容能显示完整
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
5:46 下午

zc.li

GDSFYBJY-42 - 【回收清点】科室快速回收新增多项改进(加急、添加物品、快速删除、入筐优化、支持标识牌、拆单优化)
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:14 下午

frank.qiu

解决了 GDSFYBJY-42 - 【回收清点】科室快速回收新增多项改进(加急、添加物品、快速删除、入筐优化、支持标识牌、拆单优化)(提交第一到第五点改进)
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js
5:02 下午

zc.li

GDSFYBJY-44 【装配管理】待装配任务列表的清洗时间与回收时间两字段增加时间筛选功能
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • -6
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForGetWaitPackingTaskJsonTests.java
5:01 下午

zc.li

GDSFYBJY-44 【装配管理】待装配任务列表的清洗时间与回收时间两字段增加时间筛选功能
Options
    • -1
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/PackingModule.java
5:01 下午

zc.li

GDSFYBJY-44 【装配管理】待装配任务列表的清洗时间与回收时间两字段增加时间筛选功能
Options
    • -13
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -17
    • +14
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -1
    • +9
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +79
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java
4:14 下午

frank.qiu

解决了 GDSFYBJY-37 - 【回收清点】“仅搜索当前申请科室物品功能”增加配置科室的参数
Options
    • -5
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
3:50 下午

frank.qiu

解决了 GDSFYBJY-42 - 【回收清点】科室快速回收新增多项改进(加急、添加物品、快速删除、入筐优化、支持标识牌、拆单优化)(提交第一到第五点改进)
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/addTousseByExpress.png
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
    • -6
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/allIntoBasketByExpress.png
    • -264
    • +86
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js
    • -0
    • +459
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
3:20 下午

einstein.kang

GDSFYBJY-28 【回收清点】回收时可对申请单进行拆分功能增加第三种拆分方式;回收申请单的拆单增加配置项
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js
3:02 下午

einstein.kang

GDSFYBJY-28 【回收清点】回收时可对申请单进行拆分功能增加第三种拆分方式;按资产归属拆单不需要扫描条码；同时增加处理拆包清洗的情况
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +8
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingBasketItemVo.java
    • -23
    • +5
    /ssts-recyclingrecord/src/test/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImplSplitByAssetOfTousseDefinitionUnitTest.java
    • -0
    • +1
    /ssts-recyclingrecord/src/test/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImplSaveAndSplitRecyclingRecordTest.java
    • -2
    • +2
    /ssts-recyclingrecord/src/test/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImplLoadRecyclingTousseSplitByOrgUnitTest.java
11:51 上午

zc.li

ZSYKEQ-45 【装配打印】修改装配人、复核人、包装人、审核人的排序，回车跳转顺序问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:28 上午

frank.qiu

解决了 ZSYY-448 - 对接集成平台（HLE）的科室、人员信息的webservice接口支持科室his代码以及科室使用状态（启用/停用）数据同步
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -1
    • +21
    /ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
Monday 08 Dec
7:48 下午

einstein.kang

GDSFYBJY-41 【科室申领】增加复用性物品的最小申请数量和最大申请数量限制功能,针对消毒物品的调整，非整包申请不验证，整包申请需要验证（添加以及修改数量）
Options
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -5
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -0
    • +18
    /ssts-basedata/src/test/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionApplyAmountLimitationTest.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • -3
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/modules/apply/ApplyAmountValidator.js
5:11 下午

einstein.kang

GDSFYBJY-41 【科室申领】增加复用性物品的最小申请数量和最大申请数量限制功能.最大最小配置可能是字符串“0“,先转成数字再计算
Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/modules/apply/ApplyAmountValidator.js
5:05 下午

frank.qiu

灭菌器参数设备型号转换整数
Options
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
4:16 下午

zc.li

解决 CSSZXYY-177【装配管理】界面的打印回收清单需要将终止的器械包数量剔除
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
1:56 下午

jason

解决jira问题：ZSYY-448 对接集成平台（HLE）的科室、人员信息的webservice接口支持科室his代码以及科室使用状态（启用/停用）数据同步
Options
    • -0
    • +16
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -0
    • +14
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +18
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/zsyy/HieServiceManagerImpl.java
    • -0
    • +1
    /forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +28
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
12:16 下午

einstein.kang

GDSFYBJY-41 【科室申领】增加复用性物品的最小申请数量和最大申请数量限制功能,在加载模板的时候检查默认的数量是否符合
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
10:52 上午

einstein.kang

GDSFYBJY-41 【科室申领】增加复用性物品的最小申请数量和最大申请数量限制功能
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • -0
    • +16
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/TousseItemApplyAmountValidateService.java
  4. /ssts-recyclingapplication/src/test/java/com/forgon/disinfectsystem/recyclingapplication
  5. /ssts-recyclingapplication/src/test/java/com/forgon
    • -1
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +45
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/TousseItemApplyAmountValidateServiceImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
  9. /ssts-basedata/src/test/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition
  10. /ssts-web/src/main/webapp/disinfectsystem/modules
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp
  12. /ssts-recyclingapplication/src/test/java/com/forgon/disinfectsystem
    • -2
    • +44
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  16. … 12 more files in changeset.
Saturday 06 Dec
4:15 下午

terry.kwan

去掉svn相关的api，为迁移至git做准备
Options
    • -12
    • +12
    /build.gradle
Friday 05 Dec
6:50 下午

jason

解决jira问题：ZSYY-447 【用户管理】用户表增加HIE平台的人事工号UserID字段的存储
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/userAndOrgUnitTemplate.xls
6:50 下午

jason

解决jira问题：ZSYY-447 【用户管理】用户表增加HIE平台的人事工号UserID字段的存储
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -0
    • +1
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/zsyy/HieServiceManagerImpl.java
    • -0
    • +18
    /forgon-core/src/main/java/com/forgon/security/model/User.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/5.0.54_5.0.55.sql
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
    • -0
    • +14
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
3:15 下午

einstein.kang

之前误提交了，还原回去
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js