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 b52a75f..1e7398f 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 @@ -37,6 +37,16 @@ public class Patients extends BaseModel { private String lastMenstrualPeriodBasisDoctorId; // 末次月经纠正时间 private String lastMenstrualPeriodBasisDate; + //丈夫信息是否必须 + private Boolean reqHusband; + + public Boolean getReqHusband() { + return reqHusband; + } + + public void setReqHusband(Boolean reqHusband) { + this.reqHusband = reqHusband; + } public Date getFuckLastMens() { return fuckLastMens; 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 e0baead..811e6d1 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 @@ -1114,6 +1114,7 @@ public class BookbuildingFacade { */ public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); + patient.setReqHusband(yunRequest.getReqHusband()); patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getFuckLastMens())); patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); @@ -1297,7 +1298,7 @@ public class BookbuildingFacade { public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); - + result.setReqHusband(p.getReqHusband()); result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther()); result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis())); 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 b809341..e0d143b 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 @@ -28,6 +28,16 @@ public class YunBookbuildingAddRequest { private String lastMenstrualPeriodBasisDoctorName; private List patientSerResults; + //丈夫信息是否必须 + private Boolean reqHusband; + + public Boolean getReqHusband() { + return reqHusband; + } + + public void setReqHusband(Boolean reqHusband) { + this.reqHusband = reqHusband; + } public List getPatientSerResults() { return patientSerResults; 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 05d8a92..11b5ee6 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 @@ -18,7 +18,8 @@ public class PregnantInfoResult { // 末次月经纠正医生ID private String lastMenstrualPeriodBasisDoctorId; private String lastMenstrualPeriodBasisDoctorName; - + //是否提供丈夫信息 + private Boolean reqHusband; /** * 编辑时服务信息 */ @@ -26,6 +27,13 @@ public class PregnantInfoResult { //显示服务信息 private List patientSerResults; + public Boolean getReqHusband() { + return reqHusband; + } + + public void setReqHusband(Boolean reqHusband) { + this.reqHusband = reqHusband; + } public List getPatientSerResults() { return patientSerResults;