From 078e9172e6fb8d4da49c2c0e4107f244019ff889 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 8 Mar 2018 15:01:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=A6=82=E5=86=B5=E5=A9=9A?= =?UTF-8?q?=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 754d16b..e9e28d4 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 @@ -119,7 +119,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("chfc", 3);//产后复查空白 Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("yn").is(1)), PremaritalCheckup.class); temp.put("resident", 1); // 妇女建档 - temp.put("check", checkNum>0?1:2); // 婚检 1=勾勾 2=叉叉 + temp.put("check", 3); // 婚检 + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(archiveModel.getHospitalId()); @@ -134,6 +135,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS List patientsList = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientsList)) { + temp.put("check", checkNum>0?1:2); // 婚检 1=勾勾 2=叉叉 + Patients patients = patientsList.get(0); temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); @@ -142,6 +145,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("fmType", patients.getFmType()); // 分娩方式 1： 顺产，2：剖宫产 } + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setParentId(patients.getId()); temp.put("yjcount", recordService.count(antExRecordQuery)); // 孕检次数 @@ -189,7 +193,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("cqsc", 3);//产前筛查默认空白 temp.put("fm", 3);//分娩空白 temp.put("chfc", 3);//产后复查空白 - //婚检查询 Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(patient.getCardNo()).and("yn").is(1)), PremaritalCheckup.class); temp.put("check", checkNum>0?1:2); // 婚检 1=勾勾 2=叉叉 -- 1.8.3.1