jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c6bda7d74f5c5ecaaead067fc5ed5938a96f0d08

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

追访数据个节点更新bug第二轮自测bug修改

Showing 2 changed files with 30 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ c6bda7d
... ... @@ -96,8 +96,9 @@
96 96  
97 97 @Autowired
98 98 private OperateLogFacade operateLogFacade;
99   -
100 99 @Autowired
  100 + private TrackDownRecordService trackDownRecordService;
  101 + @Autowired
101 102 private PatientServiceFacade patientServiceFacade;
102 103 @Autowired
103 104 private ITrackDownService trackDownService;
104 105  
... ... @@ -280,12 +281,10 @@
280 281 //新增分娩信息
281 282 matDeliverService.addMatDeliver(maternalDeliverModel);
282 283  
  284 +
283 285 //添加产后追访信息
284 286 if (CollectionUtils.isNotEmpty(patients)) {
285   - TrackDownRecord trackDownRecord = maternalDeliverModel.build(patients.get(0));
286   - trackDownRecord.setHospitalId(maternalDeliverModel.getHospitalId());
287   - trackDownRecord.setSource(maternalDeliverModel.getId());
288   - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord);
  287 + addTrackDownInfo(userId,maternalDeliverModel,patients.get(0));
289 288 }
290 289  
291 290 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, OptActionEnums.ADD.getId(), "添加分娩");
... ... @@ -389,6 +388,30 @@
389 388 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("parentId 为空,找不到产妇");
390 389 }
391 390 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  391 + }
  392 +
  393 +
  394 + /**
  395 + * 添加或更新追访信息
  396 + * @param userId
  397 + * @param patient
  398 + * @param patient
  399 + */
  400 + public void addTrackDownInfo(Integer userId, MaternalDeliverModel deliverModel, Patients patient) {
  401 + //添加产后追访信息
  402 + TrackDownRecord trackDownRecord = deliverModel.build(patient);
  403 + trackDownRecord.setHospitalId(deliverModel.getHospitalId());
  404 + trackDownRecord.setSource(deliverModel.getId());
  405 +
  406 + //根据patient查询是否存在追访信息
  407 + TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
  408 + downRecordQuery.setParentId(patient.getId());
  409 + List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
  410 + if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
  411 + TrackDownRecord trackDownRecord1 = records.get(0);
  412 + trackDownRecord.setId(trackDownRecord1.getId());
  413 + }
  414 + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord);
392 415 }
393 416  
394 417 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ c6bda7d
... ... @@ -110,7 +110,7 @@
110 110 downRecordQuery.setCityId(downQueryRequest.getCityId());
111 111 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
112 112 downRecordQuery.setKey(downQueryRequest.getKey());
113   - //如果是产筛请求
  113 + //产检和产后数据特殊处理
114 114 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
115 115 downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
116 116 downRecordQuery.setTrackTypes(Arrays.asList(3, 8));
... ... @@ -119,7 +119,7 @@
119 119 } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()) {
120 120 downRecordQuery.setTrackTypes(Arrays.asList(6, 11));
121 121 } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()) {
122   - downRecordQuery.setTrackTypes(Arrays.asList(7, 10));
  122 + downRecordQuery.setTrackTypes(Arrays.asList(6, 10));
123 123 } else {
124 124 downRecordQuery.setTrackType(downQueryRequest.getTrackType());
125 125 }