From c95e3997472a3b0e8462d0c4f5ffe0581568784d Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 8 Mar 2022 16:52:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-=E5=AD=95=E5=A6=87?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9A?= =?UTF-8?q?=E6=9C=89=E5=B1=85=E4=BD=8F=E8=AF=81=20=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/Patients.java | 11 +++++++++++ .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 4 ++-- .../platform/operate/web/facade/PatientServiceFacade.java | 9 +++++++++ .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 1 + .../operate/web/request/YunBookbuildingAddRequest.java | 11 +++++++++++ .../platform/operate/web/result/PatientManagerQueryModel.java | 11 +++++++++++ .../lyms/platform/operate/web/result/PregnantInfoResult.java | 11 +++++++++++ 7 files changed, 56 insertions(+), 2 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 d18dbee..7655a8c 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 @@ -421,6 +421,17 @@ public class Patients extends BaseModel { //分娩医生 private String deliverDoctor; + //秦皇岛-有居住证 填写字段 + private String liveCardNo; + + public String getLiveCardNo() { + return liveCardNo; + } + + public void setLiveCardNo(String liveCardNo) { + this.liveCardNo = liveCardNo; + } + public String getDeliverDoctor() { return deliverDoctor; } 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 4008ca7..336fbfe 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 @@ -1994,7 +1994,7 @@ public class BookbuildingFacade { patient.setPatientVerifType(yunRequest.getPatientVerifType()); patient.setPatientVerifName(yunRequest.getPatientVerifName()); patient.setHusVerifType(yunRequest.getHusVerifType()); - + patient.setLiveCardNo(yunRequest.getLiveCardNo()); return patient; @@ -2187,7 +2187,7 @@ public class BookbuildingFacade { result.setPatientVerifName(p.getPatientVerifName()); result.setHusVerifType(p.getHusVerifType()); result.setHusbandName(p.getHusbandName()); - + result.setLiveCardNo(p.getLiveCardNo()); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 91d93e0..5a98836 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -225,6 +225,15 @@ public class PatientServiceFacade { // 居住类别 List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); + //秦皇岛需求-增加有居住证，客服配置（其他地区不需要这个选项） + if(StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)){ + for (BasicConfigResult basicConfigResult : liveType) { + if("有居住证".equals(basicConfigResult.getName())){ + liveType.remove(basicConfigResult); + break; + } + } + } map.put("liveType", liveType); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 88ee080..36f2002 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -559,6 +559,7 @@ public class ViewFacade { map.put("patientVerifName", data.getPatientVerifName()); map.put("husVerifType", StringUtils.isNotEmpty(data.getHusVerifType()) ? ("1".equals(data.getHusVerifType()) ? "自动核验": "人工核验") : "未验证"); map.put("husVerifName", data.getHusVerifName()); + map.put("liveCardNo", data.getLiveCardNo()); return map; } 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 a501bea..5e071f8 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 @@ -72,6 +72,17 @@ public class YunBookbuildingAddRequest { //丈夫删除文件路径 private List hdelFiles; + //秦皇岛-有居住证 填写字段 + private String liveCardNo; + + public String getLiveCardNo() { + return liveCardNo; + } + + public void setLiveCardNo(String liveCardNo) { + this.liveCardNo = liveCardNo; + } + public String getPatientVerifType() { return patientVerifType; } 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 6de84c3..319b7a7 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 @@ -100,6 +100,17 @@ public class PatientManagerQueryModel { //预约下次检查时间 private String nextCheckTime; + //秦皇岛-有居住证 填写字段 + private String liveCardNo; + + public String getLiveCardNo() { + return liveCardNo; + } + + public void setLiveCardNo(String liveCardNo) { + this.liveCardNo = liveCardNo; + } + public Integer getDueStatus() { return dueStatus; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index d16516a..42eb978 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -446,6 +446,17 @@ public class PregnantInfoResult { //丈夫证件人工核验人员名称 private String husVerifName; + //秦皇岛-有居住证 填写字段 + private String liveCardNo; + + public String getLiveCardNo() { + return liveCardNo; + } + + public void setLiveCardNo(String liveCardNo) { + this.liveCardNo = liveCardNo; + } + public String getPatientVerifType() { return patientVerifType; } -- 1.8.3.1