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

4:22 下午

zc.li

More
38204
changed 10 files
root:

解决 ZSYY-359 灭菌交接】”灭菌交接单“新增支持直接转换为”代理灭菌单“

- -1
- +13
./java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java
- History
- Source
- Diff
./java/com/.../SterilizationTransition.java
- -1
- +12
./java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection/ProxyDisinfection.java
- History
- Source
- Diff
./java/com/.../ProxyDisinfection.java
… 8 more files in changeset.

3:35 下午

jason

More
38202
changed 5 files
root:

解决jira问题：ZSRY-87 【加急级别管理】新增适用科室功能

- -0
- +42
./java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
- History
- Source
- Diff
./java/com/forgon/.../urgent/UrgentLevel.java
- -0
- +8
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
- History
- Source
- Diff
./java/com/.../service/UrgentLevelManager.java
- -0
- +63
./java/com/forgon/disinfectsystem/entity/urgent/UrgentApplicableOrgUnit.java
- History
- Source
./java/com/.../urgent/UrgentApplicableOrgUnit.java
- -18
- +242
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
- History
- Source
- Diff
./java/com/.../UrgentLevelManagerImpl.java
- -6
- +3
./java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
- History
- Source
- Diff
./java/com/.../action/UrgentLevelAction.java

6:24 下午

zc.li

More
38198
changed 1 file
root:

完善 DGSFYBJY-87 灭菌装载模块扫描器械包入筐速度太快时可能产生多个篮筐实例的问题

- -20
- +50
./java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ReviewedBasketManagerImpl.java

6:28 下午

jason

More
38192
changed 11 files
root:

解决jira问题：DGSETYY-98 科室互借模块打开互借记录的加载时间过长

- -0
- +2
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./java/com/.../TousseInstance.java
- -0
- +5
./java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
- History
- Source
- Diff
./java/com/.../ExpensiveDisposablegoods.java
- -0
- +1
./java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
- History
- Source
- Diff
./java/com/.../tousseitem/TousseItem.java
… 8 more files in changeset.

4:34 下午

zc.li

More
38189
changed 1 file
root:

注释补充

- -1
- +5
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/FixedBarcode.java
- History
- Source
- Diff
./java/com/.../FixedBarcode.java

4:33 下午

zc.li

More
38188
changed 1 file
root:

删除多余代码

- -5
- +0
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/FixedBarcode.java
- History
- Source
- Diff
./java/com/.../FixedBarcode.java

10:42 上午

jason

More
38182
changed 8 files
root:

解决jira问题：FSFY-102 根据申请单中物品的发货科室与使用记录录入科室进行拆分功能失效 SSTS-678 methodOfSplitRecyclingApplication:2,进行部分拆单回收，即使原始申请单内有其他物品仍未回收，回收界面也不能看到原始申请单的问题

- -0
- +80
./java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java
- History
- Source
./java/com/.../RecyclingTousseInstance.java
… 7 more files in changeset.

4:19 下午

jason

More
38171
changed 1 file
root:

解决jira问题：GDSRMYY-604 【加急级别管理】增加主动推送语音提醒机制

- -1
- +1
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service/UrgentNotificationManagerImpl.java
- History
- Source
- Diff
./java/.../UrgentNotificationManagerImpl.java

4:09 下午

jason

More
38170
changed 2 files
root:

解决jira问题：ZSYY-360 优化申请单列表查询语句

- -1
- +1
./java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
- History
- Source
- Diff
./java/com/.../invoicemanager/InvoicePlan.java
… 1 more file in changeset.

3:44 下午

jason

More
38168
changed 1 file
root:

解决jira问题：ZSRY-97 【加急额外信息】进行多项改进(时间控件拆分、扩展信息设置拆分到加急信息设置)

- -0
- +6
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
- History
- Source
- Diff
./java/com/.../UrgentLevelManagerImpl.java

2:41 下午

jason

More
38167
changed 1 file
root:

解决jira问题：GDSRMYY-604 【加急级别管理】增加主动推送语音提醒机制

