From ecd46fe719950f554a613376f99c08dd38396b8d Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 22 Jan 2018 16:33:30 +0800 Subject: [PATCH] 1 --- .../operate/web/facade/TrackDownFacade.java | 44 ++++++++++++++++++---- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c863e0a..c55fae6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -28,10 +28,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -72,6 +69,7 @@ public class TrackDownFacade { private void init() { trackDownTypeHandlerMap = new HashMap<>(); trackDownTypeHandlerMap.put(TrackDownDateEnums.A.getId(), new FQTrackDownTypeHandler()); + trackDownTypeHandlerMap.put(TrackDownDateEnums.B.getId(), new HYTrackDownTypeHandler()); } /** @@ -80,7 +78,7 @@ public class TrackDownFacade { * @param downQueryRequest * @return */ - private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest,Integer userId) { + private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setAreaId(downQueryRequest.getAreaId()); downRecordQuery.setProvinceId(downQueryRequest.getProvinceId()); @@ -95,9 +93,9 @@ public class TrackDownFacade { return downRecordQuery; } - public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest,Integer userId) { + public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { //转换为本地的查询条件 - TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest,userId); + TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); @@ -132,6 +130,38 @@ public class TrackDownFacade { Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate); } + + class HYTrackDownTypeHandler implements TrackDownTypeHandler { + + @Override + public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) { + Map temp = new HashMap<>(); + temp.put("username", downRecord.getUsername()); + temp.put("age", DateUtil.getAge(downRecord.getBirth())); + temp.put("cardNo", StringUtils.encryCardNo(downRecord.getCardNo())); + temp.put("residenceAddress",CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ + temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); + temp.put("id", downRecord.getId()); + temp.put("dueDate", DateUtil.getyyyy_MM_dd(DateUtil.addDay(downRecord.getLastMenses(),281))); + temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */ + temp.put("cjDate", ""); /** 产检日期 */ + temp.put("yycjDate", ""); /** 预约产检日期 */ + temp.put("cjzfDate", ""); /** 产检追访时间 */ + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); + if (trackDown != null) { + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 +// temp.put("result", getResultByType(trackType, patient.getId(), new Sort(Sort.Direction.DESC, "created"))); // 婚检追访结果 + temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约时间 + } else { + temp.put("result", "--"); // 婚检追访结果 + temp.put("trackDownTime", "--"); // 追访时间 + temp.put("yyTime", "--"); // 预约时间 + } + return temp; + } + } + /** * 婚前检查返回的字段 */ -- 1.8.3.1