Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java

11:19 上午

jason

More
26249
changed 16 files
V4.1.0

解决:GZS12RMYY-27 HIS接口由视图改平台

广州12人民医院科室、人员、病人MQ接口功能

- ?
./com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java
- History
- Source
./com/forgon/.../gzs12rmyy/MQDataDaoImpl.java
- ?
./com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java
- History
- Source
./com/forgon/.../gzs12rmyy/MQHelper.java
- ?
./com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
- History
- Source
- Diff
./com/.../DataSynchronizationManagerImpl.java
./com/forgon/disinfectsystem/mq/dao/gzs12rmyy
- History
- Source
./com/forgon/disinfectsystem/mq/dao/gzs12rmyy
- ?
./com/forgon/disinfectsystem/mq/dao/gzs12rmyy/SimpleStringUtil2.java
- History
- Source
./com/forgon/.../gzs12rmyy/SimpleStringUtil2.java
- ?
./com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../WebsphereMqDaoImpl.java
… 10 more files in changeset.

8:59 下午

yanweining

More
26116
changed 10 files
V4.1.0

GZSDBRMYY-1：科室人员导入导致科室编码重复的问题

1.新写了人员，科室导入excel的方法

2.新的人员，科室excel导入模板

3.导入页面显示成功失败的信息

- ?
./com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
- History
- Source
- Diff
./com/.../DataSynchronizationManagerImpl.java
… 9 more files in changeset.

7:07 下午

yanweining

More
25993
changed 11 files
V4.1.0

解决：

因新疆军区总医院物资系统的物品定义物资编码不唯一导致同步入库失败

故新增：按名称规格查询物品信息接口方法

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/fsfy/InventoryDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../fsfy/InventoryDaoImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy/InventoryDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../dgsdhyy/InventoryDaoImpl.java
… 8 more files in changeset.

3:00 下午

shuyongfu

More
25978
changed 2 files
V4.1.0

解决Jira问题: SZSSKRMYY-27 his地址的更改

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../DatasyncConstant.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../DatasyncConstant.java

6:47 下午

yanweining

More
25722
changed 4 files
V4.1.0

一次性物品同步入/退库：完善注释，返回的错误信息

- ?
./com/forgon/disinfectsystem/inventorymanagement/dwr/InventoryTableManager.java
- History
- Source
- Diff
./com/forgon/.../InventoryTableManager.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
… 2 more files in changeset.

5:28 下午

shuyongfu

More
25684
changed 1 file
V4.1.0

去掉不用的类的import,告警的代码增加注解

- ?
./com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
- History
- Source
- Diff
./com/.../DataSynchronizationManagerImpl.java

4:03 下午

shuyongfu

More
25379
changed 3 files
V4.1.0

病人、科室人员的http接口字符集编码由utf-8改为gb2312

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByHospitalNumDaoImpl.java
- History
- Source
- Diff
./com/.../FindPatientInfoByHospitalNumDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByTreatmentNumDaoImpl.java
- History
- Source
- Diff
./com/.../FindPatientInfoByTreatmentNumDaoImpl.java

10:38 上午

shuyongfu

More
25275
changed 3 files
V4.1.0

中山眼科中心hrp接口问题调整

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
- History
- Source
- Diff
./com/.../WriteBackInventoryManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
… 1 more file in changeset.

6:08 下午

shuyongfu

More
25246
changed 45 files
V4.1.0

中山眼科hrp接口合同(及集成平台、科研系统等对接的部分)相关的内容提交

- ?
./com/forgon/disinfectsystem/project/dao/zsykzx/ProjectDaoImpl.java
- History
- Source
./com/forgon/.../zsykzx/ProjectDaoImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/fsfy/InventoryDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../fsfy/InventoryDaoImpl.java
- ?
./com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqHelper.java
- History
- Source
- Diff
./com/forgon/.../zsykzx/WebsphereMqHelper.java
- ?
./com/forgon/disinfectsystem/project/service/ProjectManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../ProjectManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy/InventoryDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../dgsdhyy/InventoryDaoImpl.java
./com/forgon/disinfectsystem/project/dao/zsykzx
- History
- Source
./com/forgon/disinfectsystem/project/dao/zsykzx
- ?
./com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
- History
- Source
- Diff
./com/.../DataSynchronizationManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
- History
- Source
- Diff
./com/.../WriteBackInventoryManagerImpl.java
./com/forgon/disinfectsystem/project/dao
- History
- Source
./com/forgon/disinfectsystem/project/dao
- ?
./com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../WebsphereMqDaoImpl.java
… 34 more files in changeset.