- -5
- +8
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
- History
- Source
- Diff
./java/com/.../UrgentLevelManagerImpl.java

2:25 下午

jason

More
38166
changed 1 file
root:

解决jira问题：GDSRMYY-604 【加急级别管理】增加主动推送语音提醒机制

- -1
- +1
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service/UrgentNotificationManagerImpl.java
- History
- Source
- Diff
./java/.../UrgentNotificationManagerImpl.java

11:14 上午

jason

More
38162
changed 4 files
root:

解决jira问题：ZSYY-361 优化手术仪器管理模块初始化界面时的查询语句

- -0
- +1
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./java/com/.../TousseInstance.java
- -2
- +46
./java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
- History
- Source
- Diff
./java/com/.../GoodsStockManagerImpl.java
… 2 more files in changeset.

10:08 上午

jason

More
38160
changed 7 files
root:

解决jira问题：GDSRMYY-604 【加急级别管理】增加主动推送语音提醒机制

- -1
- +8
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service/UrgentNotificationManager.java
- History
- Source
- Diff
./java/com/.../UrgentNotificationManager.java
- -12
- +12
./java/com/forgon/disinfectsystem/entity/urgent/UrgentNotificationRecord.java
- History
- Source
- Diff
./java/com/.../UrgentNotificationRecord.java
- -24
- +189
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service/UrgentNotificationManagerImpl.java
- History
- Source
- Diff
./java/.../UrgentNotificationManagerImpl.java
- -1
- +1
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
- History
- Source
- Diff
./java/com/.../UrgentLevelManagerImpl.java
… 3 more files in changeset.

5:40 下午

zc.li

More
38158
changed 2 files
root:

解决 DGSFYBJY-87 灭菌装载模块扫描器械包入筐速度太快时可能产生多个篮筐实例的问题

- -21
- +15
./java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ReviewedBasketManagerImpl.java
- -3
- +3
./java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java
- History
- Source
- Diff
./java/com/.../ReviewedBasketManager.java

3:13 下午

jason

More
38157
changed 3 files
root:

解决jira问题：ZSRY-97【加急额外信息】进行多项改进(时间控件拆分、扩展信息设置拆分到加急信息设置)

- -0
- +25
./java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
- History
- Source
- Diff
./java/com/forgon/.../urgent/UrgentLevel.java
… 2 more files in changeset.

11:31 上午

zc.li

More
38136
changed 9 files
root:

ZSYY-358 - 【清洗消毒】新增多个供应室共用同一台清洗机

- -0
- +54
./java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/RinserDepartment.java
- History
- Source
./java/com/forgon/.../rinser/RinserDepartment.java
- -4
- +7
./java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
- History
- Source
- Diff
./java/com/forgon/.../rinser/Rinser.java
- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java
- -1
- +7
./java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java
- History
- Source
- Diff
./java/com/.../service/RinserManager.java
- -1
- +3
./java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
- History
- Source
- Diff
./java/com/forgon/.../action/RinserAction.java
- -5
- +94
./java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/RinserManagerImpl.java
… 3 more files in changeset.

11:57 上午

jason

More
38132
changed 3 files
root:

解决jira问题：BJ309YY-27 【标签模板管理】数据源为“普通器械包”时新增内置属性"配包注意事项文本"

- -5
- +2
./java/com/forgon/disinfectsystem/common/CssdUtils.java
- History
- Source
- Diff
./java/com/forgon/.../common/CssdUtils.java
- -0
- +21
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java
- History
- Source
- Diff
./java/com/.../TousseDefinitionNote.java
- -0
- +27
./java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
- History
- Source
- Diff
./java/com/.../TousseInstanceUtils.java

1:49 下午

jason

More
38124
changed 16 files
root:

解决jira问题：GDSRMYY-604 【加急级别管理】增加主动推送语音提醒机制

