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 32a6c2a..9df58d9 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 @@ -706,10 +706,10 @@ public class BabyBookbuildingFacade { patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); - //添加产后追访信息 - TrackDownRecord trackDownRecord = patient.build(); - trackDownRecord.setTrackType(TrackDownDateEnums.F.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + // //添加产后追访信息 + // TrackDownRecord trackDownRecord = patient.build(); + // trackDownRecord.setTrackType(TrackDownDateEnums.F.getId()); + // trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), patients, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档"); } @@ -804,6 +804,7 @@ public class BabyBookbuildingFacade { } + /** * 创建建档短信 */ 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 7c12cf4..61c5c06 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 @@ -392,7 +392,7 @@ public class MatDeliverFacade { /** - * 添加或更新追访信息 + * 分娩添加或更新追访信息 * @param userId * @param patient * @param patient 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 4dd260b..3a30579 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PremaritalCheckupService; import com.lyms.platform.biz.service.ResidentsArchiveService; +import com.lyms.platform.biz.service.TrackDownRecordService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.MedicalAdviceEnum; import com.lyms.platform.common.enums.PhysiologyStatusEnum; @@ -33,6 +34,7 @@ import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.pojo.TrackDownRecord; import com.lyms.platform.query.PremaritalCheckupQuery; import com.lyms.platform.query.ResidentsArchiveQuery; +import com.lyms.platform.query.TrackDownRecordQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -64,6 +66,8 @@ public class PremaritalCheckupFacade { private UsersService usersService; @Autowired private ITrackDownService trackDownService; + @Autowired + private TrackDownRecordService trackDownRecordService; /** * 查询单个(男/女)婚前检查 @@ -738,24 +742,53 @@ public class PremaritalCheckupFacade { id = premaritalCheckup.getId(); } + addTrackDownInfo(userId,model); + return id; + } + + /** + * 新增居民健康档案时追访信息 + * @param userId + */ + public void addTrackDownInfo(Integer userId, ResidentsArchiveModel residentsArchiveModel) { + //新增婚检追访信息,默认进入婚检追访 + TrackDownRecord trackDownRecord = residentsArchiveModel.build(); + //先根据婚检id进行查询 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setSource(residentsArchiveModel.getId()); + List records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改,只修改基本信息,不修改显示状态和追访类型 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); + } else {//根据patient查询是否存在追访信息 + //根据医院id和身份证或手机号进行查询 + downRecordQuery = new TrackDownRecordQuery(); + downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId()); + if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){ + downRecordQuery.setKey(residentsArchiveModel.getCertificateNum()); + }else if(StringUtils.isNotEmpty(residentsArchiveModel.getPhone())){ + downRecordQuery.setPhone(residentsArchiveModel.getPhone()); + } + records = trackDownRecordService.queryTrackDown(downRecordQuery); + if (CollectionUtils.isNotEmpty(records)) {//修改 + TrackDownRecord trackDownRecord1 = records.get(0); + trackDownRecord.setId(trackDownRecord1.getId()); + } + } + //新增婚前检查结束,男的结束流程,女的进入怀孕建档) - if (model.getSex().equals(SystemConfig.WOMAN_ID)) { + if (residentsArchiveModel.getSex().equals(SystemConfig.WOMAN_ID)) { //新增婚检追访信息 - TrackDownRecord record = model.build(); - record.setStatus(1); - record.setTrackType(TrackDownDateEnums.B.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,record); - } else if (model.getSex().equals(SystemConfig.MAN_ID)) { + trackDownRecord.setTrackType(TrackDownDateEnums.B.getId()); + } else if (residentsArchiveModel.getSex().equals(SystemConfig.MAN_ID)) { //新增婚检追访信息 - TrackDownRecord record = model.build(); - record.setStatus(0); - record.setTrackType(TrackDownDateEnums.A.getId()); - trackDownService.addOrupdateTrackDownRecord(userId,record); + trackDownRecord.setStatus(0); } - - return id; + trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); } + + /** * 删除一条婚前检查记录 * @param id 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 04a62f3..4995f69 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 @@ -398,7 +398,7 @@ public class ResidentsArchiveFacade{ } /** - * 婚检修改时应该判断是否有追访记录,可能在孕妇建档时已经生产了追访信息 + * 新增居民健康档案时追访信息 * @param userId */ public void addTrackDownInfo(Integer userId, ResidentsArchiveModel residentsArchiveModel) {