diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index c844943..688defb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -9,7 +9,9 @@ import com.lyms.platform.common.utils.StringUtils; import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; +import java.util.Arrays; import java.util.Date; +import java.util.List; /** * 新生儿查询模型 @@ -173,6 +175,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //诊断 private String lastDiagnose; + private List lastDiagnoses; + + public List getLastDiagnoses() { + return lastDiagnoses; + } + + public void setLastDiagnoses(List lastDiagnoses) { + this.lastDiagnoses = lastDiagnoses; + } + public String getLastDiagnose() { return lastDiagnose; } @@ -361,6 +373,13 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(!StringUtils.isEmpty(lastDiagnose)){ condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.LIKE); } + + if (null != lastDiagnoses && lastDiagnoses.size() > 0) { + Criteria c = Criteria.where("lastDiagnose").in(lastDiagnoses); + condition.andCondition( new MongoCondition(c)); + } + + if(!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)){ MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE); MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 41dad07..ca64259 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -714,10 +714,10 @@ public class SmsServiceImpl implements SmsService{ //得到孕妇的id Set idset = getYuYuePatient(sendTimeType, tempHid); - for (String pid : idset) + for (String id : idset) { //查询符合条件的产妇 - patientsQuery.setId(pid); + patientsQuery.setId(id); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { @@ -918,71 +918,37 @@ public class SmsServiceImpl implements SmsService{ if (specialDateType == SpecialDateEnums.FWJS.getId()) { -// Date endDate = DateUtil.formatDate(new Date()); -// -// patientsQuery.setYn(YnEnums.YES.getId()); -//// //1孕妇 3产妇 -// patientsQuery.setType(3); -// patientsQuery.setBuildTypeEq(2); -// patientsQuery.setFmDateStart(endDate); -// patientsQuery.setFmDateEnd(endDate); -// -// List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); -// if (CollectionUtils.isNotEmpty(patients)) -// { -// for (Patients pat : patients) -// { -// -// //短信前缀 -// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); -// String messageContent = "【"+messagePrefix+"】"+template.getContent(); -// messageContent = replaceName(pat.getUsername(), messageContent); -// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), -// pat.getHospitalId(),template.getId(),pat.getId()); -// messages.add(request); -// -// //更新成产妇状态 分娩时间设置成当前时间 -// pat.setType(3); -// pat.setFmDate(new Date()); -// pat.setModified(new Date()); -// yunBookbuildingService.updatePregnant(pat, pat.getId()); -// } -// -// } - - - -// Date endDate = DateUtil.getNewDate(-42, "周", 0); -// //把时间格式化成 yyyy_MM_dd 的日期 -// endDate = DateUtil.formatDate(endDate); -// patientsQuery.setYn(YnEnums.YES.getId()); -// //1孕妇 -// patientsQuery.setType(1); -// patientsQuery.setLastMensesEnd(endDate); -// patientsQuery.setLastMensesStart(endDate); -// -// List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); -// if (CollectionUtils.isNotEmpty(patients)) -// { -// for (Patients pat : patients) -// { -// -// //短信前缀 -// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); -// String messageContent = "【"+messagePrefix+"】"+template.getContent(); -// messageContent = replaceName(pat.getUsername(), messageContent); -// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), -// pat.getHospitalId(),template.getId(),pat.getId()); -// messages.add(request); -// -// //更新成产妇状态 分娩时间设置成当前时间 -// pat.setType(3); -// pat.setFmDate(new Date()); -// pat.setModified(new Date()); -// yunBookbuildingService.updatePregnant(pat, pat.getId()); -// } -// -// } + Date endDate = DateUtil.getNewDate(-42, "周", 0); + //把时间格式化成 yyyy_MM_dd 的日期 + endDate = DateUtil.formatDate(endDate); + patientsQuery.setYn(YnEnums.YES.getId()); + //1孕妇 + patientsQuery.setType(1); + patientsQuery.setLastMensesEnd(endDate); + patientsQuery.setLastMensesStart(endDate); + + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + for (Patients pat : patients) + { + + //短信前缀 + String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); + String messageContent = "【"+messagePrefix+"】"+template.getContent(); + messageContent = replaceName(pat.getUsername(), messageContent); + MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), + pat.getHospitalId(),template.getId(),pat.getId()); + messages.add(request); + + //更新成产妇状态 分娩时间设置成当前时间 + pat.setType(3); + pat.setFmDate(new Date()); + pat.setModified(new Date()); + yunBookbuildingService.updatePregnant(pat, pat.getId()); + } + + } } //孕妇建档在 孕妇建档生成 @@ -1442,6 +1408,11 @@ public class SmsServiceImpl implements SmsService{ } } } + //产妇服务结束 + else if (specialDateType == SpecialDateEnums.FWJS.getId()) + { + + } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 8a29a22..cbb83af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1415,7 +1415,23 @@ public class BabyBookbuildingFacade { babyQuery.setBirthEnd(start); } - babyQuery.setLastDiagnose(request.getDiagnose()); + if (StringUtils.isNotEmpty(request.getDiagnose())) + { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setKeyword(request.getDiagnose()); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + List diagnoseIds = new ArrayList<>(); + if (datas != null) { + for (BasicConfig data : datas) { + diagnoseIds.add(data.getId()); + } + + } + babyQuery.setLastDiagnoses(diagnoseIds); + } + //预约时间 if (StringUtils.isNotEmpty(request.getNextDate())) {