5:37 下午

shuyongfu

More
25221
changed 1 file
V4.1.0

科室、人员、病人接口webservice地址调整:

原地址:http://192.168.10.44:7001/fsfyservice/Proxy_Services/gysbaseIntf

现地址:http://192.168.10.133/fsfyIntfCommService/baseIntf

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/fsfy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../fsfy/DatasyncConstant.java

2:22 下午

yanweining

More
25184
changed 1 file
V4.1.0

广州中医药附一：替换病人接口调用地址

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../gzzyyfy/DatasyncConstant.java

5:56 下午

yanweining

More
24557
changed 3 files
V4.1.0

广医口腔：科室,人员接口

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskqyy/DatasyncConstant.java
- History
- Source
./com/forgon/.../gzykdxfskqyy/DatasyncConstant.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskqyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java
- History
- Source
- Diff
./com/.../ButtjointUserAndOrgAndPatientController.java

3:23 下午

yanweining

More
24332
changed 5 files
V4.1.0

广医口腔接口

- ?
./com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java
- History
- Source
- Diff
./com/.../ButtjointUserAndOrgAndPatientController.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskqyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
./com/forgon/.../SyncOrgUnitAndUserDaoImpl.java
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskqyy
- History
- Source
./com/forgon/disinfectsystem/.../dao/gzykdxfskqyy
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskq
- History
- Source
- Diff
./com/forgon/.../dao/gzykdxfskq
… 1 more file in changeset.

10:36 上午

yanweining

More
24328
changed 2 files
V4.1.0

广医口腔接口

- ?
./com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java
- History
- Source
- Diff
./com/.../ButtjointUserAndOrgAndPatientController.java
… 1 more file in changeset.

6:45 下午

yanweining

More
24326
changed 19 files
V4.1.0

广医口腔:人员科室http同步接口

SyncOrgUnitAndUserDao接口增加方法：paramToOrgUnitVos ；paramToUserVos ；buttjoinResponse

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskq/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
./com/forgon/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/fsfy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
./com/forgon/disinfectsystem/datasynchronization/controller
- History
- Source
./com/forgon/.../datasynchronization/controller
- ?
./com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java
- History
- Source
./com/.../ButtjointUserAndOrgAndPatientController.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
./com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskq
- History
- Source
./com/forgon/disinfectsystem/.../dao/gzykdxfskq
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
- Diff
./com/.../SyncOrgUnitAndUserDaoImpl.java
… 6 more files in changeset.

6:53 下午

shuyongfu

More
24154
changed 1 file
V4.1.0

解决Jira问题:SZSSKRMYY-1 准备连接HIS接口的工作

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../DatasyncConstant.java

3:19 下午

shuyongfu

More
24147
changed 7 files
V4.1.0

解决Jira问题:SZSSKRMYY-1 准备连接HIS接口的工作

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
- History
- Source
./com/.../FindPatientInfoByTreatmentNumDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/FindPatientInfoByHospitalNumDaoImpl.java
- History
- Source
./com/.../FindPatientInfoByHospitalNumDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/DatasyncConstant.java
- History
- Source
./com/forgon/.../szsskrmyy/DatasyncConstant.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
./com/forgon/.../SyncOrgUnitAndUserDaoImpl.java
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy
- History
- Source
./com/forgon/disinfectsystem/.../dao/szsskrmyy
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/WebServiceClientHelper.java
- History
- Source
./com/forgon/.../WebServiceClientHelper.java
… 1 more file in changeset.

1:12 下午

shuyongfu

More
24048
changed 4 files
V4.1.0

解决Jira问题:GZZYYFY-2 HIS接口调试

增加门诊病人接口

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../gzzyyfy/DatasyncConstant.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/HttpInterfaceHelper.java
- History
- Source
- Diff
./com/forgon/.../HttpInterfaceHelper.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByTreatmentNumDaoImpl.java
- History
- Source
./com/.../FindPatientInfoByTreatmentNumDaoImpl.java
… 1 more file in changeset.

11:53 上午

shuyongfu

More
23988
changed 1 file
V4.1.0

解决Jira问题:ZSYY-256 使用记录病人接口字段调取

增加对手术名称从手术预约里取值

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/zsyy/FindPatientInfoByHospitalNumDaoImpl.java
- History
- Source
- Diff
./com/.../FindPatientInfoByHospitalNumDaoImpl.java

11:14 上午

yanweining

More
23884
changed 5 files
V4.1.0

