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

2:20 下午

zc.li

More
40875
changed 12 files
root:

GDSFYBJY-29：【回收清点】回收清点新增科室快速回收功能

./java/com/forgon/disinfectsystem/basedatamanager/departexpressrecyclingconfig/service
- History
- Source
./java/com/.../departexpressrecyclingconfig/service
./java/com/forgon/disinfectsystem/basedatamanager/departexpressrecyclingconfig
- History
- Source
./java/com/.../departexpressrecyclingconfig
- -0
- +16
./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
- -0
- +212
./java/com/forgon/disinfectsystem/basedatamanager/departexpressrecyclingconfig/service/DepartExpressRecyclingConfigManagerImpl.java
- History
- Source
./java/.../DepartExpressRecyclingConfigManagerImpl.java
- -1
- +8
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java
- History
- Source
- Diff
./java/.../SupplyRoomConfigTableManager.java
- -0
- +51
./java/com/forgon/disinfectsystem/basedatamanager/departexpressrecyclingconfig/service/DepartExpressRecyclingConfigManager.java
- History
- Source
./java/.../DepartExpressRecyclingConfigManager.java
- -0
- +61
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/DepartExpressRecyclingConfig.java
- History
- Source
./java/com/.../DepartExpressRecyclingConfig.java
… 4 more files in changeset.

6:03 下午

jason

More
40861
changed 1 file
root:

解决jira问题：GDSFYBJY-27 外来器械二次清洗归还后，对应清洗篮筐没有进行释放

- -4
- +110
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ClassifyBasketManagerImpl.java

10:43 上午

jason

More
40852
changed 12 files
root:

解决jira问题：BJDXZLYY-70【器械生命周期管理】功能优化(增加维修、保养记录、是否展示、增加搜索功能和快捷桌面图标)

- -0
- +55
./java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentinstance/InstrumentInstance.java
- History
- Source
- Diff
./java/com/.../InstrumentInstance.java
- -0
- +16
./java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
- History
- Source
- Diff
./java/com/.../MaterialDefinition.java
- -0
- +37
./java/com/forgon/disinfectsystem/entity/basedatamanager/tousseMaintain/TousseMaintain.java
- History
- Source
- Diff
./java/com/.../TousseMaintain.java
- -0
- +28
./java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java
- History
- Source
- Diff
./java/com/.../InstrumentRepairGoods.java
… 8 more files in changeset.

6:35 下午

zc.li

More
40806
changed 2 files
root:

解决 NFYY-121 - 【灭菌管理】"今天审核的待灭菌物品"增加筛选项“任务组”

- -1
- +13
./java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
- History
- Source
- Diff
./java/com/forgon/.../vo/TousseSimpleVO.java
… 1 more file in changeset.

4:19 下午

zc.li

More
40800
changed 1 file
root:

处理 STDXYXYFSZ-46 需要优化系统整体卡顿的问题

- -1
- +1
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ClassifyBasketManagerImpl.java

6:33 下午

jason

More
40787
changed 8 files
root:

解决jira问题：QYSRMYY-78【PC】【PDA】【登录管理】新增限制系统管理员用户登录系统时的IP地址范围

- -0
- +29
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfig.java
- -0
- +10
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigManager.java
- -0
- +56
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
- History
- Source
- Diff
./java/.../SupplyRoomConfigManagerImpl.java
- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java
… 4 more files in changeset.

6:15 下午

zc.li

More
40785
changed 2 files
root:

处理 STDXYXYFSZ-46 需要优化系统整体卡顿的问题

- -29
- +8
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ClassifyBasketManagerImpl.java
… 1 more file in changeset.

3:08 下午

zc.li

More
40778
changed 1 file
root:

SZSDSRMYY-213 【PC】【PDA】在装配页面对物品进行加急后，发货计划界面无加急标识

- -5
- +13
./java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
- History
- Source
- Diff
./java/com/.../invoicemanager/InvoicePlan.java

1:42 下午

jason

More
40764
changed 3 files
root:

解决jira问题：GZFDZL-165【接口对接】【科室申领】【退货管理】根据HIS系统提供的收费和退费记录数据生成申请退货单新增改进(不主动生成一次性物品定义)

- -0
- +233
./java/com/forgon/disinfectsystem/entity/invoicemanager/SyncFailChargeRecord.java
- History
- Source
./java/com/.../SyncFailChargeRecord.java
- -0
- +106
./java/com/forgon/disinfectsystem/entity/invoicemanager/SyncFailChargeRecordItem.java
- History
- Source
./java/com/.../SyncFailChargeRecordItem.java
… 1 more file in changeset.

5:48 下午

jason

More
40760
changed 1 file
root:

解决jira问题：DGSETYY-116【回收清点】新增回收时强制提醒清洗指引功能

- -0
- +15
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
- History
- Source
- Diff
./java/com/.../TousseDefinition.java

6:10 下午

jason

More
40748
changed 13 files
root:

