diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 9a4d241..0389f34 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1760,8 +1760,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (patient != null) { - PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patient.getId()).and("yn").ne("1")), PatientWeight.class); - if (type == 1 && patientWeight != null) + PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patient.getId()).and("yn").is("1")), PatientWeight.class); + if (patientWeight == null) + { + continue; + } + if (type == 1) { Date currentDate = new Date(); DateUtil.formatYmd(currentDate); @@ -1811,10 +1815,11 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient mr.setTempId(""); mr.setPatientId(patient.getId()); mr.setSmsStatus(SmsStatusEnums.WFS.getId()); - mr.setServiceType(1); //判断发送类型 + mr.setServiceType(startType); //判断发送类型 PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setHospitalId(patient.getHospitalId()); + patientQuery.setParentid(patientId); patientQuery.setSerType(PatientSerEnums.SerTypeEnums.tz.getId()); List patientServices = patientServiceService.queryPatientService(patientQuery);