jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 92143fc665805ca4a6a654d8ca848f69ec5a1f12

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

第一轮测试bug修改。产筛预约时间

Showing 1 changed file with 57 additions and 34 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 92143fc
... ... @@ -44,6 +44,21 @@
44 44 @Component
45 45 public class TrackDownFacade {
46 46  
  47 + /**
  48 + * 构建返回字段
  49 + */
  50 + interface TrackDownTypeHandler {
  51 +
  52 + /**
  53 + * 构建返回字段内容
  54 + *
  55 + * @param downRecord 追访记录
  56 + * @param mongoTemplate 数据库连接
  57 + * @return 返回的内容
  58 + */
  59 + Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate);
  60 + }
  61 +
47 62 //日志调测器
48 63 private static final Logger logger = LoggerFactory.getLogger(TrackDownFacade.class);
49 64  
... ... @@ -61,7 +76,6 @@
61 76 private MongoTemplate mongoTemplate;
62 77 @Autowired
63 78 private AutoMatchFacade autoMatchFacade;
64   -
65 79 /**
66 80 * 妇女建档
67 81 */
... ... @@ -70,6 +84,10 @@
70 84 @Autowired
71 85 private PatientsService patientsService;
72 86  
  87 + @Autowired
  88 + private PostReviewService postReviewService;
  89 +
  90 +
73 91 @PostConstruct
74 92 private void init() {
75 93 trackDownTypeHandlerMap = new HashMap<>();
76 94  
... ... @@ -112,11 +130,11 @@
112 130 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
113 131 downRecordQuery.setKey(downQueryRequest.getKey());
114 132 //产检和产后数据特殊处理
115   - if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
  133 + if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()) {
  134 + downRecordQuery.setTrackTypes(Arrays.asList(3, 9));
  135 + } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
116 136 downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
117 137 downRecordQuery.setTrackTypes(Arrays.asList(3, 8));
118   - } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()) {
119   - downRecordQuery.setTrackTypes(Arrays.asList(3, 9));
120 138 } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()) {
121 139 downRecordQuery.setTrackTypes(Arrays.asList(6, 11));
122 140 } else if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()) {
... ... @@ -197,6 +215,20 @@
197 215 }
198 216 }
199 217 }
  218 +
  219 + //如果是产筛追访列表，查询产筛预约时间
  220 + if (trackType == TrackDownDateEnums.D.getId() || trackType == TrackDownDateEnums.H.getId()) {//产前筛查
  221 + try {
  222 + //申请产筛单
  223 + SieveApplyOrderModel sieveModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), SieveApplyOrderModel.class);
  224 + if (sieveModel != null) {
  225 + map.put("nextCheckTime", sieveModel.getCheckDate());
  226 + }
  227 + } catch (Exception e) {
  228 + e.printStackTrace();
  229 + }
  230 + }
  231 +
200 232 return RespBuilder.buildSuccess(map);
201 233 }
202 234  
... ... @@ -216,7 +248,15 @@
216 248 TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());
217 249 if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) {
218 250 for (TrackDownRecord trackDownRecord : downRecordList) {
219   - data.add(downTypeHandler.build(trackDownRecord, mongoTemplate));
  251 + //追访类型
  252 + Integer trackType = trackDownRecord.getTrackType();
  253 + //查询的追访类型
  254 + trackDownRecord.setTrackType(downQueryRequest.getTrackType());
  255 + Map map = downTypeHandler.build(trackDownRecord, mongoTemplate);
  256 + //设置数据真实的追访类型
  257 + map.put("trackDownDateType", trackType);
  258 + data.add(map);
  259 +
220 260 }
221 261 }
222 262 PageResult pageResult = new PageResult();
... ... @@ -227,24 +267,6 @@
227 267 return RespBuilder.buildSuccess(pageResult);
228 268 }
229 269  
230   - /**
231   - * 构建返回字段
232   - */
233   - interface TrackDownTypeHandler {
234   -
235   - /**
236   - * 构建返回字段内容
237   - *
238   - * @param downRecord 追访记录
239   - * @param mongoTemplate 数据库连接
240   - * @return 返回的内容
241   - */
242   - Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate);
243   - }
244   -
245   - @Autowired
246   - private PostReviewService postReviewService;
247   -
248 270 class CHFCTrackDownTypeHandler implements TrackDownTypeHandler {
249 271  
250 272 @Override
... ... @@ -393,7 +415,7 @@
393 415  
394 416  
395 417 /**
396   - * 产前检查返回的字段
  418 + * 产前检查、产前筛查、产后分娩返回的字段
397 419 */
398 420 class CJTrackDownTypeHandler implements TrackDownTypeHandler {
399 421  
400 422  
... ... @@ -407,9 +429,7 @@
407 429 temp.put("username", downRecord.getUsername());
408 430 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
409 431 temp.put("cardNo", StringUtils.encryCardNo(downRecord.getCardNo()));
410   - temp.put("trackDownDateType", downRecord.getTrackType());
411 432 temp.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
412   -
413 433 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
414 434 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
415 435 temp.put("id", downRecord.getId());
416 436  
417 437  
418 438  
419 439  
... ... @@ -434,33 +454,36 @@
434 454 }
435 455  
436 456 //如果是产前检查取预约结果
437   - // if (downRecord.getTrackType() == TrackDownDateEnums.C.getId()||downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {
438   -
439 457 //复诊
440 458 AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
441 459 if (examinationModel != null) {
442 460 temp.put("cjDate", DateUtil.getyyyy_MM_dd(examinationModel.getCheckDate())); /** 产检日期 */
443   - if (examinationModel.getNextCheckTime() != null) {
444   - temp.put("yyTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */
  461 + if (downRecord.getTrackType() == TrackDownDateEnums.C.getId() || downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {//产检追访查询预约产检日期
  462 + if (examinationModel.getNextCheckTime() != null) {
  463 + temp.put("yyTime", DateUtil.getyyyy_MM_dd(examinationModel.getNextCheckTime())); /** 预约产检日期 */
  464 + }
445 465 }
446 466 } else {
447 467 //初诊
448 468 AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
449 469 if (antExChuModel != null) {
450 470 temp.put("cjDate", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */
451   - if (antExChuModel.getNextCheckTime() != null) {
452   - temp.put("yyTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */
  471 + if (downRecord.getTrackType() == TrackDownDateEnums.C.getId() || downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {//产检追访查询预约产检日期
  472 + if (antExChuModel.getNextCheckTime() != null) {
  473 + temp.put("yyTime", DateUtil.getyyyy_MM_dd(antExChuModel.getNextCheckTime())); /** 预约产检日期 */
  474 + }
453 475 }
454 476 }
455 477 }
456   - // }
457 478  
458 479 //如果是产筛追访列表，查询产筛预约时间
459 480 if (downRecord.getTrackType() == TrackDownDateEnums.D.getId() || downRecord.getTrackType() == TrackDownDateEnums.H.getId()) {//产前筛查
460 481 try {
461 482 //申请产筛单
462 483 SieveApplyOrderModel sieveModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), SieveApplyOrderModel.class);
463   - temp.put("yyTime", sieveModel.getCheckDate());
  484 + if (sieveModel != null) {
  485 + temp.put("yyTime", sieveModel.getCheckDate());
  486 + }
464 487 } catch (Exception e) {
465 488 e.printStackTrace();
466 489 }