解决jira问题：QYSRMYY-76【登录管理】新增强制用户定期修改登录密码功能

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

3:58 下午

jason

More
40734
changed 1 file
root:

解决jira问题：DGSETYY-122【外来器械申请单】【病区设置管理】新增申请科室与病区绑定功能

- -0
- +5
./java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./java/com/.../HttpOptionManagerSSTSImpl.java

3:20 下午

zc.li

More
40731
changed 3 files
root:

GDSKQYY-10 - 【科室供应室设置】新增指定器械包装配时不自动装载到灭菌篮筐

- -0
- +46
./java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/AutobasketInsertionConfig.java
- History
- Source
./java/com/.../AutobasketInsertionConfig.java
… 2 more files in changeset.

3:20 下午

zc.li

More
40730
changed 5 files
root:

GDSKQYY-10 - 【科室供应室设置】新增指定器械包装配时不自动装载到灭菌篮筐

- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java
- -1
- +9
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigManager.java
- -1
- +5
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java
- History
- Source
- Diff
./java/.../SupplyRoomConfigTableManager.java
- -0
- +66
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
- History
- Source
- Diff
./java/.../SupplyRoomConfigManagerImpl.java
- -2
- +15
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfig.java

5:57 下午

jason

More
40727
changed 3 files
root:

解决jira问题：DGSETYY-122【外来器械申请单】【病区设置管理】新增申请科室与病区绑定功能

- -1
- +2
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManagerImpl.java
- History
- Source
- Diff
./java/.../OrgUnitPatientAreaRelationManagerImpl.java
… 2 more files in changeset.

5:06 下午

jason

More
40726
changed 1 file
root:

解决jira问题：DGSETYY-122【外来器械申请单】【病区设置管理】新增申请科室与病区绑定功能

- -7
- +15
./java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./java/com/.../HttpOptionManagerSSTSImpl.java

2:52 下午

jason

More
40720
changed 2 files
root:

解决jira问题：DGSETYY-122【外来器械申请单】【病区设置管理】新增申请科室与病区绑定功能

- -0
- +2
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManagerImpl.java
- History
- Source
- Diff
./java/.../OrgUnitPatientAreaRelationManagerImpl.java
- -0
- +2
./java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./java/com/.../HttpOptionManagerSSTSImpl.java

11:39 上午

jason

More
40716
changed 16 files
root:

解决jira问题：DGSETYY-122【外来器械申请单】【病区设置管理】新增申请科室与病区绑定功能

- -0
- +394
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManagerImpl.java
- History
- Source
./java/.../OrgUnitPatientAreaRelationManagerImpl.java
- -0
- +52
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service/OrgUnitPatientAreaRelationManager.java
- History
- Source
./java/.../OrgUnitPatientAreaRelationManager.java
- -0
- +90
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/controller/OrgUnitPatientAreaRelationController.java
- History
- Source
./java/.../OrgUnitPatientAreaRelationController.java
- -30
- +91
./java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./java/com/.../HttpOptionManagerSSTSImpl.java
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/controller
- History
- Source
./java/com/.../controller
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation/service
- History
- Source
./java/com/.../orgunitpatientarearelation/service
./java/com/forgon/disinfectsystem/basedatamanager/orgunitpatientarearelation
- History
- Source
./java/com/.../orgunitpatientarearelation
… 9 more files in changeset.

3:44 下午

jason

More
40704
changed 1 file
root:

解决jira问题：GDSFYBJY-27 外来器械二次清洗归还后，对应清洗篮筐没有进行释放

- -7
- +14
./java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
- History
- Source
- Diff
./java/com/.../ClassifyBasketManagerImpl.java

11:53 上午

zc.li

More
40684
changed 7 files
root:

DGSETYY-79 【PC】新增【清洗类型】功能且限制不同类型的物品不可入同一个篮筐

- -1
- +12
./java/com/forgon/disinfectsystem/entity/basedatamanager/cleanmethod/CleanMethod.java
- History
- Source
- Diff
./java/com/.../cleanmethod/CleanMethod.java
… 6 more files in changeset.

5:57 下午

jason

More
40683
changed 2 files
root:

解决jira问题：FSEYEQ-27 消毒包字典及使用记录接口(HIPMessageServiceV2)的改进

- -0
- +13
./java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
- History
- Source
- Diff
./java/com/.../MaterialDefinition.java
… 1 more file in changeset.

3:00 下午

zc.li

More
40668
changed 1 file
root:

GDSKQYY-8 - 【容器管理】新增装配后物品自动装载到灭菌篮筐功能

- -0
- +2
./java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
- History
- Source
- Diff
./java/com/.../ContainerManagerImpl.java

11:22 上午

zc.li

More
40663
changed 6 files
root:

GDSKQYY-8 - 【容器管理】新增装配后物品自动装载到灭菌篮筐功能