GGSRMYY-46：一次性物品接口同步入库仓库更改

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dwr/InventoryTableManager.java
- History
- Source
- Diff
./com/forgon/.../InventoryTableManager.java
… 3 more files in changeset.

11:08 下午

shuyongfu

More
23811
changed 2 files
V4.1.0

1.接口地址与授权码切换为正式环境

2.处理Jira问题:GZZYYFY-2 HIS接口调试解决手术间字段未同步进来的问题

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/DatasyncConstant.java
- History
- Source
- Diff
./com/forgon/.../gzzyyfy/DatasyncConstant.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByHospitalNumDaoImpl.java
- History
- Source
- Diff
./com/.../FindPatientInfoByHospitalNumDaoImpl.java

4:25 下午

yanweining

More
23639
changed 6 files
V4.1.0

GDSRMYY-442:一次性入库单返签

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
… 5 more files in changeset.

8:41 下午

shuyongfu

More
23629
changed 6 files
V4.1.0

解决Jira问题:GZZYYFY-2 HIS接口调试

- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/DatasyncConstant.java
- History
- Source
./com/forgon/.../gzzyyfy/DatasyncConstant.java
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy
- History
- Source
./com/forgon/disinfectsystem/.../dao/gzzyyfy
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/HttpInterfaceHelper.java
- History
- Source
./com/forgon/.../gzzyyfy/HttpInterfaceHelper.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByHospitalNumDaoImpl.java
- History
- Source
./com/.../FindPatientInfoByHospitalNumDaoImpl.java
- ?
./com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java
- History
- Source
./com/forgon/.../SyncOrgUnitAndUserDaoImpl.java
… 1 more file in changeset.

3:55 下午

shuyongfu

More
23606
changed 12 files
V4.1.0

1.中山眼科中心hrp接口

2.GDSRMYY-439 库存对比改进

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/fsfy/InventoryDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../fsfy/InventoryDaoImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy/InventoryDaoImpl.java
- History
- Source
- Diff
./com/forgon/.../dgsdhyy/InventoryDaoImpl.java
… 9 more files in changeset.

2:54 下午

yanweining

More
22680
changed 4 files
V4.1.0

GDSRMYY-421：推送入库单支持推送至二级供应室

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java
… 3 more files in changeset.

10:31 上午

yanweining

More
22667
changed 1 file
V4.1.0

sznsrmmy:定时回写代码优化

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
- History
- Source
- Diff
./com/.../WriteBackInventoryManagerImpl.java

6:21 下午

yanweining

More
22646
changed 3 files
V4.1.0

sznsrmyy:解决回写结果转json错误

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
- History
- Source
- Diff
./com/.../WriteBackInventoryManagerImpl.java
- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/helper/WebServiceClientHelper.java
- History
- Source
- Diff
./com/forgon/.../WebServiceClientHelper.java
… 1 more file in changeset.

11:37 上午

yanweining

More
22504
changed 2 files
V4.1.0

SZNSRMYY:回写代码更新

- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/helper/WebServiceClientHelper.java
- History
- Source
- Diff
./com/forgon/.../WebServiceClientHelper.java
… 1 more file in changeset.

8:28 下午

yanweining

More
22486
changed 5 files
V4.1.0

sznsrmyy:更新至现场最新wsdl版本

- ?
./com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/Constant.java
- History
- Source
- Diff
./com/forgon/.../sznsrmyy/Constant.java
- ?
./org/tempuri/CSSDServiceSoap.java
- History
- Source
- Diff
./org/tempuri/CSSDServiceSoap.java
- ?
./org/tempuri/CSSDServiceSoapStub.java
- History
- Source
- Diff
./org/tempuri/CSSDServiceSoapStub.java
- ?
./org/tempuri/CSSDServiceSoapProxy.java
- History
- Source
- Diff
./org/tempuri/CSSDServiceSoapProxy.java
… 1 more file in changeset.

2:49 下午

shuyongfu

More
22475
changed 1 file
V4.1.0

解决jira:GDSRMYY-412 同一张入库单存在同一物品两个批次会产生一个新的物品

- ?
./com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InventoryManagerImpl.java

java

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

yanweining

yanweining

shuyongfu

yanweining

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

yanweining

yanweining

yanweining

yanweining

yanweining

shuyongfu

shuyongfu

shuyongfu

shuyongfu

yanweining

shuyongfu

yanweining

shuyongfu

shuyongfu

yanweining

yanweining

yanweining

yanweining

yanweining

shuyongfu