From abb505b833769202ce2398840b9877663e771643 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 16:58:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/TrackDownFacade.java | 7 ++++--- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 5 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 722d0ac..658d081 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 @@ -380,11 +380,12 @@ public class TrackDownFacade { /** 复查次数 */ temp.put("fcNum", list.size()); if (CollectionUtils.isNotEmpty(list)) { - + PostReviewModel firstPost = list.get(0); + PostReviewModel endPost = list.get(list.size() - 1); /** 初次复查日期 */ - temp.put("ccfcDate", list.get(0).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getCheckTime())); + temp.put("ccfcDate", firstPost.getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(firstPost.getCheckTime())); /** 预约复查日期 */ - temp.put("yyfcDate", list.get(list.size() - 1).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getNextCheckTime())); + temp.put("yyfcDate", endPost.getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(endPost.getNextCheckTime())); } return temp; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 83101ac..a0b3ad4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -125,6 +125,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("resident", 1); // 妇女建档 temp.put("check", 3); // 婚检 Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class); + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(archiveModel.getHospitalId()); if (archiveModel.getCertificateNum() != null) { @@ -137,7 +138,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setTypeList(Arrays.asList(1, 3)); //怀孕建档 List patientsList = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(patientsList)) { temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 @@ -235,8 +235,10 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } + if(trackDownRecord.getTrackType()>TrackDownDateEnums.A.getId()){ + temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 + } isExitTrackDown(trackDownRecord, temp); - archiveModelList.add(temp); } return archiveModelList; -- 1.8.3.1