- -18
- +35
./java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
- History
- Source
- Diff
./java/com/.../action/ContainerAction.java
- -6
- +154
./java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
- History
- Source
- Diff
./java/com/.../ContainerManagerImpl.java
- -0
- +55
./java/com/forgon/disinfectsystem/entity/basedatamanager/container/ContainerBinding.java
- History
- Source
./java/com/.../container/ContainerBinding.java
- -2
- +25
./java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
- History
- Source
- Diff
./java/com/.../service/ContainerManager.java
… 2 more files in changeset.

5:58 下午

jason

More
40612
changed 32 files
root:

解决jira问题：GZFDZL-163 【接口对接】【科室申领】【退货管理】根据HIS系统提供的收费和退费记录数据自动生成申请单和预退货单

- -0
- +105
./java/com/forgon/disinfectsystem/entity/returngoodsrecord/ThirdPartyRefundRecordItem.java
- History
- Source
./java/com/.../ThirdPartyRefundRecordItem.java
- -1
- +7
./java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
- History
- Source
- Diff
./java/com/.../invoicemanager/InvoicePlan.java
- -0
- +263
./java/com/forgon/disinfectsystem/entity/returngoodsrecord/ThirdPartyRefundRecord.java
- History
- Source
./java/com/.../ThirdPartyRefundRecord.java
- -0
- +91
./java/com/forgon/disinfectsystem/entity/returngoodsrecord/PreReturnGoodsItem.java
- History
- Source
./java/com/.../PreReturnGoodsItem.java
- -0
- +180
./java/com/forgon/disinfectsystem/entity/invoicemanager/ThirdPartyChargeRecordItem.java
- History
- Source
./java/com/.../ThirdPartyChargeRecordItem.java
- -0
- +49
./java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java
- History
- Source
- Diff
./java/com/.../ReturnGoodsRecord.java
- -0
- +248
./java/com/forgon/disinfectsystem/entity/invoicemanager/ThirdPartyChargeRecord.java
- History
- Source
./java/com/.../ThirdPartyChargeRecord.java
… 25 more files in changeset.

5:04 下午

jason

More
40587
changed 6 files
root:

解决jira问题：QHRSGZZYY-17 【接口管理】开发获取患者信息的webservice接口，用于【外来器械申请】以及【病人使用记录】填写

- -0
- +18
./java/com/forgon/disinfectsystem/common/CssdUtils.java
- History
- Source
- Diff
./java/com/forgon/.../common/CssdUtils.java
… 5 more files in changeset.

2:06 下午

zc.li

More
40583
changed 8 files
root:

JMSZXYY-112 - 【设备接口管理】史帝瑞长龙清洗机修复图标不显示，新增FTP功能，新增手动关联功能

- -0
- +4
./java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
- History
- Source
- Diff
./java/com/.../WashAndDisinfectRecord.java
- -0
- +6
./java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
- History
- Source
- Diff
./java/com/.../DeviceInterface.java
- -3
- +23
./java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfChangLong.java
- History
- Source
- Diff
./java/com/.../WashDataOfChangLong.java
… 5 more files in changeset.

11:53 上午

jason

More
40564
changed 5 files
root:

解决jira问题：ZSYY-428【外来器械包申请】新增扩展字段“供应室接收人”、”申请人条码框“

- -1
- +30
./java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
- History
- Source
- Diff
./java/com/.../ForeignTousseApplication.java
… 4 more files in changeset.

2:23 下午

jason

More
40550
changed 9 files
root:

解决jira问题：ZSYY-429【外来器械包申请】配置项“enableReturneeOfForeignTousseSupplier”新增同步归还接收人信息和显示归还接收人联系电话

- -2
- +3
./java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
- History
- Source
- Diff
./java/com/.../service/SupplierManager.java
- -7
- +2
./java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
- History
- Source
- Diff
./java/com/.../action/SupplierAction.java
- too large
./java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfigAction.java
- -0
- +36
./java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./java/com/.../SupplyRoomConfig.java
- -1
- +4
./java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
- History
- Source
- Diff
./java/com/.../SupplierManagerImpl.java
… 4 more files in changeset.

5:23 下午

zc.li

More
40534
changed 2 files
root:

提交后台代码 DGSETYY-111 美雅洁清洗机MAG-120的接口改进

- -1
- +12
./java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge120CSV.java
- History
- Source
- Diff
./java/com/.../WashDataOfMarge120CSV.java
… 1 more file in changeset.

5:44 下午

zc.li

More
40521
changed 1 file
root:

测试代码还原

- -1
- +1
./java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./java/com/.../HttpOptionManagerSSTSImpl.java

main

Line History

Stats

Commits this week: 5

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

zc.li

jason

jason

zc.li

zc.li

jason

zc.li

zc.li

jason

jason

jason

jason

zc.li

zc.li

jason

jason

jason

jason

jason

zc.li

jason

zc.li

zc.li

jason

jason

zc.li

jason

jason

zc.li

zc.li