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 64f6942..a8f2062 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 @@ -17,6 +17,8 @@ import java.util.Objects; public class Patients extends BaseModel { private static final long serialVersionUID = SerialIdEnum.Patients.getCid(); + /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ + private String screening; //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -1547,6 +1549,14 @@ public class Patients extends BaseModel { this.hstreetRegisterId = hstreetRegisterId; } + public String getScreening() { + return screening; + } + + public void setScreening(String screening) { + this.screening = screening; + } + public String getStreetId() { return streetId; } 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 6908c85..0285e2e 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 @@ -20,6 +20,10 @@ import java.util.List; * @author Administrator */ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { + + /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ + private String screening; + //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -597,7 +601,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (pcerteTypeId != null) { condition = condition.and("pcerteTypeId", pcerteTypeId, MongoOper.IS); } - + if (StringUtils.isNotEmpty(screening)) { + condition = condition.and("screening", screening, MongoOper.IS); + } if (isFace) { condition = condition.and("face", true, MongoOper.EXISTS); @@ -1433,6 +1439,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.extSource = extSource; } + public String getScreening() { + return screening; + } + + public void setScreening(String screening) { + this.screening = screening; + } + public boolean isFace() { return isFace; } 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 cce1188..f278199 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 @@ -350,6 +350,7 @@ public class BookbuildingFacade { patient.setCreated(new Date()); patient.setModified(new Date()); patient.setOperator(userId); + patient.setScreening(yunRequest.getScreening());//特殊产筛建档 //生成条形码 getNumberCode(patient); @@ -1213,6 +1214,7 @@ public class BookbuildingFacade { }*/ patient.setOperator(userId); + patient.setScreening(yunRequest.getScreening());//特殊产筛建档 Patients beforePatient = yunBookbuildingService.findOneById(id); 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 7fc6223..081d286 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 @@ -1814,6 +1814,7 @@ public class PatientFacade { PatientManagerResult patientManagerResult = new PatientManagerResult(); PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setScreening(patientManagerRequest.getScreening()); patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 7b022cb..88784f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1175,6 +1175,9 @@ public class SieveFacade { HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != pat) { + /*20201130 衡水增加户籍地址 */ + patientBaseResult.setMaddress(CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), + pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址 /* 20200608 产筛修改 wtt ,去掉已申请过产筛限制,可以多次申请产筛 @@ -1273,8 +1276,7 @@ public class SieveFacade { PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != pat) { - /* - 20200608 产筛修改 wtt ,去掉已申请过产筛限制,可以多次申请产筛*/ + /* 20200608 产筛修改 wtt ,去掉已申请过产筛限制,可以多次申请产筛*/ SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(pat.getId()); sieveApplyOrderQuery1.setHospitalId(hospitalId); 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 0a74887..22d3baa 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 @@ -7,6 +7,9 @@ package com.lyms.platform.operate.web.request; */ public class PatientManagerRequest extends BasePageQueryRequest { + /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ + private String screening; + //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -144,6 +147,14 @@ public class PatientManagerRequest extends BasePageQueryRequest { this.liveType = liveType; } + public String getScreening() { + return screening; + } + + public void setScreening(String screening) { + this.screening = screening; + } + public String getAssistUserId() { return assistUserId; } 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 2d6c075..bd9dee7 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 @@ -13,6 +13,10 @@ import java.util.Map; */ @Form public class YunBookbuildingAddRequest { + + /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ + private String screening; + //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -64,6 +68,14 @@ public class YunBookbuildingAddRequest { return filePath; } + public String getScreening() { + return screening; + } + + public void setScreening(String screening) { + this.screening = screening; + } + public void setFilePath(FilePathModel filePath) { this.filePath = filePath; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 08c80da..cbcbb8e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -67,6 +67,16 @@ public class PatientBaseResult { private boolean hasPrintInWeek; private String bmi; + //户籍地址 + private String maddress; + + public String getMaddress() { + return maddress; + } + + public void setMaddress(String maddress) { + this.maddress = maddress; + } public String getBmi() { return bmi;