forgon-ssts-v4.1.0 / ssts-tousse

src

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 18
Last Commit: 14 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 226,191
Net change in LoC this week: 6

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 09 Apr 2019
6:03 下午

yanweining

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

新增表：记录器械包定义所属科室信息：

TousseDefinitionBelongOrgUint

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +149
    ./main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongOrgUintManagerImpl.java
    • -2
    • +4
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -6
    • +9
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
  5. ./main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service
    • -0
    • +48
    ./main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongOrgUintManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
  8. ./main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit
    • -0
    • +38
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/TousseDefinitionParameterDto.java
  10. … 8 more files in changeset.
Thursday 04 Apr 2019
9:16 下午

zc.li

代码优化
Options
    • -113
    • +0
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  4. … 2 more files in changeset.
4:11 下午

zc.li

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

yanweining

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

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

belongDepart：所属科室(可多选)

2】config.js新增配置项：

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

enableTousseDefinitionBelongDepartFilter: true,

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

showTousseDefinitionBelongDepart:true

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

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

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

则：不需按所属科室过滤

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

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

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

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +24
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
  3. … 8 more files in changeset.
Sunday 31 Mar 2019
11:20 下午

terrykwan

完成 SZSZLYY-23 扫描发货时根据包实例灭菌记录的生物监测状态和结果进行提示
Options
    • -3
    • +4
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
  3. … 15 more files in changeset.
Thursday 28 Mar 2019
7:22 下午

zc.li

解决：ASSLQYQRZ-11。修复清洗区工作量及不及格月报跟器械包工作量报表中清洗工作量不符合的问题，优化器械包工作量报表中设置统计器械包的数据来源。
Options
    • -2
    • +14
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
  4. … 1 more file in changeset.
Monday 25 Mar 2019
7:38 下午

zc.li

解决回收添加器械包向后台查询数据时，会把不需要回收的包也查询出来的问题。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Thursday 14 Mar 2019
11:35 上午

zc.li

消毒物品和否编码方式改为用TousseDefinition类的静态变量代替。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
Wednesday 13 Mar 2019
2:19 下午

zc.li

解决：GDSRMYY-461。 借物管理模块增加对消毒物品的支持，可借整包申请的消毒物品，暂不支持非整包申请的消毒物品。优化鼠标悬停在借物单上显示的信息中，单元格缺失的问题。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  3. … 2 more files in changeset.
Tuesday 12 Mar 2019
2:35 下午

yanweining

器械包定义保存：日志优化
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
Friday 08 Mar 2019
6:32 下午

shuyongfu

审核页面扫描器械包条码时增加包定义id的返回
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Tuesday 05 Mar 2019
11:34 上午

yanweining

GDSRMYY-474：器械包定义修改的日志记录优化
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -5
    • +6
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
  4. … 1 more file in changeset.
Saturday 02 Mar 2019
8:32 下午

zc.li

解决：SZSZLYY-18。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  2. … 6 more files in changeset.
10:13 上午

zc.li

完善：GZZYYFY-29。新增点击科室申领自定义申请单时，在器械包列表显示器械包和材料
Options
    • -0
    • +10
    ./main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManager.java
    • -0
    • +33
    ./main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
  3. … 2 more files in changeset.
Thursday 28 Feb 2019
9:09 下午

shuyongfu

SZSZLYY-17 灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先

pc和pda经测试均已解决

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
3:20 下午

zc.li

解决：GZZYYFY-29。自定义器械包申请单页面修改，允许同时申请多个自定义器械包。部分属性取科室供应室配置设置的自定义器械参数值。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +6
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
  3. … 2 more files in changeset.
Tuesday 26 Feb 2019
9:41 上午

yanweining

注释优化
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  2. … 1 more file in changeset.
Monday 25 Feb 2019
6:07 下午

yanweining

GYEY-696：器械包（一次性物品）定义批量与直接修改属性
Options
    • -0
    • +90
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java
    • -1
    • +23
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -3
    • +42
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  6. … 9 more files in changeset.
Wednesday 20 Feb 2019
3:14 下午

terrykwan

增加非空检查代码
Options
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
Thursday 14 Feb 2019
2:23 下午

yanweining

ASSDGSZYY-35:客户希望在“器械包信息”中添加新字段，且信息能随EXCEL导出
Options
    • -0
    • +63
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/TousseInstanceExportVo.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
  3. … 2 more files in changeset.
Wednesday 13 Feb 2019
4:25 下午

zc.li

解决：SZSZLYY-11。在config.js中提供参数listDisplayOfItemsToBeSterilized进行配置待灭菌物品列表显示方式：默认值1：按今天审核的待灭菌物品显示；值2：按今天待灭菌的物品显示
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
  2. … 2 more files in changeset.
Monday 11 Feb 2019
1:30 下午

terrykwan

重构代码，解决了invoicePlanManager、recyclingApplicationManager、imageFileManager等几个spring bean循环依赖的问题
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -58
    • +15
    ./main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
  3. … 18 more files in changeset.
Thursday 31 Jan 2019
10:36 上午

terrykwan

返回签收异常的器械包信息到客户端。GZZYYFY-26
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Monday 28 Jan 2019
7:40 下午

zc.li

解决删除视频时，如果在TousseDefinition表的uuid_vedioNames字段中没有找到删除的视频，就会把uuid_vedioNames变成null的问题。
Options
    • -3
    • +13
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
6:22 下午

zc.li

优化：SZSSKRMYY-20。器械包管理下的器械包包定义管理和聚合包定义管理的配包教学视频新增修改视频名称功能（点击视频名称可编辑修改）。
Options
    • -0
    • +12
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
    • -0
    • +44
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
    • -0
    • +9
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
  4. … 2 more files in changeset.
Saturday 26 Jan 2019
7:05 下午

zc.li

解决问题：SZSSKRMYY-20。升级视频功能；1：支持上传多个视频；2：新增或增强视频的上传，排序，删除，播放功能。优化器械包定义，聚合包定义界面。3：视频存储地址改为申领科室配置地址下的packingTeacherVideo文件夹下。
Options
    • -9
    • +43
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
    • -0
    • +13
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
    • -0
    • +20
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/dwr/table/VideoFileTableManager.java
    • -7
    • +101
    ./main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
  5. … 12 more files in changeset.
Tuesday 22 Jan 2019
10:16 下午

terrykwan

提供拼音码给前台，做过滤检索。GZYKDXFSKQ-30
Options
    • -0
    • +6
    ./main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  3. … 1 more file in changeset.
2:33 下午

jeffli

广州医科大学附属口腔医院GZYKDXFSKQ-35

消毒物品包定义限制发货bug

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Wednesday 16 Jan 2019
9:24 上午

jeffli

深圳市肿瘤医院SZSZLYY-7

只清点申请单的专科器械包，通用器械包的申请数量只作为发货依据

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  2. … 3 more files in changeset.
Monday 14 Jan 2019
2:32 下午

yanweining

SZSZLYY-7：只清点申请单的专科器械包，通用器械包的申请数量只作为发货依据

器械包定义新增字段：

不生成包实例（默认为是）

隐藏回收项（默认为否）

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  2. … 2 more files in changeset.