- -0
- +95
./java/com/forgon/disinfectsystem/entity/urgent/UrgentUserNotificationRecord.java
- History
- Source
./java/com/.../UrgentUserNotificationRecord.java
- -0
- +45
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/controller/UrgentNotificationController.java
- History
- Source
./java/com/.../UrgentNotificationController.java
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification
- History
- Source
./java/com/forgon/.../urgent/notification
- -0
- +72
./java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
- History
- Source
- Diff
./java/com/forgon/.../urgent/UrgentLevel.java
- -0
- +99
./java/com/forgon/disinfectsystem/basedatamanager/urgent/vo/UrgentNotificationRecordVo.java
- History
- Source
./java/com/.../vo/UrgentNotificationRecordVo.java
- -0
- +415
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service/UrgentNotificationManagerImpl.java
- History
- Source
./java/com/.../UrgentNotificationManagerImpl.java
- -0
- +28
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service/UrgentNotificationManager.java
- History
- Source
./java/com/.../UrgentNotificationManager.java
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/service
- History
- Source
./java/com/forgon/.../urgent/notification/service
./java/com/forgon/disinfectsystem/basedatamanager/urgent/notification/controller
- History
- Source
./java/com/forgon/.../notification/controller
- -0
- +121
./java/com/forgon/disinfectsystem/entity/urgent/UrgentNotificationRecord.java
- History
- Source
./java/com/.../urgent/UrgentNotificationRecord.java
- -0
- +62
./java/com/forgon/disinfectsystem/entity/urgent/UrgentNotificationOrgUnit.java
- History
- Source
./java/com/.../UrgentNotificationOrgUnit.java
- -0
- +225
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
- History
- Source
- Diff
./java/com/.../UrgentLevelManagerImpl.java
- -0
- +28
./java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
- History
- Source
- Diff
./java/com/.../service/UrgentLevelManager.java
- -113
- +55
./java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
- History
- Source
- Diff
./java/com/.../action/UrgentLevelAction.java
… 2 more files in changeset.

6:54 下午

jason

More
38101
changed 21 files
root:

解决jira问题：GZSDBRMYY-31 原接口对接平台变更为东软RealOne 3.0 Pro，含（患者信息接口、人员组织机构接口、单点登录接口）

- -0
- +343
./java/com/forgon/disinfectsystem/entity/patient/OperationApply.java
- History
- Source
./java/com/forgon/.../patient/OperationApply.java
- -0
- +336
./java/com/forgon/disinfectsystem/entity/patient/OperationPlan.java
- History
- Source
./java/com/forgon/.../patient/OperationPlan.java
- -0
- +175
./java/com/forgon/disinfectsystem/entity/patient/OperationDesc.java
- History
- Source
./java/com/forgon/.../patient/OperationDesc.java
./java/com/forgon/disinfectsystem/entity/patient
- History
- Source
./java/com/forgon/.../entity/patient
… 17 more files in changeset.

10:26 上午

zc.li

More
38095
changed 1 file
root:

提交注释

- -1
- +2
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./java/com/.../TousseInstance.java

6:37 下午

jason

More
38080
changed 13 files
root:

解决jira问题：FSSZYY-37 【用户管理】增加长时间不在线的账号进行自动停用功能

- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java
- -0
- +13
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfig.java
… 11 more files in changeset.

4:57 下午

zc.li

More
38076
changed 9 files
root:

完善 SSTS-669 优化干预清洗记录时，判断篮筐里面是否有物品已经装配的效率，优化包实例和清洗篮筐数据

- -0
- +57
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ClassifyBasket_TousseInstance.java
- History
- Source
./java/com/.../ClassifyBasket_TousseInstance.java
- -0
- +4
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./java/com/.../TousseInstance.java
… 7 more files in changeset.

4:51 下午

zc.li

More
38075
changed 1 file
root:

历史注释补充

- -0
- +2
./java/com/forgon/disinfectsystem/entity/packing/PackingRecord_ClassifyBasket.java
- History
- Source
- Diff
./java/.../PackingRecord_ClassifyBasket.java

4:28 下午

jason

More
38063
changed 1 file
root:

解决jira问题：ZSRY-90 配置项useRecordConvertRecyclingApplicationRemark增加洗手护士@washHandNurse通配符组合

