From 4efc58f8f13d11257f0b6b53585a2596644481ee Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 2 Mar 2018 11:05:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=B3=A8=EF=BC=9A=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E8=87=B3=E4=B8=8B=E4=B8=80=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E7=94=B7=E6=80=A7=E5=88=99=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/ResidentsArchiveModel.java | 1 + .../com/lyms/platform/pojo/TrackDownRecord.java | 9 +++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 5 +++-- .../web/facade/PremaritalCheckupFacade.java | 2 +- .../web/service/impl/TrackDownServiceImpl.java | 23 +++++++++++----------- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 8b0c9d7..918ecce 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -448,6 +448,7 @@ public class ResidentsArchiveModel extends BaseModel{ record.setSource(getId()); record.setCardNo(getCertificateNum()); record.setStatus(1); + record.setSex(sex); record.setTrackType(TrackDownDateEnums.A.getId()); return record; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java index fcc2ac8..ac0de68 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java @@ -28,6 +28,7 @@ public class TrackDownRecord extends BaseModel{ private Date birth; private String phone; private String cardNo; + private String sex; //末次月经 private Date lastMenses; /** @@ -51,6 +52,14 @@ public class TrackDownRecord extends BaseModel{ //数据所在的列表 private Integer trackType; + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + public String getResidentsArchiveId() { return residentsArchiveId; } 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 9df58d9..256b1f1 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 @@ -655,8 +655,9 @@ public class BabyBookbuildingFacade { patient.setCreated(new Date()); patients = yunBookbuildingService.addPregnantBookbuilding(patient); + //这里还需加判断验证，母亲的分娩时间是否在复查和追访的时间范围内 //添加产后追访信息 - TrackDownRecord trackDownRecord = patient.build(); + /*TrackDownRecord trackDownRecord = patient.build(); TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setParentId(trackDownRecord.getParentId()); //添加产后追访信息 @@ -675,7 +676,7 @@ public class BabyBookbuildingFacade { trackDownRecord.setStatus(1); trackDownRecord.setTrackType(TrackDownDateEnums.F.getId()); trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); - } + }*/ operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), patients, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档"); } 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 3a30579..dc40fcd 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 @@ -776,7 +776,7 @@ public class PremaritalCheckupFacade { } } - //新增婚前检查结束,男的结束流程，女的进入怀孕建档） + //新增婚前检查,男的结束流程，女的进入怀孕建档） if (residentsArchiveModel.getSex().equals(SystemConfig.WOMAN_ID)) { //新增婚检追访信息 trackDownRecord.setTrackType(TrackDownDateEnums.B.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index d5dc98b..05fd303 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -6,7 +6,6 @@ import com.lyms.platform.biz.service.TrackDownRecordService; import com.lyms.platform.biz.service.TrackDownService; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; -import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.common.utils.StringUtils; @@ -17,8 +16,6 @@ import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.TrackDownRecordQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -212,13 +209,13 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS public BaseResponse add(Integer userId, TrackDown trackDown) { String hospitalId = autoMatchFacade.getHospitalId(userId); //婚前检查 怀孕建档 的时候没有pid - if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() && TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) { - String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId); - trackDown.setPid(mongoUtil.getPid(parentId)); - trackDown.setParentId(parentId); - } - //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转 - if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() && + // if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() && TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) { + // String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId); + // trackDown.setPid(mongoUtil.getPid(parentId)); + // trackDown.setParentId(parentId); + // } + //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转 : 作废，孕妇建档时自动流转到孕检追访 + /*if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() && TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType() && StringUtils.isNotEmpty(trackDown.getParentId())) { @@ -242,13 +239,17 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } else { return new BaseResponse().setErrorcode(4016).setErrormsg("您还没有孕妇的档案,请去医院建档."); } - } + }*/ + //追访列表ID if (trackDown.getTrackDownRecId() != null) { TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId()); if (trackDownRecord != null) { //当传入的状态和数据库一致时才能进行有效操作 if (trackDownRecord.getTrackType().intValue() == trackDown.getTrackDownDateType()) { + if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType()&&"5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex())) {//性别男：特殊处理，流转到下一流程时结束流程 + trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId()); + } trackDown.setId(null); trackDown.setYn(YnEnums.YES.getId()); trackDown.setCreated(new Date()); -- 1.8.3.1