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

11:39 上午

jason

More
40716
changed 16 files
root:

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

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

3:44 下午

jason

More
40704
changed 1 file
root:

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

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

11:53 上午

zc.li

More
40684
changed 7 files
root:

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

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

5:57 下午

jason

More
40683
changed 2 files
root:

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

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

3:00 下午

zc.li

More
40668
changed 1 file
root:

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

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

11:22 上午

zc.li

More
40663
changed 6 files
root:

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

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

5:58 下午

jason

More
40612
changed 32 files
root:

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

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

5:04 下午

jason

More
40587
changed 6 files
root:

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

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

2:06 下午

zc.li

More
40583
changed 8 files
root:

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

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

11:53 上午

jason

More
40564
changed 5 files
root:

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

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

2:23 下午

jason

More
40550
changed 9 files
root:

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

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

5:23 下午

zc.li

More
40534
changed 2 files
root:

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

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

5:44 下午

zc.li

More
40521
changed 1 file
root:

测试代码还原

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

5:25 下午

zc.li

More
40520
changed 1 file
root:

用于测试Jenkins 故意提交一个错误代码

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

11:22 上午

jason

More
40486
changed 4 files
root:

解决jira问题：ZJYY-166 【患者使用记录】开启按病人信息合并后需要记录手术间信息

- -0
- +17
./main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
- History
- Source
- Diff
./main/java/com/.../useRecord/UseRecord.java
… 3 more files in changeset.

5:42 下午

jason

More
40478
changed 9 files
root:

解决jira问题：HZSRMYY-89【质量监测管理】登记为合格时也要支持录入器械包信息（非必填）

HZSRMYY-84【清洗区工作量及不合格率月报】新增统计只登记器械包的质量监测记录中的材料数量方式

- -0
- +77
./main/java/com/forgon/disinfectsystem/vo/QualityMonitoringGoodsVo.java
- History
- Source
./main/java/.../vo/QualityMonitoringGoodsVo.java
- -0
- +14
./main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringGoods.java
- History
- Source
- Diff
./main/java/.../QualityMonitoringGoods.java
… 7 more files in changeset.

3:48 下午

jason

More
40461
changed 6 files
root:

解决jira问题：FSEYEQ-19 【数据隔离】【科室发货计划设置】新增处理科室以及相关数据隔离功能

- -0
- +45
./main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceDepartment.java
- History
- Source
- Diff
./main/java/.../InvoiceDepartment.java
… 5 more files in changeset.

2:44 下午

jason

More
40458
changed 1 file
root:

解决jira问题：SZSDSRMYY-203【病人使用记录】标识牌使用次数达到上限时不转换申请单

- -0
- +1
./main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
- History
- Source
- Diff
./main/java/com/.../useRecord/UseRecord.java

6:08 下午

jason

More
40453
changed 6 files
root:

解决jira问题：FSEYEQ-18【数据隔离】【打印发货单设置】新增处理科室以及相关数据隔离功能

- -0
- +44
./main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java
- History
- Source
- Diff
./main/java/.../PrintInvoiceConfig.java
… 5 more files in changeset.

4:58 下午

jason

More
40431
changed 7 files
root:

解决jira问题：FSEYEQ-17 【数据隔离】【审核科室分组设置】审核科室分组新增处理科室

- -1
- +8
./main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/action/DepartmentGroupOptionAction.java
- History
- Source
- Diff
./main/.../DepartmentGroupOptionAction.java
- -0
- +45
./main/java/com/forgon/disinfectsystem/entity/departmentGroupOption/DepartmentGroupOption.java
- History
- Source
- Diff
./main/java/.../DepartmentGroupOption.java
- -1
- +10
./main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManager.java
- History
- Source
- Diff
./main/.../DepartmentGroupOptionManager.java
- -2
- +29
./main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManagerImpl.java
- History
- Source
- Diff
./main/.../DepartmentGroupOptionManagerImpl.java
- -3
- +102
./main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/dwr/table/DepartmentGroupOptionTableManager.java
- History
- Source
- Diff
./main/.../DepartmentGroupOptionTableManager.java
- -2
- +2
./main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
- History
- Source
- Diff
./main/.../SupplyRoomConfigManagerImpl.java
… 1 more file in changeset.

2:22 下午

jason

More
40426
changed 3 files
root:

