diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java index 61724bd..bac1568 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java @@ -92,8 +92,44 @@ public class MatdeliverFollowPushModel extends BaseModel { private Date updateTime; + /** + * 1/已推送 2/已填写 3/已确认 + */ + private String pushStatus; + private Integer yn; + /** + * 产后访视id + */ + private String matdeliverFollowId; + + private String parentId; + + public String getMatdeliverFollowId() { + return matdeliverFollowId; + } + + public void setMatdeliverFollowId(String matdeliverFollowId) { + this.matdeliverFollowId = matdeliverFollowId; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getPushStatus() { + return pushStatus; + } + + public void setPushStatus(String pushStatus) { + this.pushStatus = pushStatus; + } + public String getCreateDoctor() { return createDoctor; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 2094dd2..ea14af3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -176,6 +176,19 @@ public class MaternalDeliverModel extends BaseModel { */ private String xzType; + /** + * 推送时间 针对列表多条件筛选 + */ + private Date pushTime; + + public Date getPushTime() { + return pushTime; + } + + public void setPushTime(Date pushTime) { + this.pushTime = pushTime; + } + public String getXzType() { return xzType; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index fcbc80d..64a823c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; @@ -170,6 +171,26 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private Integer endAge; + private String startPushTime; + + private String endPushTime; + + public String getStartPushTime() { + return startPushTime; + } + + public void setStartPushTime(String startPushTime) { + this.startPushTime = startPushTime; + } + + public String getEndPushTime() { + return endPushTime; + } + + public void setEndPushTime(String endPushTime) { + this.endPushTime = endPushTime; + } + public String getFsHospitalId() { return fsHospitalId; } @@ -384,6 +405,10 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } } + if (StringUtils.isNotEmpty(startPushTime) && StringUtils.isNotEmpty(endPushTime)) { + c = Criteria.where("pushTime").gte(startPushTime).lte(endPushTime); + } + if (babyIds != null && babyIds.size() > 0) { condition = condition.and("baby._id", babyIds, MongoOper.IN); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index ce59afe..cf06a16 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -203,6 +203,10 @@ public class MatdeliverFollowFacade { MatdeliverFollowModel before = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId()); + // 若为问卷推送类型则更新推送状态 + if (PostpartumFollowMakeEnums.TypeEnum.WJTS.getId() == matDeliverFollowAddRequest.getMakeType()) { + mongoTemplate.updateFirst(Query.query(Criteria.where("matdeliverFollowId").is(matDeliverFollowAddRequest.getId())), Update.update("pushStatus", "3"), MatdeliverFollowPushModel.class); + } //修改随访信息 matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId()); @@ -711,7 +715,8 @@ public class MatdeliverFollowFacade { MatdeliverFollowPushModel pushModel = new MatdeliverFollowPushModel(); MaternalDeliverModel deliverModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(deliverId)), MaternalDeliverModel.class); if (deliverModel != null) { - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(deliverModel.getParentId())), Patients.class); + String parentId = deliverModel.getParentId(); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parentId)), Patients.class); if (patients != null) { pushModel.setBirth(patients.getBirth()); pushModel.setCardNo(patients.getCardNo()); @@ -722,11 +727,19 @@ public class MatdeliverFollowFacade { pushModel.setCreateDoctor(userId.toString()); pushModel.setYn(YnEnums.YES.getId()); pushModel.setHospitalId(hospitalId); + pushModel.setSendTime(new Date()); + pushModel.setPushStatus("1"); + pushModel.setMatdeliverFollowId(followModelId); + pushModel.setParentId(parentId); mongoTemplate.insert(pushModel); + + // 将推送时间更新到分娩表中 + mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(deliverId)), Update.update("pushTime", new Date()), MaternalDeliverModel.class); } } + // 推送到指定用户中 Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); Users users = usersService.getUsers(userId); @@ -797,6 +810,7 @@ public class MatdeliverFollowFacade { } update.set("visitStatus", 2); update.set("visitDate", new Date()); + update.set("pushStatus", "2"); Query query = Query.query(Criteria.where("id").is(id)); mongoTemplate.updateFirst(query, update, MatdeliverFollowModel.class); return baseResponse; @@ -863,11 +877,18 @@ public class MatdeliverFollowFacade { query.addCriteria(Criteria.where("confirmTime").gte(start).lte(end)); } + // 确认医生 String confirmDoctor = param.getConfirmDoctor(); if (StringUtils.isNotEmpty(confirmDoctor)) { query.addCriteria(Criteria.where("confirmDoctor").is(confirmDoctor)); } + // 推送状态 + String pushStatus = param.getPushStatus(); + if (StringUtils.isNotEmpty(pushStatus)) { + query.addCriteria(Criteria.where("pushStatus").is(pushStatus)); + } + long count = mongoTemplate.count(query, MatdeliverFollowPushModel.class); param.mysqlBuild((int) count); query.skip(param.getOffset()).limit(param.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java index ad45555..0947e0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java @@ -126,6 +126,26 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ */ private String highRiskLevel; + private String startPushTime; + + private String endPushTime; + + public String getStartPushTime() { + return startPushTime; + } + + public void setStartPushTime(String startPushTime) { + this.startPushTime = startPushTime; + } + + public String getEndPushTime() { + return endPushTime; + } + + public void setEndPushTime(String endPushTime) { + this.endPushTime = endPushTime; + } + public String getStartAge() { return startAge; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/QuestionnaireListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/QuestionnaireListRequest.java index 7d851f2..dc8bde1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/QuestionnaireListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/QuestionnaireListRequest.java @@ -54,6 +54,19 @@ public class QuestionnaireListRequest extends BaseQuery implements Serializable */ private String confirmDoctor; + /** + * 推送状态 1已推送 2已填写 3已审核 + */ + private String pushStatus; + + public String getPushStatus() { + return pushStatus; + } + + public void setPushStatus(String pushStatus) { + this.pushStatus = pushStatus; + } + public String getQueryNo() { return queryNo; }