forgon-ssts-v4.1.0 / ssts-basedata

src

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): 647,369
Net change in LoC this week: 181

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
Monday 08 Dec
7:48 下午

einstein.kang

GDSFYBJY-41 【科室申领】增加复用性物品的最小申请数量和最大申请数量限制功能,针对消毒物品的调整，非整包申请不验证，整包申请需要验证（添加以及修改数量）
Options
    • -0
    • +8
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +18
    ./test/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionApplyAmountLimitationTest.java
  3. … 5 more files in changeset.
10:52 上午

einstein.kang

GDSFYBJY-41 【科室申领】增加复用性物品的最小申请数量和最大申请数量限制功能
Options
  1. ./test/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition
    • -2
    • +44
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +71
    ./test/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionApplyAmountLimitationTest.java
  4. … 24 more files in changeset.
Tuesday 02 Dec
7:26 下午

einstein.kang

ZSYKEQ-61 【按炉次提醒的灭菌程序】增加提醒信息设置功能
Options
    • -0
    • +71
    ./test/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/SterilizationFrequencyRemindTest.java
    • -0
    • +32
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/SterilizationFrequecyRemind.java
    • -2
    • +16
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/param/SterilizationFrequencyRemindParam.java
    • -3
    • +3
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
  5. … 5 more files in changeset.
6:43 下午

jason

解决jira问题：GDSZYY-268【一次性物品定义管理】通过视图接口，同步OES系统耗材的CHAS“住院系统管控标识”信息至一次性物品定义
Options
    • -0
    • +29
    ./main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
  2. … 8 more files in changeset.
6:02 下午

jason

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

jason

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

zc.li

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

zc.li

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

einstein.kang

GDSFYBJY-28 【回收清点】回收时可对申请单进行拆分功能增加第三种拆分方式
Options
  1. ./main/java/com/forgon/disinfectsystem/model
    • -1
    • +5
    ./main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • -0
    • +17
    ./main/java/com/forgon/disinfectsystem/model/ToussePackage.java
    • -0
    • +18
    ./main/java/com/forgon/disinfectsystem/model/DepartmentAware.java
    • -1
    • +4
    ./main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -1
    • +5
    ./main/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
    ./main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManager.java
    • -0
    • +1
    ./main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -0
    • +30
    ./main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -5
    • +18
    ./main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java
    • -1
    • +14
    ./main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -1
    • +5
    ./main/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
    ./main/java/com/forgon/disinfectsystem/basedatamanager/position/action/PositionAction.java
    • -1
    • +9
    ./main/java/com/forgon/disinfectsystem/basedatamanager/position/service/PositionManagerImpl.java
    • -1
    • +29
    ./main/java/com/forgon/disinfectsystem/entity/customform/forminstance/FormInstance.java
    • -0
    • +2
    ./main/java/com/forgon/disinfectsystem/basedatamanager/position/service/PositionManager.java
Thursday 20 Nov
6:33 下午

shuyongfu

处理jira问题:GDSKQYY-14 PDA的灭菌记录登记以及清洗记录登记增加手动选择设备名称以及运行程序功能
Options
    • -0
    • +47
    ./main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
    • -101
    • +9
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • -0
    • +9
    ./main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java
    • -47
    • +2
    ./main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
    • -1
    • +7
    ./main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManager.java
    • -23
    • +2
    ./main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java
    • -0
    • +99
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -0
    • +21
    ./main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManagerImpl.java
    • -0
    • +21
    ./main/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
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -0
    • +3
    ./main/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
    ./main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
Monday 17 Nov
1:38 下午

jason

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

jason

解决jira问题：GDSKQYY-29【科室申领模板】模块增加模板排序功能
Options
    • -0
    • +15
    ./main/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
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
    • -1
    • +17
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplWithYearTest.java
    • -5
    • +19
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplListTest.java
    • -6
    • +20
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplHolidayTypeOfDateTest.java
2:04 下午

zc.li

GDSKQYY-30 - 【容器管理】容器信息中增加"篮筐颜色"设置项，设置后改变回收清点中装载篮筐的背景颜色
Options
    • -0
    • +14
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • -0
    • +32
    ./main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -0
    • +6
    ./main/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
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/holiday/HolidayConfig.java
    • -0
    • +81
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/param/JsonImportDateParam.java
    • -3
    • +42
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigControllerTest.java
    • -0
    • +167
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplImportJsonTest.java
    • -1
    • +18
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
    • -0
    • +60
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/param/JsonImportParam.java
    • -9
    • +10
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigController.java
  8. … 1 more file in changeset.
11:28 上午

jason

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

einstein.kang

监测包扫描提示默认值增加保存字段的长度
Options
    • -0
    • +1
    ./main/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
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
    • -7
    • +7
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplSaveTest.java
    • -24
    • +24
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/param/HolidayConfigParam.java
    • -6
    • +6
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplWithYearTest.java
    • -0
    • +5
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/ControllerTestConfig.java
    • -5
    • +5
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplHolidayTypeOfDateTest.java
    • -36
    • +30
    ./main/java/com/forgon/disinfectsystem/entity/basedatamanager/holiday/HolidayConfig.java
    • -10
    • +10
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplListTest.java
    • -13
    • +13
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplValidateParamTest.java
    • -0
    • +3
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManager.java
    • -9
    • +9
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplUpdateTest.java
    • -2
    • +2
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigControllerTest.java
    • -8
    • +39
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigController.java
  14. … 2 more files in changeset.
12:25 下午

jason

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

jason

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

einstein.kang

ZSYKEQ-22: 按炉次提醒的灭菌程序（以及监测包提醒）的功能增强,删除暂时没有生效的配置
Options
    • -2
    • +1
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigControllerTest.java
5:15 下午

jason

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

einstein.kang

ZSYKEQ-22: 按炉次提醒的灭菌程序（以及监测包提醒）的功能增强
Options
    • -0
    • +106
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplWithYearTest.java
    • -0
    • +156
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImpl.java
  3. ./main/java/com/forgon/disinfectsystem/common/params
    • -0
    • +92
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigControllerTest.java
    • -0
    • +57
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/MonitoringPackageScanRuleParser.java
  6. ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/param
    • -0
    • +229
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplHolidayTypeOfDateTest.java
  8. ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday
    • -0
    • +175
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/model/MonitoringPackageScanRule.java
    • -0
    • +82
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplSaveTest.java
  11. ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/param
    • -0
    • +51
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManager.java
    • -0
    • +44
    ./main/java/com/forgon/disinfectsystem/basedatamanager/holiday/controller/HolidayConfigController.java
    • -0
    • +111
    ./test/java/com/forgon/disinfectsystem/basedatamanager/holiday/service/HolidayConfigManagerImplListTest.java
    • -1
    • +4
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
  16. … 45 more files in changeset.
Friday 07 Nov
3:04 下午

jason

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

einstein.kang

提取待修改部分代码并增加单元测试
Options
  1. ./test/java/com/forgon/disinfectsystem/basedatamanager
  2. ./test/java/com/forgon
  3. ./test/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service
  4. ./test/java/com/forgon/disinfectsystem
  5. ./test/java/com
    • -0
    • +108
    ./test/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImplParseSterilizationFrequencyRemindsTest.java
    • -12
    • +17
    ./main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
  8. ./test/java/com/forgon/disinfectsystem/basedatamanager/sterilizer
Tuesday 04 Nov
10:36 上午

zc.li

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