forgon-ssts-v4.1.0 / ssts-basedata / src

main

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 2
Total Committers: 19
Last Commit: 14 Feb 16
Commits this week: 2
Total Lines of Code (LoC): 645,812
Net change in LoC this week: 92

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 02 Dec
4:51 下午

jason

解决jira问题：ZSYKEQ-23 【PC】【PDA】【物品签收】新增指定库房入库签收功能(代码优化)
Options
    • -2
    • +22
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java
  2. ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/vo
    • -0
    • +45
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/vo/StorageLocationVo.java
    • -14
    • +4
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageLocationAction.java
    • -2
    • +4
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManager.java
4:32 下午

zc.li

提交部分后台代码 BJDXZLYY-85 - 【器械维修管理】新增多项改进(新增器械类型，器械厂家，发现环节，故障部位，修改部分字段名称，增加含有图形化的记录报表)
Options
    • -1
    • +65
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java
    • -1
    • +29
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java
4:31 下午

zc.li

提交部分后台代码 BJDXZLYY-85 - 【器械维修管理】新增多项改进(新增器械类型，器械厂家，发现环节，故障部位，修改部分字段名称，增加含有图形化的记录报表)
Options
    • -0
    • +20
    ./java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
Monday 01 Dec
4:29 下午

einstein.kang

GDSFYBJY-28 【回收清点】回收时可对申请单进行拆分功能增加第三种拆分方式
Options
  1. ./java/com/forgon/disinfectsystem/model
    • -1
    • +5
    ./java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • -0
    • +17
    ./java/com/forgon/disinfectsystem/model/ToussePackage.java
    • -0
    • +18
    ./java/com/forgon/disinfectsystem/model/DepartmentAware.java
    • -1
    • +4
    ./java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -1
    • +5
    ./java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java
  7. … 19 more files in changeset.
Friday 28 Nov
11:49 上午

jason

解决jira问题：ZSYKEQ-23 【PC】【PDA】【物品签收】新增指定库房入库签收功能
Options
    • -6
    • +5
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManager.java
    • -0
    • +1
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -0
    • +30
    ./java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -5
    • +18
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java
    • -1
    • +14
    ./java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -1
    • +5
    ./java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageLocationAction.java
  7. … 8 more files in changeset.
Wednesday 26 Nov
4:29 下午

zc.li

ZSYKEQ-54 - 【定期监测信息】灭菌环节定期监测新增字段“抽检位置”
Options
    • -1
    • +30
    ./java/com/forgon/disinfectsystem/basedatamanager/position/action/PositionAction.java
    • -1
    • +9
    ./java/com/forgon/disinfectsystem/basedatamanager/position/service/PositionManagerImpl.java
    • -1
    • +29
    ./java/com/forgon/disinfectsystem/entity/customform/forminstance/FormInstance.java
    • -0
    • +2
    ./java/com/forgon/disinfectsystem/basedatamanager/position/service/PositionManager.java
Thursday 20 Nov
6:33 下午

shuyongfu

处理jira问题:GDSKQYY-14 PDA的灭菌记录登记以及清洗记录登记增加手动选择设备名称以及运行程序功能
Options
    • -0
    • +47
    ./java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
    • -101
    • +9
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • -0
    • +9
    ./java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java
    • -47
    • +2
    ./java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
    • -1
    • +7
    ./java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManager.java
    • -23
    • +2
    ./java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java
    • -0
    • +99
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -0
    • +21
    ./java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManagerImpl.java
    • -0
    • +21
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
  10. … 1 more file in changeset.
Wednesday 19 Nov
11:01 上午

zc.li

CDSLQYQYYY-149 - 【灭菌炉管理】新增【管腔化学PCD监测结果默认值】字段
Options
    • -1
    • +12
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -0
    • +3
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
  3. … 1 more file in changeset.
Tuesday 18 Nov
5:45 下午

jason

