forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 57
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 57
Total Lines of Code (LoC): 4,796,926
Net change in LoC this week: 3,753

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
Tuesday 09 Dec
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
11:08 上午

jason

解决jira问题：GDSFYBJY-52 人员信息接口、组织机构接口不能正常同步
Options
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +12
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
    • -8
    • +11
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdsfybjy/SyncOrgUnitAndUserDaoImpl.java
10:48 上午

jason

解决jira问题：GDSZYY-269【组织机构】通过视图接口，同步CHAS住院系统“科室管控标识”信息至组织机构
Options
    • -0
    • +70
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitChasControlTagVo.java
    • -0
    • +25
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncOrgUnitChasControlTagDao.java
    • -0
    • +5
    /forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +29
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/ChasOrgUnitManager.java
    • -1
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/timer.xml
    • -20
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/disposableGoodsChas.xml
    • -0
    • +120
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/ChasOrgUnitManagerImpl.java
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
    • -0
    • +90
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
    • -0
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/SyncOrgUnitChasControlTagMapper.xml
    • -0
    • +73
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/controller/ChasOrgUnitController.java
10:15 上午

frank.qiu

解决了 GDSZYY-269 - 【组织机构】通过视图接口，同步CHAS住院系统“科室管控标识”信息至组织机构
Options
    • -374
    • +410
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -418
    • +512
    /ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
Thursday 04 Dec
6:41 下午

zc.li

删除多余代码
Options
    • -58
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/InstrumentSetDemandReportHelper.java
6:17 下午

zc.li

注释补充
Options
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialinstance/handler/GetMaterialInstanceByTdIdHandler.java
5:46 下午

frank.qiu

解决了 BJDXZLYY-85 - 【器械维修管理】新增多项改进(新增器械类型，器械厂家，发现环节，故障部位，修改部分字段名称，增加含有图形化的记录报表)
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.js
5:26 下午

zc.li

提交部分后台代码 BJDXZLYY-85 - 【器械维修管理】新增多项改进(新增器械类型，器械厂家，发现环节，故障部位，修改部分字段名称，增加含有图形化的记录报表)
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/instrumentRepairReportVersion3.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreportVersion3.jasper
    • -5
    • +5
    /ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreportVersion3.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/instrumentRepairReportVersion3.jasper
5:25 下午

jason

解决jira问题：ZSYKEQ-52【手术预约单】接口数据自动同步以及多项改进
Options
    • -6
    • +29
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
4:28 下午

frank.qiu

解决了 BJDXZLYY-85 - 【器械维修管理】新增多项改进(新增器械类型，器械厂家，发现环节，故障部位，修改部分字段名称，增加含有图形化的记录报表)
Options
    • -2
    • +60
    /ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
    • -57
    • +99
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentRepairReportView.js
3:51 下午

jason

解决jira问题：ZSYKEQ-52【手术预约单】接口数据自动同步以及多项改进
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/SyncOperationReservation_Mapper.xml
3:27 下午

jason

解决jira问题：ZSYKEQ-52【手术预约单】接口数据自动同步以及多项改进
Options
    • -3
    • +31
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
2:57 下午

frank.qiu

解决了 ZSYKEQ-27 - 新增手术器械包需求量分析报表（配置项更改）
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js
2:53 下午

zc.li

提交部分后台代码 BJDXZLYY-85 - 【器械维修管理】新增多项改进(新增器械类型，器械厂家，发现环节，故障部位，修改部分字段名称，增加含有图形化的记录报表)
Options
    • -4
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java
1:55 下午

shuyongfu

处理jira问题:ZSYKEQ-23 【PC】【PDA】【物品签收】新增指定库房入库签收功能
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
1:53 下午

zc.li

ZSYKEQ-27 新增手术器械包需求量分析报表
Options
    • -2
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java