jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4efc58f8f13d11257f0b6b53585a2596644481ee

Authored by yangfei
1 parent 980d355c57
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

备注：流转至下一流程时，如果是男性则结束流程

Showing 5 changed files with 26 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ 4efc58f
... ... @@ -448,6 +448,7 @@
448 448 record.setSource(getId());
449 449 record.setCardNo(getCertificateNum());
450 450 record.setStatus(1);
  451 + record.setSex(sex);
451 452 record.setTrackType(TrackDownDateEnums.A.getId());
452 453 return record;
453 454 }
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java View file @ 4efc58f
... ... @@ -28,6 +28,7 @@
28 28 private Date birth;
29 29 private String phone;
30 30 private String cardNo;
  31 + private String sex;
31 32 //末次月经
32 33 private Date lastMenses;
33 34 /**
... ... @@ -50,6 +51,14 @@
50 51 private Integer status;
51 52 //数据所在的列表
52 53 private Integer trackType;
  54 +
  55 + public String getSex() {
  56 + return sex;
  57 + }
  58 +
  59 + public void setSex(String sex) {
  60 + this.sex = sex;
  61 + }
53 62  
54 63 public String getResidentsArchiveId() {
55 64 return residentsArchiveId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 4efc58f
... ... @@ -655,8 +655,9 @@
655 655 patient.setCreated(new Date());
656 656 patients = yunBookbuildingService.addPregnantBookbuilding(patient);
657 657  
  658 + //这里还需加判断验证，母亲的分娩时间是否在复查和追访的时间范围内
658 659 //添加产后追访信息
659   - TrackDownRecord trackDownRecord = patient.build();
  660 + /*TrackDownRecord trackDownRecord = patient.build();
660 661 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
661 662 downRecordQuery.setParentId(trackDownRecord.getParentId());
662 663 //添加产后追访信息
... ... @@ -675,7 +676,7 @@
675 676 trackDownRecord.setStatus(1);
676 677 trackDownRecord.setTrackType(TrackDownDateEnums.F.getId());
677 678 trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
678   - }
  679 + }*/
679 680  
680 681 operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), patients, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档");
681 682 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 4efc58f
... ... @@ -776,7 +776,7 @@
776 776 }
777 777 }
778 778  
779   - //新增婚前检查结束,男的结束流程，女的进入怀孕建档）
  779 + //新增婚前检查,男的结束流程，女的进入怀孕建档）
780 780 if (residentsArchiveModel.getSex().equals(SystemConfig.WOMAN_ID)) {
781 781 //新增婚检追访信息
782 782 trackDownRecord.setTrackType(TrackDownDateEnums.B.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 4efc58f
... ... @@ -6,7 +6,6 @@
6 6 import com.lyms.platform.biz.service.TrackDownService;
7 7 import com.lyms.platform.common.enums.*;
8 8 import com.lyms.platform.common.result.*;
9   -import com.lyms.platform.common.result.BaseObjectResponse;
10 9 import com.lyms.platform.common.utils.DateUtil;
11 10 import com.lyms.platform.common.utils.EnumUtil;
12 11 import com.lyms.platform.common.utils.StringUtils;
... ... @@ -17,8 +16,6 @@
17 16 import com.lyms.platform.operate.web.utils.ResponseUtil;
18 17 import com.lyms.platform.permission.dao.master.CouponMapper;
19 18 import com.lyms.platform.pojo.*;
20   -import com.lyms.platform.query.PatientsQuery;
21   -import com.lyms.platform.query.TrackDownRecordQuery;
22 19 import org.springframework.beans.factory.annotation.Autowired;
23 20 import org.springframework.data.domain.Sort;
24 21 import org.springframework.data.mongodb.core.MongoTemplate;
... ... @@ -212,13 +209,13 @@
212 209 public BaseResponse add(Integer userId, TrackDown trackDown) {
213 210 String hospitalId = autoMatchFacade.getHospitalId(userId);
214 211 //婚前检查 怀孕建档 的时候没有pid
215   - if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() && TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) {
216   - String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId);
217   - trackDown.setPid(mongoUtil.getPid(parentId));
218   - trackDown.setParentId(parentId);
219   - }
220   - //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转
221   - if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() &&
  212 + // if (TrackDownDateEnums.A.getId() != trackDown.getTrackDownDateType() && TrackDownDateEnums.B.getId() != trackDown.getTrackDownDateType()) {
  213 + // String parentId = mongoUtil.doHidePatient(trackDown.getParentId(), hospitalId);
  214 + // trackDown.setPid(mongoUtil.getPid(parentId));
  215 + // trackDown.setParentId(parentId);
  216 + // }
  217 + //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转 : 作废，孕妇建档时自动流转到孕检追访
  218 + /*if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() &&
222 219 TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType()
223 220 && StringUtils.isNotEmpty(trackDown.getParentId())) {
224 221  
225 222  
... ... @@ -242,13 +239,17 @@
242 239 } else {
243 240 return new BaseResponse().setErrorcode(4016).setErrormsg("您还没有孕妇的档案,请去医院建档.");
244 241 }
245   - }
  242 + }*/
  243 +
246 244 //追访列表ID
247 245 if (trackDown.getTrackDownRecId() != null) {
248 246 TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId());
249 247 if (trackDownRecord != null) {
250 248 //当传入的状态和数据库一致时才能进行有效操作
251 249 if (trackDownRecord.getTrackType().intValue() == trackDown.getTrackDownDateType()) {
  250 + if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType()&&"5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex())) {//性别男：特殊处理，流转到下一流程时结束流程
  251 + trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId());
  252 + }
252 253 trackDown.setId(null);
253 254 trackDown.setYn(YnEnums.YES.getId());
254 255 trackDown.setCreated(new Date());