解决jira问题：ZJYY-170 使用记录接口重复推送同一个器械包条码使用记录时，加急级别出现变化时应同步更新变化。
Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
Monday 17 Nov
1:38 下午

jason

解决jira问题：GDSKQYY-23【清洗消毒】的待清洗篮筐列表增加“结算科室筛选”和“一键载入”待清洗篮筐功能
Options
    • -10
    • +12
    ./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -1
    • +2
    ./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
  3. … 4 more files in changeset.
12:02 下午

jason

解决jira问题：GDSKQYY-29【科室申领模板】模块增加模板排序功能
Options
    • -0
    • +15
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DepartmentAppTemplate.java
  2. … 5 more files in changeset.
Friday 14 Nov
6:13 下午

einstein.kang

假期查询要适配日期转换
Options
    • -4
    • +20
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
  2. … 3 more files in changeset.
2:04 下午

zc.li

GDSKQYY-30 - 【容器管理】容器信息中增加"篮筐颜色"设置项，设置后改变回收清点中装载篮筐的背景颜色
Options
    • -0
    • +14
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • -0
    • +32
    ./java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
  4. … 5 more files in changeset.
12:56 下午

einstein.kang

增加假期配置的导入功能。导入文件可以从github下载，地址如下：https://github.com/NateScarlet/holiday-cn/blob/master/2026.json;其中2026为年份，且只能导入json文件
Options
    • -0
    • +2
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/holiday/HolidayConfig.java
    • -0
    • +81
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/param/JsonImportDateParam.java
    • -1
    • +18
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
    • -0
    • +60
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/param/JsonImportParam.java
    • -9
    • +10
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigController.java
  6. … 3 more files in changeset.
11:28 上午

jason

解决jira问题：GDSKQYY-23【清洗消毒】的待清洗篮筐列表增加“结算科室筛选”和“一键载入”待清洗篮筐功能
Options
    • -11
    • +69
    ./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -2
    • +10
    ./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
  3. … 5 more files in changeset.
9:04 上午

einstein.kang

监测包扫描提示默认值增加保存字段的长度
Options
    • -0
    • +1
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
  2. … 5 more files in changeset.
Thursday 13 Nov
5:40 下午

einstein.kang

假期配置的字段跟oracle关键字冲突，需要修改字段和实体对象属性；调整灭菌炉配置界面
Options
    • -14
    • +27
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
    • -24
    • +24
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/param/HolidayConfigParam.java
    • -36
    • +30
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/holiday/HolidayConfig.java
    • -0
    • +3
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManager.java
    • -8
    • +39
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigController.java
  6. … 10 more files in changeset.
12:25 下午

jason

解决jira问题：GDSKQYY-25【科室申领】新增将临床科室的申领模板作为白名单模板使用，应只允许申领模板内的物品
Options
    • -10
    • +15
    ./java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
  2. … 1 more file in changeset.
11:32 上午

jason

解决jira问题：GDSKQYY-25【科室申领】新增将临床科室的申领模板作为白名单模板使用，应只允许申领模板内的物品
Options
    • -5
    • +24
    ./java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
Monday 10 Nov
5:15 下午

jason

解决jira问题：QYSQXQRMYY-12 【PC】【PDA】【质量监测管理】质量监测定义新增字段“抽检器械必填”以及界面调整优化
Options
    • -0
    • +17
    ./java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java
  2. … 1 more file in changeset.
11:45 上午

einstein.kang

ZSYKEQ-22: 按炉次提醒的灭菌程序（以及监测包提醒）的功能增强
Options
    • -0
    • +156
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
  2. ./java/com/forgon/disinfectsystem/common/params
    • -0
    • +57
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/MonitoringPackageScanRuleParser.java
  4. ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/param
    • -0
    • +175
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/model/MonitoringPackageScanRule.java
  6. ./java/com/forgon/disinfectsystem/basedatamanager/holiday/param
    • -0
    • +51
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManager.java
    • -0
    • +44
    ./java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigController.java
    • -1
    • +4
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • -2
    • +2
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • -0
    • +92
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/param/SterilizationFrequencyRemindParam.java
  12. ./java/com/forgon/disinfectsystem/basedatamanager/holiday/service
  13. ./java/com/forgon/disinfectsystem/basedatamanager/holiday/model
  14. ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/model
  15. ./java/com/forgon/disinfectsystem/entity/basedatamanager/holiday
  16. … 45 more files in changeset.
