Commit 45158fe4d6d26fa0bdf2cf13727ff3f7ca6f0400

Authored by jiangjiazhi
1 parent fddcb89060

1

Showing 1 changed file with 15 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 45158fe
... ... @@ -93,6 +93,7 @@
93 93  
94 94 /**
95 95 * 处理建档时候的追访功能
  96 + *
96 97 * @param patients
97 98 */
98 99 public void aop4Patient(Patients patients) {
99 100  
100 101  
... ... @@ -221,10 +222,12 @@
221 222 */
222 223 Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate);
223 224 }
  225 +
224 226 @Autowired
225 227 private PostReviewService postReviewService;
226   - class CHFCTrackDownTypeHandler implements TrackDownTypeHandler{
227 228  
  229 + class CHFCTrackDownTypeHandler implements TrackDownTypeHandler {
  230 +
228 231 @Override
229 232 public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) {
230 233 Map<String, Object> temp = new HashMap<>();
... ... @@ -243,7 +246,7 @@
243 246 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
244 247 // 预约时间
245 248 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
246   - PostReviewQuery postReviewQuery =new PostReviewQuery();
  249 + PostReviewQuery postReviewQuery = new PostReviewQuery();
247 250 postReviewQuery.setYn(YnEnums.YES.getId());
248 251 postReviewQuery.setParentId(downRecord.getParentId());
249 252 List<PostReviewModel> list = postReviewService.findWithList(postReviewQuery);
250 253  
251 254  
... ... @@ -251,19 +254,24 @@
251 254 /** 复查次数 */
252 255 temp.put("fcNum", list.size());
253 256 temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
254   - /** 初次复查日期 */
255   - temp.put("ccfcDate", list.get(list.size()-1).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size()-1).getCheckTime()));
256   - /** 预约复查日期 */
257   - temp.put("yyfcDate ",list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()));
  257 + temp.put("ccfcDate", "--");
  258 + temp.put("yyfcDate ", "--");
  259 + if (CollectionUtils.isNotEmpty(list)) {
  260 + /** 初次复查日期 */
  261 + temp.put("ccfcDate", list.get(list.size() - 1).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getCheckTime()));
  262 + /** 预约复查日期 */
  263 + temp.put("yyfcDate ", list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()));
  264 + }
258 265 /** 生产方式 */
259 266 temp.put("scType", FmTypeEnums.getFmNameById2("1"));
260 267 return temp;
261 268 }
262 269 }
  270 +
263 271 /**
264 272 * 产后访视
265 273 */
266   - class CHTrackDownTypeHandler implements TrackDownTypeHandler{
  274 + class CHTrackDownTypeHandler implements TrackDownTypeHandler {
267 275 @Override
268 276 public Map build(TrackDownRecord downRecord, MongoTemplate mongoTemplate) {
269 277 Map<String, Object> temp = new HashMap<>();