解决jira问题：QHRSGZZYY-16【清洗机管理】【灭菌炉管理】新增维护和检测周期设置

- -1
- +29
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
- History
- Source
- Diff
./main/java/com/.../sterilizer/Sterilizer.java
- -0
- +7
./main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
- History
- Source
- Diff
./main/java/com/.../action/RinserAction.java
- -0
- +28
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
- History
- Source
- Diff
./main/java/com/.../rinser/Rinser.java

6:17 下午

zc.li

More
40423
changed 1 file
root:

GZSZYY-118 - 【不良事件上报(自定义表单管理)】新增设置只允许登记人修改记录设置

GZSZYY-113 - 【设备维护信息】新增自定义设备维护记录修改权限设置

- -2
- +2
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./main/java/.../SupplyRoomConfig.java

6:00 下午

jason

More
40422
changed 8 files
root:

解决jira问题：QHRSGZZYY-13 【外来器械包申请】外来器械包归还时追加是否清洗合格字段

- -0
- +16
./main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
- History
- Source
- Diff
./main/java/com/.../tousseitem/TousseItem.java
… 7 more files in changeset.

4:53 下午

zc.li

More
40412
changed 2 files
root:

解决 BJDXZLYY-64 【回收清点记录】扩展字段“回收时间”追加显示“回收人”、“清点人”

- -1
- +27
./main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingDateDetails.java
- History
- Source
- Diff
./main/java/.../RecyclingDateDetails.java
… 1 more file in changeset.

2:47 下午

zc.li

More
40411
changed 2 files
root:

GZSZYY-118 - 【不良事件上报(自定义表单管理)】新增设置只允许登记人修改记录设置

GZSZYY-113 - 【设备维护信息】新增自定义设备维护记录修改权限设置

- -1
- +25
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
- History
- Source
- Diff
./main/java/.../SupplyRoomConfig.java
- too large
./main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
./main/java/.../SupplyRoomConfigAction.java

3:19 下午

zc.li

More
40384
changed 2 files
root:

QHRSGZZYY-14【月度统计报表】新增多个数据统计

- -3
- +39
./main/java/com/forgon/disinfectsystem/entity/reportforms/OrgUnitUserAmountMonthly.java
- History
- Source
- Diff
./main/java/.../OrgUnitUserAmountMonthly.java
… 1 more file in changeset.

5:07 下午

zc.li

More
40377
changed 1 file
root:

注释补充 NYSY-75 【接口对接】【清洗消毒】“美雅洁 MAG-CL4”全自动多舱清洗消毒机设备接口开发

- -1
- +4
./main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMargeMAGCL4.java
- History
- Source
- Diff
./main/java/.../WashDataOfMargeMAGCL4.java

3:25 下午

zc.li

More
40370
changed 2 files
root:

解决 ZSYY-423 【外来器械包申请】新增一单多套模式下也支持再次翻包申请

- -1
- +12
./main/java/com/forgon/disinfectsystem/vo/OpenToBeRecycledRecordVo.java
- History
- Source
- Diff
./main/java/.../OpenToBeRecycledRecordVo.java
… 1 more file in changeset.

3:09 下午

zc.li

More
40332
changed 7 files
root:

解决 ZSWY-263 【患者使用记录】【器械包信息】新增字段“预处理时间”

- -0
- +4
./main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
- History
- Source
- Diff
./main/java/.../WashAndDisinfectRecord.java
- -0
- +4
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
- History
- Source
- Diff
./main/java/.../DeviceInterface.java
- -0
- +336
./main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMargeMAGCL4.java
- History
- Source
./main/java/.../washData/WashDataOfMargeMAGCL4.java
… 4 more files in changeset.

4:40 下午

zc.li

More
40327
changed 7 files
root:

解决 FSFY-115 【质量监测报表】新增“副表查询”功能

- -0
- +52
./main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/SubTable_FormDefinitionItem.java
- History
- Source
./main/java/.../SubTable_FormDefinitionItem.java
- -0
- +141
./main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/SubTableOfQualityMonitoring.java
- History
- Source
./main/java/.../SubTableOfQualityMonitoring.java
… 5 more files in changeset.

src

Line History

Stats

Commits this week: 10

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

zc.li

zc.li

zc.li

jason

jason

jason

jason

jason

jason

jason

zc.li

jason

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li