Friday 07 Nov
3:04 下午

jason

解决jira问题：SZSDSRMYY-181 接口新增取值【手术医生核算科室】，使用记录中使用物品明细中的结算科室取值变更
Options
    • too large
    ./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -0
    • +1
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
  3. … 1 more file in changeset.
Thursday 06 Nov
10:30 下午

einstein.kang

提取待修改部分代码并增加单元测试
Options
    • -12
    • +17
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
  2. … 7 more files in changeset.
Tuesday 04 Nov
10:36 上午

zc.li

FSEYEQ-40：【灭菌管理】增加新的召回范围模式“截至上次生物监测成功前的炉次”
Options
    • -1
    • +6
    ./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -1
    • +29
    ./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
Monday 03 Nov
6:39 下午

zc.li

FSEYEQ-40：【灭菌管理】增加新的召回范围模式“截至上次生物监测成功前的炉次”
Options
    • -0
    • +65
    ./java/com/forgon/disinfectsystem/entity/recall/RecallRecord.java
  2. … 2 more files in changeset.
Wednesday 29 Oct
6:39 下午

jason

解决jira问题：GZSLWQGSKY-20【第三方器械包管理】当接收的材料名称(字段ItemName)包含[]符号时拆分为名称（材料定义id）＋规格分开保存
Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/common/CssdUtils.java
  2. … 2 more files in changeset.
3:28 下午

jason

解决jira问题：CDSLQYQYYY-147【设备耗材消耗管理】灭菌耗材新增消耗模式（支持批量解除关联耗材）
Options
    • -15
    • +53
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizationpurposedisposablegoods/service/SterilizationPurposeDisposableGoodsManagerImpl.java
    • -1
    • +17
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizationpurposedisposablegoods/controller/SterilizationPurposeDisposableGoodsController.java
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizationpurposedisposablegoods/service/SterilizationPurposeDisposableGoodsManager.java
Tuesday 28 Oct
6:13 下午

zc.li

FSEYEQ-39 【设备接口】新华灭菌器增加灭菌环节标注，检查灭菌环节温度压力是否达标 FSEYEQ-36 【设备接口】新增根据接口文件的多项改进(标注灭菌阶段，增加灭菌失败判定)
Options
    • -0
    • +63
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
  2. … 5 more files in changeset.
Monday 27 Oct
3:33 下午

zc.li

解决 ZJJSRM-77 倍力曼长龙清洗机设备接口匹配参数不完整
Options
    • -0
    • +17
    ./java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashData.java
  2. … 2 more files in changeset.
Friday 24 Oct
10:22 上午

jason

解决jira问题：CDSLQYQYYY-147【设备耗材消耗管理】灭菌耗材新增消耗模式
Options
    • -2
    • +41
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizationpurposedisposablegoods/service/SterilizationPurposeDisposableGoodsManagerImpl.java
    • -0
    • +77
    ./java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizationpurposedisposablegoods/SteriliPurposeConsumeMgt.java
    • -0
    • +30
    ./java/com/forgon/disinfectsystem/vo/SterilizationPurposeDisposableGoodsVo.java
    • -1
    • +2
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizationpurposedisposablegoods/service/SterilizationPurposeDisposableGoodsManager.java
    • -2
    • +3
    ./java/com/forgon/disinfectsystem/basedatamanager/sterilizationpurposedisposablegoods/controller/SterilizationPurposeDisposableGoodsController.java
  6. … 6 more files in changeset.