From c87f30e4189dc824594cd21f4a0951a76c7dee7d Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 22 Mar 2018 11:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java | 1 + .../com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 1 + .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 3 +-- .../java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java | 2 ++ .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 1 + .../com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/PostReviewFacade.java | 1 + .../lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 2 ++ .../com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 2 ++ .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java | 1 + .../com/lyms/platform/operate/web/facade/StopPregnancyFacade.java | 1 + .../com/lyms/platform/operate/web/facade/TrackDownJobFacade.java | 5 +++++ 12 files changed, 20 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 56fce05..57c33fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -638,6 +638,7 @@ public class AntenatalExaminationFacade { //根据patient查询是否存在追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patient.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b027fb9..25d62a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -799,6 +799,7 @@ public class BabyBookbuildingFacade { //查询是否存在追访记录，如果有则修改，没有则新增 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setPids(Arrays.asList(patients.getPid())); List records = downRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 5758823..51987eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -15,7 +15,6 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BookBuildManagerQueryRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; @@ -33,7 +32,6 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -406,6 +404,7 @@ public class BookbuildingFacade { //根据patient查询是否存在追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patient.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index dd0a81f..36c1fb8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -161,6 +161,7 @@ public class FolicAcidFacade { //先根据婚检id进行查询 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setSource(parentId); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); @@ -168,6 +169,7 @@ public class FolicAcidFacade { } else {//根据patient查询是否存在追访信息 //根据医院id和身份证或手机号进行查询 downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId()); if (StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())) { downRecordQuery.setKey(residentsArchiveModel.getCertificateNum()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 89b4a6f..3f9ac82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -416,6 +416,7 @@ public class MatDeliverFacade { //查询是否存在追访记录，如果有则修改，没有则新增 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patients.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); logger.info("CHTrackDownDataLoader addTrackDown by id :" + patients.getId()); if (CollectionUtils.isNotEmpty(records)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index 338fd25..5337188 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -233,7 +233,7 @@ public class MatdeliverFollowFacade { } /** - * 初诊、复诊添加或更新追访信息 + * 添加或更新追访信息 * * @param userId * @param patient @@ -245,13 +245,13 @@ public class MatdeliverFollowFacade { //添加产后追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(trackDownRecord.getParentId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) { TrackDownRecord trackDownRecord1 = records.get(0); trackDownRecord.setId(trackDownRecord1.getId()); trackDownRecord.setHospitalId(maternalDeliverModel.getHospitalId()); - trackDownRecord.setStatus(1); trackDownRecord.setSource(maternalDeliverModel.getId()); trackDownRecord.setTrackType(TrackDownDateEnums.F.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 8322673..046b626 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -217,6 +217,7 @@ public class PostReviewFacade { //添加产后追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(trackDownRecord.getParentId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) { TrackDownRecord trackDownRecord1 = records.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index fa55358..e852746 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -756,6 +756,7 @@ public class PremaritalCheckupFacade { //先根据婚检id进行查询 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setSource(residentsArchiveModel.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); @@ -763,6 +764,7 @@ public class PremaritalCheckupFacade { } else {//根据patient查询是否存在追访信息 //根据医院id和身份证或手机号进行查询 downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId()); if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){ downRecordQuery.setCardNo(residentsArchiveModel.getCertificateNum()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 5901eae..908f133 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -406,6 +406,7 @@ public class ResidentsArchiveFacade{ TrackDownRecord trackDownRecord = residentsArchiveModel.build(); //先根据婚检id进行查询 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setSource(residentsArchiveModel.getId()); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 @@ -414,6 +415,7 @@ public class ResidentsArchiveFacade{ } else {//根据patient查询是否存在追访信息 //根据医院id和身份证或手机号进行查询 downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId()); if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){ downRecordQuery.setKey(residentsArchiveModel.getCertificateNum()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 9995a6f..903233e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -129,6 +129,7 @@ public class SieveFacade { //查询是否存在追访记录，如果有则修改，没有则新增 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patients.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) { TrackDownRecord track = records.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index cb96575..582ca55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -255,6 +255,7 @@ public class StopPregnancyFacade { //根据patient查询是否存在追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(patient.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java index 1e41de9..34b4f51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java @@ -181,12 +181,14 @@ public class TrackDownJobFacade { //根据patient查询是否存在追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(model.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改 TrackDownRecord trackDownRecord1 = records.get(0); trackDownRecord.setId(trackDownRecord1.getId()); } else {//不存在则查询继续查追访记录，可能来至妇女建档追访数据 downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setHospitalId(model.getHospitalId()); if (StringUtils.isNotEmpty(model.getCardNo())) { downRecordQuery.setCardNo(model.getCardNo()); @@ -277,6 +279,7 @@ public class TrackDownJobFacade { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setSource(model.getId()); + downRecordQuery.setStatus(3); List records = trackDownRecordService.queryTrackDown(downRecordQuery); if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型 @@ -285,6 +288,7 @@ public class TrackDownJobFacade { } else {//根据patient查询是否存在追访信息 //根据医院id和身份证或手机号进行查询 downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setHospitalId(model.getHospitalId()); if (StringUtils.isNotEmpty(model.getCertificateNum())) { downRecordQuery.setCardNo(model.getCertificateNum()); @@ -489,6 +493,7 @@ public class TrackDownJobFacade { } //查询是否存在追访记录，如果有则修改，没有则新增 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setStatus(3); downRecordQuery.setParentId(patients.getId()); List records = downRecordService.queryTrackDown(downRecordQuery); logger.info("CHTrackDownDataLoader addTrackDown by id :" + patients.getId()); -- 1.8.3.1