diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 814417a..aa6e8e5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -259,6 +259,16 @@ public class SieveApplyOrderModel extends BaseModel { private boolean huaDaPushResult; //iAssistantl数据传输格式说明,导出excel自动不足添加在此处,让前端输入 + private String timeOfFetuses; //胎次 + private String diabetes; //糖尿病 "0" 无;“1”有; + private String addTSH; //甲亢 "0" 无;“1”有; + private String subTSH; //甲减 "0" 无;“1”有 + private String menses; //月经 "0" 规则;“1”不规则; + private Boolean hAFPType ; //hAFP true 选择;false 未选择;Boolean + private Boolean bHcgType ; //Free-βhCG true 选择;false 未选择;Boolean + private Boolean uE3Type ; //uE3 true 选择;false 未选择;Boolean + private Boolean pAPPAType ; //PAPPA true 选择;false 未选择;Boolea + //导出状态 1导出 private Integer ieStatus; //胎数 @@ -311,6 +321,78 @@ public class SieveApplyOrderModel extends BaseModel { this.caiyangyunzhou = caiyangyunzhou; } + public String getTimeOfFetuses() { + return timeOfFetuses; + } + + public void setTimeOfFetuses(String timeOfFetuses) { + this.timeOfFetuses = timeOfFetuses; + } + + public String getDiabetes() { + return diabetes; + } + + public void setDiabetes(String diabetes) { + this.diabetes = diabetes; + } + + public String getAddTSH() { + return addTSH; + } + + public void setAddTSH(String addTSH) { + this.addTSH = addTSH; + } + + public String getSubTSH() { + return subTSH; + } + + public void setSubTSH(String subTSH) { + this.subTSH = subTSH; + } + + public String getMenses() { + return menses; + } + + public void setMenses(String menses) { + this.menses = menses; + } + + public Boolean gethAFPType() { + return hAFPType; + } + + public void sethAFPType(Boolean hAFPType) { + this.hAFPType = hAFPType; + } + + public Boolean getbHcgType() { + return bHcgType; + } + + public void setbHcgType(Boolean bHcgType) { + this.bHcgType = bHcgType; + } + + public Boolean getuE3Type() { + return uE3Type; + } + + public void setuE3Type(Boolean uE3Type) { + this.uE3Type = uE3Type; + } + + public Boolean getpAPPAType() { + return pAPPAType; + } + + public void setpAPPAType(Boolean pAPPAType) { + this.pAPPAType = pAPPAType; + } + public Integer getIeStatus() { return ieStatus; } 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 df1541c..56771a8 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 @@ -1161,6 +1161,16 @@ public class SieveFacade { if (StringUtils.isNotEmpty(lymsSieveId)) { result.put("lymsSieveId", lymsSieveId); } + result.put("timeOfFetuses", sieveApply.getTimeOfFetuses()); + result.put("diabetes", sieveApply.getDiabetes()); + result.put("addTSH", sieveApply.getAddTSH()); + result.put("subTSH", sieveApply.getSubTSH()); + result.put("menses", sieveApply.getMenses()); + result.put("hAFPType", sieveApply.gethAFPType()); + result.put("bhcgType", sieveApply.getbHcgType()); + result.put("uE3Type", sieveApply.getuE3Type()); + result.put("pAPPAType", sieveApply.getpAPPAType()); + result.put("noOfFetuses", sieveApply.getNoOfFetuses()); result.put("patientID", sieveApply.getPatientID()); result.put("applicationNo", sieveApply.getApplicationNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 063eb29..558845b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -255,6 +255,16 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert