jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c87f30e4189dc824594cd21f4a0951a76c7dee7d

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

自动生成追访信息bug修改

Showing 12 changed files with 20 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ c87f30e
... ... @@ -638,6 +638,7 @@
638 638 //根据patient查询是否存在追访信息
639 639 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
640 640 downRecordQuery.setParentId(patient.getId());
  641 + downRecordQuery.setStatus(3);
641 642 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
642 643 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
643 644 TrackDownRecord trackDownRecord1 = records.get(0);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c87f30e
... ... @@ -799,6 +799,7 @@
799 799  
800 800 //查询是否存在追访记录，如果有则修改，没有则新增
801 801 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
  802 + downRecordQuery.setStatus(3);
802 803 downRecordQuery.setPids(Arrays.asList(patients.getPid()));
803 804 List<TrackDownRecord> records = downRecordService.queryTrackDown(downRecordQuery);
804 805 if (CollectionUtils.isNotEmpty(records)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ c87f30e
... ... @@ -15,7 +15,6 @@
15 15 import com.lyms.platform.common.result.BaseObjectResponse;
16 16 import com.lyms.platform.common.result.BaseResponse;
17 17 import com.lyms.platform.common.utils.*;
18   -import com.lyms.platform.common.utils.StringUtils;
19 18 import com.lyms.platform.operate.web.request.BookBuildManagerQueryRequest;
20 19 import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
21 20 import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
... ... @@ -33,7 +32,6 @@
33 32 import com.lyms.platform.pojo.*;
34 33 import com.lyms.platform.query.*;
35 34 import org.apache.commons.collections.CollectionUtils;
36   -import org.apache.commons.lang.*;
37 35 import org.slf4j.Logger;
38 36 import org.slf4j.LoggerFactory;
39 37 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -406,6 +404,7 @@
406 404 //根据patient查询是否存在追访信息
407 405 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
408 406 downRecordQuery.setParentId(patient.getId());
  407 + downRecordQuery.setStatus(3);
409 408 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
410 409 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
411 410 TrackDownRecord trackDownRecord1 = records.get(0);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ c87f30e
... ... @@ -161,6 +161,7 @@
161 161 //先根据婚检id进行查询
162 162 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
163 163 downRecordQuery.setSource(parentId);
  164 + downRecordQuery.setStatus(3);
164 165 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
165 166 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
166 167 TrackDownRecord trackDownRecord1 = records.get(0);
... ... @@ -168,6 +169,7 @@
168 169 } else {//根据patient查询是否存在追访信息
169 170 //根据医院id和身份证或手机号进行查询
170 171 downRecordQuery = new TrackDownRecordQuery();
  172 + downRecordQuery.setStatus(3);
171 173 downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId());
172 174 if (StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())) {
173 175 downRecordQuery.setKey(residentsArchiveModel.getCertificateNum());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ c87f30e
... ... @@ -416,6 +416,7 @@
416 416 //查询是否存在追访记录，如果有则修改，没有则新增
417 417 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
418 418 downRecordQuery.setParentId(patients.getId());
  419 + downRecordQuery.setStatus(3);
419 420 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
420 421 logger.info("CHTrackDownDataLoader addTrackDown by id :" + patients.getId());
421 422 if (CollectionUtils.isNotEmpty(records)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java View file @ c87f30e
... ... @@ -233,7 +233,7 @@
233 233 }
234 234  
235 235 /**
236   - * 初诊、复诊添加或更新追访信息
  236 + * 添加或更新追访信息
237 237 *
238 238 * @param userId
239 239 * @param patient
240 240  
... ... @@ -245,13 +245,13 @@
245 245 //添加产后追访信息
246 246 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
247 247 downRecordQuery.setParentId(trackDownRecord.getParentId());
  248 + downRecordQuery.setStatus(3);
248 249 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
249 250 if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
250 251 TrackDownRecord trackDownRecord1 = records.get(0);
251 252 trackDownRecord.setId(trackDownRecord1.getId());
252 253  
253 254 trackDownRecord.setHospitalId(maternalDeliverModel.getHospitalId());
254   - trackDownRecord.setStatus(1);
255 255 trackDownRecord.setSource(maternalDeliverModel.getId());
256 256 trackDownRecord.setTrackType(TrackDownDateEnums.F.getId());
257 257 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ c87f30e
... ... @@ -217,6 +217,7 @@
217 217 //添加产后追访信息
218 218 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
219 219 downRecordQuery.setParentId(trackDownRecord.getParentId());
  220 + downRecordQuery.setStatus(3);
220 221 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
221 222 if (CollectionUtils.isNotEmpty(records)) {
222 223 TrackDownRecord trackDownRecord1 = records.get(0);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ c87f30e
... ... @@ -756,6 +756,7 @@
756 756 //先根据婚检id进行查询
757 757 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
758 758 downRecordQuery.setSource(residentsArchiveModel.getId());
  759 + downRecordQuery.setStatus(3);
759 760 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
760 761 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
761 762 TrackDownRecord trackDownRecord1 = records.get(0);
... ... @@ -763,6 +764,7 @@
763 764 } else {//根据patient查询是否存在追访信息
764 765 //根据医院id和身份证或手机号进行查询
765 766 downRecordQuery = new TrackDownRecordQuery();
  767 + downRecordQuery.setStatus(3);
766 768 downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId());
767 769 if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){
768 770 downRecordQuery.setCardNo(residentsArchiveModel.getCertificateNum());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ c87f30e
... ... @@ -406,6 +406,7 @@
406 406 TrackDownRecord trackDownRecord = residentsArchiveModel.build();
407 407 //先根据婚检id进行查询
408 408 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
  409 + downRecordQuery.setStatus(3);
409 410 downRecordQuery.setSource(residentsArchiveModel.getId());
410 411 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
411 412 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
... ... @@ -414,6 +415,7 @@
414 415 } else {//根据patient查询是否存在追访信息
415 416 //根据医院id和身份证或手机号进行查询
416 417 downRecordQuery = new TrackDownRecordQuery();
  418 + downRecordQuery.setStatus(3);
417 419 downRecordQuery.setHospitalId(residentsArchiveModel.getHospitalId());
418 420 if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){
419 421 downRecordQuery.setKey(residentsArchiveModel.getCertificateNum());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ c87f30e
... ... @@ -129,6 +129,7 @@
129 129 //查询是否存在追访记录，如果有则修改，没有则新增
130 130 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
131 131 downRecordQuery.setParentId(patients.getId());
  132 + downRecordQuery.setStatus(3);
132 133 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
133 134 if (CollectionUtils.isNotEmpty(records)) {
134 135 TrackDownRecord track = records.get(0);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ c87f30e
... ... @@ -255,6 +255,7 @@
255 255 //根据patient查询是否存在追访信息
256 256 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
257 257 downRecordQuery.setParentId(patient.getId());
  258 + downRecordQuery.setStatus(3);
258 259 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
259 260 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
260 261 TrackDownRecord trackDownRecord1 = records.get(0);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownJobFacade.java View file @ c87f30e
... ... @@ -181,12 +181,14 @@
181 181 //根据patient查询是否存在追访信息
182 182 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
183 183 downRecordQuery.setParentId(model.getId());
  184 + downRecordQuery.setStatus(3);
184 185 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
185 186 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改
186 187 TrackDownRecord trackDownRecord1 = records.get(0);
187 188 trackDownRecord.setId(trackDownRecord1.getId());
188 189 } else {//不存在则查询继续查追访记录，可能来至妇女建档追访数据
189 190 downRecordQuery = new TrackDownRecordQuery();
  191 + downRecordQuery.setStatus(3);
190 192 downRecordQuery.setHospitalId(model.getHospitalId());
191 193 if (StringUtils.isNotEmpty(model.getCardNo())) {
192 194 downRecordQuery.setCardNo(model.getCardNo());
... ... @@ -277,6 +279,7 @@
277 279  
278 280 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
279 281 downRecordQuery.setSource(model.getId());
  282 + downRecordQuery.setStatus(3);
280 283 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
281 284  
282 285 if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
... ... @@ -285,6 +288,7 @@
285 288 } else {//根据patient查询是否存在追访信息
286 289 //根据医院id和身份证或手机号进行查询
287 290 downRecordQuery = new TrackDownRecordQuery();
  291 + downRecordQuery.setStatus(3);
288 292 downRecordQuery.setHospitalId(model.getHospitalId());
289 293 if (StringUtils.isNotEmpty(model.getCertificateNum())) {
290 294 downRecordQuery.setCardNo(model.getCertificateNum());
... ... @@ -489,6 +493,7 @@
489 493 }
490 494 //查询是否存在追访记录，如果有则修改，没有则新增
491 495 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
  496 + downRecordQuery.setStatus(3);
492 497 downRecordQuery.setParentId(patients.getId());
493 498 List<TrackDownRecord> records = downRecordService.queryTrackDown(downRecordQuery);
494 499 logger.info("CHTrackDownDataLoader addTrackDown by id :" + patients.getId());