From dd94d6fbe3bbebafa7d2f6b6f0dc18423f967cd6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Jul 2020 14:59:33 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/pojo/Patients.java | 14 ++++++++++++ .../com/lyms/platform/query/PatientsQuery.java | 26 ++++++++++++++++++++++ .../web/controller/TrackDownController.java | 18 +++++++-------- .../operate/web/facade/BookbuildingFacade.java | 1 + .../platform/operate/web/facade/PatientFacade.java | 4 +++- .../operate/web/request/PatientManagerRequest.java | 11 +++++++++ .../web/request/RiskPatientsQueryRequest.java | 11 +++++++++ .../web/request/YunBookbuildingAddRequest.java | 14 ++++++++++++ 8 files changed, 89 insertions(+), 10 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 1286080..30f2f04 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -327,6 +327,20 @@ public class Patients extends BaseModel { //稀有血型 1 是稀有血型，空不是 private String rareType; + /** + * 承德需求 外地过来分娩或者内蒙只过来分娩，临时建档只为了开证的，在建档页面加一个补录的字段标记 + */ + //空或者1为正常 2为补录 + private String normal; + + public String getNormal() { + return normal; + } + + public void setNormal(String normal) { + this.normal = normal; + } + public String getRareType() { return rareType; } 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 37115ce..86c1ab7 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 @@ -372,6 +372,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String trackHospitalId; + //空或者1为正常 2为补录 + private String normal; + + public String getNormal() { + return normal; + } + + public void setNormal(String normal) { + this.normal = normal; + } + public String getTrackHospitalId() { return trackHospitalId; @@ -474,6 +485,21 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS); condition = condition.orCondition(new MongoCondition[]{con1, con}); } + + if (null != normal) { + if ("1".equals(normal)) + { + MongoCondition con1 = MongoCondition.newInstance("normal", normal, MongoOper.IS); + MongoCondition con = MongoCondition.newInstance("normal", Boolean.FALSE, MongoOper.EXISTS); + condition = condition.orCondition(new MongoCondition[]{con1, con}); + } + else + { + condition = condition.and("normal", normal, MongoOper.IS); + } + + } + if (null != pcensusTypeId) { condition = condition.and("pcensusTypeId", pcensusTypeId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index f37234b..178967d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -140,15 +140,15 @@ public class TrackDownController extends BaseController { @RequestMapping(method = RequestMethod.GET) public BaseResponse list(TrackDownQueryRequest downQueryRequest, HttpServletRequest request) { - if ((downQueryRequest.getBeOverdueDaysEnd() != null && downQueryRequest.getBeOverdueDaysStart() == null) || (downQueryRequest.getBeOverdueDaysEnd() == null && downQueryRequest.getBeOverdueDaysStart() == null)) - { - downQueryRequest.setBeOverdueDaysStart(1); - } - - if ((downQueryRequest.getCheckOverDaysEnd() != null && downQueryRequest.getCheckOverDaysStart() == null) || (downQueryRequest.getCheckOverDaysEnd() == null && downQueryRequest.getCheckOverDaysStart() == null)) - { - downQueryRequest.setCheckOverDaysStart(1); - } +// if ((downQueryRequest.getBeOverdueDaysEnd() != null && downQueryRequest.getBeOverdueDaysStart() == null) || (downQueryRequest.getBeOverdueDaysEnd() == null && downQueryRequest.getBeOverdueDaysStart() == null)) +// { +// downQueryRequest.setBeOverdueDaysStart(1); +// } +// +// if ((downQueryRequest.getCheckOverDaysEnd() != null && downQueryRequest.getCheckOverDaysStart() == null) || (downQueryRequest.getCheckOverDaysEnd() == null && downQueryRequest.getCheckOverDaysStart() == null)) +// { +// downQueryRequest.setCheckOverDaysStart(1); +// } return downFacade.list(downQueryRequest, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index b0b2b47..6a91cb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1707,6 +1707,7 @@ public class BookbuildingFacade { */ public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); + patient.setNormal(yunRequest.getNormal()); patient.setChildExtAddrs(yunRequest.getChildExtAddrs()); //默认为未分娩 patient.setIsDeliver("0"); 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 3db07b1..f64fd0b 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 @@ -249,7 +249,7 @@ public class PatientFacade { patientsQuery.setPhone(riskPatientsQueryRequest.getPhone()); patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable()); - + patientsQuery.setNormal(riskPatientsQueryRequest.getNormal()); patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType()); //乡镇卫生院查询条件 if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getTownOrgId())) { @@ -1766,6 +1766,8 @@ public class PatientFacade { PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setNormal(patientManagerRequest.getNormal()); + patientsQuery.setLiveType(patientManagerRequest.getLiveType()); patientsQuery.setAssistUserId(patientManagerRequest.getAssistUserId()); patientsQuery.setSendCareMan(patientManagerRequest.getSendCareMan()); 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 a88ed13..605d84c 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 @@ -105,6 +105,17 @@ public class PatientManagerRequest extends BasePageQueryRequest { private Integer endAge; + //空或者1为正常 2为补录 + private String normal; + + public String getNormal() { + return normal; + } + + public void setNormal(String normal) { + this.normal = normal; + } + public Integer getStartAge() { return startAge; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 4633407..494ab49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -167,6 +167,17 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { private String townOrgId; + //空或者1为正常 2为补录 + private String normal; + + public String getNormal() { + return normal; + } + + public void setNormal(String normal) { + this.normal = normal; + } + //乡镇卫生院Id public String getTownOrgId() { return townOrgId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index a845fe7..b24823e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -377,6 +377,20 @@ public class YunBookbuildingAddRequest { //乐陵市妇幼母子保健手册下发机构id private String lowerHairOgrId; + /** + * 承德需求 外地过来分娩或者内蒙只过来分娩，临时建档只为了开证的，在建档页面加一个补录的字段标记 + */ + //空或者1为正常 2为补录 + private String normal; + + public String getNormal() { + return normal; + } + + public void setNormal(String normal) { + this.normal = normal; + } + public String getLowerHairOgrId() { return lowerHairOgrId; } -- 1.8.3.1