From 8d68f7c365997d190046f439b7da166847d1f201 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Mon, 27 Dec 2021 09:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=A6=E5=B9=B3-=E5=AD=95=E4=BA=A7=E5=A6=87?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E4=B8=8B=E6=AC=A1=E9=A2=84=E7=BA=A6=E4=BB=B7?= =?UTF-8?q?=E5=B7=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E3=80=81=E5=A6=8A?= =?UTF-8?q?=E5=A8=A0=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/PatientsQuery.java | 16 +++++++++++-- .../platform/operate/web/facade/PatientFacade.java | 13 +++++++++++ .../operate/web/request/PatientManagerRequest.java | 26 ++++++++++++++++++++++ .../web/result/PatientManagerQueryModel.java | 23 +++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index c16b0c8..ca5b804 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -852,6 +852,18 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("breastType", breastType, MongoOper.IS); } } + //滦平20211227-筛选分娩状态 + Criteria c3=MongoCondition.newInstance().getCriteria(); + if(null!=dueStatus){ + if(0==dueStatus){ + MongoCondition con =MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("dueStatus", "0", MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("dueStatus", false, MongoOper.EXISTS); + c3 = con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + }else { + condition = condition.and("dueStatus", dueStatus, MongoOper.IS); + } + } Criteria c1 = null; @@ -1393,10 +1405,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != c1) { - return new MongoCondition(c1.andOperator(condition.getCriteria(),c2)).toMongoQuery(); + return new MongoCondition(c1.andOperator(condition.getCriteria(),c2,c3)).toMongoQuery(); // return new MongoCondition(c1.andOperator(condition.getCriteria())).toMongoQuery(); } - return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery(); + return new MongoCondition(c2.andOperator(condition.getCriteria(),c3)).toMongoQuery(); // return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 73145e6..24d4b4f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2565,6 +2565,17 @@ public class PatientFacade extends BaseServiceImpl { } } patientsQuery.setQueryNo(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo()); + //滦平20211227-月下下次检查时间、分娩状态 + if (StringUtils.isNotEmpty(patientManagerRequest.getNextCheckTime())&&"2100001377".equals(hospitalId)) { + try { + patientsQuery.setNextCheckTimeStart(DateUtil.getSNDate(patientManagerRequest.getNextCheckTime())[0]); + patientsQuery.setNextCheckTimeEnd(DateUtil.getSNDate(patientManagerRequest.getNextCheckTime())[1]); + } catch (Exception e) { + // 什么都不做，这里是数据传入错误了 + } + } + //分娩状态 + patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList <>(); @@ -2655,6 +2666,8 @@ public class PatientFacade extends BaseServiceImpl { } } + //滦平20211227 + patientManagerQueryModel.setNextCheckTime(DateUtil.getyyyy_MM_dd(patients.getNextCheckTime())); patientManagerQueryModelList.add(patientManagerQueryModel); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index a7db2ed..9e79ed4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.request; +import java.util.Date; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时33分 @@ -129,6 +131,30 @@ public class PatientManagerRequest extends BasePageQueryRequest { } /**********************************************/ + /** + * 滦平 + */ + //分娩状态 0未终止妊娠 1终止妊娠 + private Integer dueStatus; + //预约下次检查时间 + private String nextCheckTime; + + public Integer getDueStatus() { + return dueStatus; + } + + public void setDueStatus(Integer dueStatus) { + this.dueStatus = dueStatus; + } + + public String getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(String nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } + public String getNormal() { return normal; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 79eb9cd..6de84c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -92,6 +92,29 @@ public class PatientManagerQueryModel { private String id; + /** + * 滦平 + */ + //分娩状态 0未终止妊娠 1终止妊娠 + private Integer dueStatus; + //预约下次检查时间 + private String nextCheckTime; + + public Integer getDueStatus() { + return dueStatus; + } + + public void setDueStatus(Integer dueStatus) { + this.dueStatus = dueStatus; + } + + public String getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(String nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } public String getLowerHairOgrId() { return lowerHairOgrId; -- 1.8.3.1