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 7e1fc65..0715534 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 @@ -243,8 +243,8 @@ public class TrackDownFacade { try { //申请产筛单 SieveApplyOrderModel sieveModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), SieveApplyOrderModel.class); - if (sieveModel != null) { - map.put("nextCheckTime", sieveModel.getCheckDate()); + if (sieveModel != null) {//下次产筛时间 + map.put("nextSieveTime", sieveModel.getCheckDate()); } } catch (Exception e) { e.printStackTrace(); 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 4ed4a53..d0e19a9 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 @@ -121,9 +121,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("chfc", 3);//产后复查空白 temp.put("resident", 1); // 妇女建档 temp.put("check", 3); // 婚检 - Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("yn").is(1)), PremaritalCheckup.class); - - + 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) {