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

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

2:14 下午

jason

More
37975
changed 1 file
root:

解决jira问题：GDSDEZYY-33 【科室申请】里添加一张申请单，录入申请科室后不能自动带出结算科室

- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java

10:02 上午

zc.li

More
37973
changed 7 files
root:

解决 SSTS-663 固定条码设计优化

- -0
- +36
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/FixedBarcode.java
- History
- Source
./java/com/.../toussedefinition/FixedBarcode.java
… 6 more files in changeset.

3:04 下午

jason

More
37968
changed 9 files
root:

解决jira问题：GZSZYY-51 对接平台获取手术排班信息

- -0
- +151
./java/com/forgon/disinfectsystem/entity/operationreservation/SurgerySchedule.java
- History
- Source
./java/com/.../SurgerySchedule.java
… 8 more files in changeset.

6:28 下午

jason

More
37943
changed 8 files
root:

解决jira问题：SZSZYY-34 【外来器械申请单】允许创建未申请器械包的外来器械申请单(第三方接口)

- -0
- +65
./java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseSupplierItem.java
- History
- Source
./java/com/.../ForeignTousseSupplierItem.java
… 7 more files in changeset.

6:09 下午

zc.li

More
37942
changed 1 file
root:

删除多余代码

- -2
- +0
./java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
- History
- Source
- Diff
./java/com/.../becleanitem/ClassifyBasket.java

5:42 下午

zc.li

More
37941
changed 3 files
root:

解决 SZSZYY-34 - 【外来器械申请单】允许创建未申请器械包的外来器械申请单(第三方接口)

- -0
- +12
./java/com/forgon/disinfectsystem/vo/TousseItemVo.java
- History
- Source
- Diff
./java/com/forgon/.../vo/TousseItemVo.java
… 2 more files in changeset.

2:53 下午

zc.li

More
37903
changed 1 file
root:

完善 GZSZYY-41 【回收清点】"一键入筐"后入筐顺序需要保持和回收时一致

- -0
- +2
./java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
- History
- Source
- Diff
./java/com/.../becleanitem/ClassifyBasket.java

6:02 下午

zc.li

More
37898
changed 12 files
root:

解决 GZSZYY-41 【回收清点】"一键入筐"后入筐顺序需要保持和回收时一致

- -1
- +1
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java
- History
- Source
- Diff
./java/com/.../ClassifiedItemManager.java
- -6
- +6
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ClassifyBasketManagerImpl.java
- -3
- +3
./java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
- History
- Source
- Diff
./java/com/.../becleanitem/ClassifyBasket.java
- -1
- +1
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
- History
- Source
- Diff
./java/com/.../service/BeCleanItemManager.java
- -3
- +3
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java
- History
- Source
- Diff
./java/com/.../ClassifiedItemManagerImpl.java
- -12
- +12
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
- History
- Source
- Diff
./java/com/.../BeCleanItemManagerImpl.java
- -1
- +1
./java/com/forgon/disinfectsystem/basedata/becleanitem/action/BeCleanItemAction.java
- History
- Source
- Diff
./java/com/.../action/BeCleanItemAction.java
… 5 more files in changeset.

11:45 上午

zc.li

More
37885
changed 3 files
root:

解决 SZSDSRMYY-128 - 【回收清点】已回收的申请单，增加每个器械包的回收时间显示

- -0
- +74
./java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java
- History
- Source
./java/com/.../RecyclingDateDetails.java
… 2 more files in changeset.

2:28 下午

zc.li

More
37866
changed 4 files
root:

解决 ZSRY-74【回收科室分组设置】新增"处理科室"及优化【回收清点】的“科室分组控件显示

- -0
- +8
./java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java
- History
- Source
- Diff
./java/com/.../DepartmentGroupAction.java
- -0
- +5
./java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
- History
- Source
- Diff
./java/com/.../DepartmentGroupManager.java
- -1
- +24
./java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java
- History
- Source
- Diff
./java/com/.../DepartmentGroup.java
- -1
- +9
./java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
- History
- Source
- Diff
./java/com/.../DepartmentGroupManagerImpl.java

6:54 下午

jason

More
37841
changed 1 file
root:

解决jira问题：GDSRMYY-596 增加对获取美莱格快速灭菌炉 43B+ 灭菌器”的灭菌参数支持

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

4:44 下午

jason

More
37833
changed 9 files
root:

解决jira问题：GDSRMYY-596 增加对获取美莱格快速灭菌炉 43B+ 灭菌器”的灭菌参数支持

- -0
- +415
./java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/Melag43BPlusSterilizerRecord.java
- History
- Source
./java/com/.../Melag43BPlusSterilizerRecord.java
- -0
- +4
./java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
- History
- Source
- Diff
./java/com/.../SterilizationRecord.java
- -0
- +104
./java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/Melag43BPlusStageDetails.java
- History
- Source
./java/com/.../Melag43BPlusStageDetails.java
- -0
- +10
./java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
- History
- Source
- Diff
./java/com/.../DeviceInterface.java
… 5 more files in changeset.

11:46 上午

zc.li

More
37811
changed 14 files
root:

解决 ZSYY-335：【外来器械包】新增支持发货后未录入使用记录也能进行二次回收

- -2
- +6
./java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
- History
- Source
- Diff
./java/com/.../ForeignTousseApplication.java
- -1
- +16
./java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
- History
- Source
- Diff
./java/com/.../invoicemanager/InvoicePlan.java
… 12 more files in changeset.

5:18 下午

jason

More
37775
changed 2 files
root:

解决jira问题：ZSRY-73 - 【用户管理】添加用户时可跳过密码复杂度识别

- -0
- +14
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfig.java
- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java

10:54 上午

jason

More
37769
changed 2 files
root:

解决jira问题：BJDXZLYY-52 【手术预约管理】增加表格列"取出状态"

- -0
- +4
./java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/Storage_TousseInstance.java
- History
- Source
- Diff
./java/com/.../Storage_TousseInstance.java
… 1 more file in changeset.

10:44 上午

jason

More
37739
changed 2 files
root:

解决jira问题：BLXRMYY-44 开发接口与嘉和美康平台进行病人信息对接

- -0
- +33
./java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java
- History
- Source
- Diff
./java/com/.../gyey/PatientAdmissionInfo.java
… 1 more file in changeset.

4:04 下午

jason

More
37684
changed 1 file
root:

解决jira问题：BJDXZLYY-53 【库位管理】"库存查看"的取出页面增加按器械包名称进行搜索功能

- -4
- +12
./java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java
- History
- Source
- Diff
./java/.../StorageLocationTableManager.java

4:50 下午

shuyongfu

More
37671
changed 1 file
root:

处理 SSTS-644 关于发货时报空指针的BUG

- -1
- +1
./java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
- History
- Source
- Diff
./java/com/.../WareHouseManagerImpl.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)

jason

jason

zc.li

jason

zc.li

zc.li

jason

jason

zc.li

jason

jason

jason

jason

zc.li

jason

jason

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

jason

jason

zc.li

jason

jason

jason

jason

shuyongfu