- -4
- +11
./java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java
- History
- Source
- Diff
./java/com/.../RecyclingApplicationUtils.java

5:06 下午

jason

More
38054
changed 34 files
root:

解决jira问题：ZSRY-60 新增【设备巡检】功能

- -0
- +66
./java/com/forgon/disinfectsystem/entity/equipmentinspection/definition/EquipInspectionRemindUser.java
- History
- Source
./java/com/.../EquipInspectionRemindUser.java
- -0
- +83
./java/com/forgon/disinfectsystem/entity/equipmentinspection/definition/ApplicableEquipment.java
- History
- Source
./java/com/.../definition/ApplicableEquipment.java
./java/com/forgon/disinfectsystem/entity/equipmentinspection/instance
- History
- Source
./java/com/forgon/.../equipmentinspection/instance
./java/com/forgon/disinfectsystem/entity/equipmentinspection
- History
- Source
./java/com/forgon/.../entity/equipmentinspection
- -0
- +1
./java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java
- History
- Source
- Diff
./java/com/.../FormDefinitionItem.java
- -0
- +204
./java/com/forgon/disinfectsystem/entity/equipmentinspection/definition/EquipmentInspectionDef.java
- History
- Source
./java/com/.../EquipmentInspectionDef.java
- -0
- +1
./java/com/forgon/disinfectsystem/entity/customform/forminstance/FormInstanceItem.java
- History
- Source
- Diff
./java/com/.../FormInstanceItem.java
- -0
- +60
./java/com/forgon/disinfectsystem/entity/equipmentinspection/instance/EquipmentInspectionInstance.java
- History
- Source
./java/com/.../EquipmentInspectionInstance.java
- -0
- +1
./java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java
- History
- Source
- Diff
./java/com/.../FormDefinition.java
- -0
- +19
./java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItemOption.java
- History
- Source
- Diff
./java/com/.../FormDefinitionItemOption.java
./java/com/forgon/disinfectsystem/entity/equipmentinspection/definition
- History
- Source
./java/com/.../equipmentinspection/definition
- -0
- +83
./java/com/forgon/disinfectsystem/vo/ApplicableEquipmentVo.java
- History
- Source
./java/com/forgon/.../vo/ApplicableEquipmentVo.java
… 22 more files in changeset.

11:58 上午

zc.li

More
38047
changed 1 file
root:

完善 GDSRMYY-603 强生100NX过氧化氢灭菌器接口增加通过机器号+时间进行匹配的功能

- -7
- +1
./java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java
- History
- Source
- Diff
./java/com/.../DeviceInterfaceManagerImpl.java

3:57 下午

jason

More
38041
changed 7 files
root:

解决jira问题：GZSZYY-45 【器械仓库管理】新增中医器具类型以及相关功能

- -0
- +77
./java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/ChineseMedicineInstrType.java
- History
- Source
./java/com/.../ChineseMedicineInstrType.java
- -0
- +31
./java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
- History
- Source
- Diff
./java/com/.../MaterialDefinition.java
… 5 more files in changeset.

5:01 下午

jason

More
38025
changed 3 files
root:

解决jira问题：GZFDZL-141 【退货管理】一次性物品退货批次改进(不显示已过期批次，默认显示最后发货的批次)

- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java
- -0
- +14
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfig.java
… 1 more file in changeset.

3:32 下午

jason

More
37989
added 1 file
root:

解决jira问题：GZSZYY-52 以Execl格式导出高值耗材模块数据

- -0
- +138
./java/com/forgon/disinfectsystem/vo/ExpensiveGoodsExportVo.java
- History
- Source
./java/com/.../vo/ExpensiveGoodsExportVo.java

main

Line History

Stats

Commits this week: 9

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

zc.li

jason

zc.li

jason

zc.li

zc.li

jason

jason

jason

jason

jason

jason

jason

jason

zc.li

jason

zc.li

jason

jason

jason

zc.li

jason

zc.li

zc.li

jason

jason

zc.li

jason

jason

jason