jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 980d355c57fe3d085bd88da3a275aaa04ac00502

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

追访数据个节点更新bug第四轮联合测bug修改

Showing 4 changed files with 52 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 980d355
... ... @@ -706,10 +706,10 @@
706 706 patient.setCreated(new Date());
707 707 patients = yunBookbuildingService.addPregnantBookbuilding(patient);
708 708  
709   - //添加产后追访信息
710   - TrackDownRecord trackDownRecord = patient.build();
711   - trackDownRecord.setTrackType(TrackDownDateEnums.F.getId());
712   - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
  709 + // //添加产后追访信息
  710 + // TrackDownRecord trackDownRecord = patient.build();
  711 + // trackDownRecord.setTrackType(TrackDownDateEnums.F.getId());
  712 + // trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
713 713  
714 714 operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), patients, OptActionEnums.ADD.getId(), "儿童建档时候添加孕妇建档");
715 715 }
... ... @@ -802,6 +802,7 @@
802 802 }
803 803 return br;
804 804 }
  805 +
805 806  
806 807  
807 808 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 980d355
... ... @@ -392,7 +392,7 @@
392 392  
393 393  
394 394 /**
395   - * 添加或更新追访信息
  395 + * 分娩添加或更新追访信息
396 396 * @param userId
397 397 * @param patient
398 398 * @param patient
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 980d355
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4 4 import com.lyms.platform.biz.service.PremaritalCheckupService;
5 5 import com.lyms.platform.biz.service.ResidentsArchiveService;
  6 +import com.lyms.platform.biz.service.TrackDownRecordService;
6 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 8 import com.lyms.platform.common.enums.MedicalAdviceEnum;
8 9 import com.lyms.platform.common.enums.PhysiologyStatusEnum;
... ... @@ -33,6 +34,7 @@
33 34 import com.lyms.platform.pojo.TrackDownRecord;
34 35 import com.lyms.platform.query.PremaritalCheckupQuery;
35 36 import com.lyms.platform.query.ResidentsArchiveQuery;
  37 +import com.lyms.platform.query.TrackDownRecordQuery;
36 38 import org.apache.commons.collections.CollectionUtils;
37 39 import org.apache.commons.lang.StringUtils;
38 40 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -64,6 +66,8 @@
64 66 private UsersService usersService;
65 67 @Autowired
66 68 private ITrackDownService trackDownService;
  69 + @Autowired
  70 + private TrackDownRecordService trackDownRecordService;
67 71  
68 72 /**
69 73 * 查询单个(男/女)婚前检查
70 74  
71 75  
72 76  
73 77  
74 78  
... ... @@ -738,23 +742,52 @@
738 742 id = premaritalCheckup.getId();
739 743 }
740 744  
  745 + addTrackDownInfo(userId,model);
  746 + return id;
  747 + }
  748 +
  749 + /**
  750 + * 新增居民健康档案时追访信息
  751 + * @param userId
  752 + */
  753 + public void addTrackDownInfo(Integer userId, ResidentsArchiveModel residentsArchiveModel) {
  754 + //新增婚检追访信息，默认进入婚检追访
  755 + TrackDownRecord trackDownRecord = residentsArchiveModel.build();
  756 + //先根据婚检id进行查询
  757 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
  758 + downRecordQuery.setSource(residentsArchiveModel.getId());
  759 + List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
  760 + if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
  761 + TrackDownRecord trackDownRecord1 = records.get(0);
  762 + trackDownRecord.setId(trackDownRecord1.getId());
  763 + } else {//根据patient查询是否存在追访信息
  764 + //根据医院id和身份证或手机号进行查询
  765 + downRecordQuery = new TrackDownRecordQuery();
  766 + downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId());
  767 + if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){
  768 + downRecordQuery.setKey(residentsArchiveModel.getCertificateNum());
  769 + }else if(StringUtils.isNotEmpty(residentsArchiveModel.getPhone())){
  770 + downRecordQuery.setPhone(residentsArchiveModel.getPhone());
  771 + }
  772 + records = trackDownRecordService.queryTrackDown(downRecordQuery);
  773 + if (CollectionUtils.isNotEmpty(records)) {//修改
  774 + TrackDownRecord trackDownRecord1 = records.get(0);
  775 + trackDownRecord.setId(trackDownRecord1.getId());
  776 + }
  777 + }
  778 +
741 779 //新增婚前检查结束,男的结束流程，女的进入怀孕建档）
742   - if (model.getSex().equals(SystemConfig.WOMAN_ID)) {
  780 + if (residentsArchiveModel.getSex().equals(SystemConfig.WOMAN_ID)) {
743 781 //新增婚检追访信息
744   - TrackDownRecord record = model.build();
745   - record.setStatus(1);
746   - record.setTrackType(TrackDownDateEnums.B.getId());
747   - trackDownService.addOrupdateTrackDownRecord(userId,record);
748   - } else if (model.getSex().equals(SystemConfig.MAN_ID)) {
  782 + trackDownRecord.setTrackType(TrackDownDateEnums.B.getId());
  783 + } else if (residentsArchiveModel.getSex().equals(SystemConfig.MAN_ID)) {
749 784 //新增婚检追访信息
750   - TrackDownRecord record = model.build();
751   - record.setStatus(0);
752   - record.setTrackType(TrackDownDateEnums.A.getId());
753   - trackDownService.addOrupdateTrackDownRecord(userId,record);
  785 + trackDownRecord.setStatus(0);
754 786 }
755   -
756   - return id;
  787 + trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
757 788 }
  789 +
  790 +
758 791  
759 792 /**
760 793 * 删除一条婚前检查记录
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 980d355
... ... @@ -398,7 +398,7 @@
398 398 }
399 399  
400 400 /**
401   - * 婚检修改时应该判断是否有追访记录，可能在孕妇建档时已经生产了追访信息
  401 + * 新增居民健康档案时追访信息
402 402 * @param userId
403 403 */
404 404 public void addTrackDownInfo(Integer userId, ResidentsArchiveModel residentsArchiveModel) {