From 3ac142306abf6d71b554a781316e65cda5d64528 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 18 Jul 2017 21:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E7=A7=91=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 48 ++++++++++++++++++- .../platform/operate/web/facade/ViewFacade.java | 6 +++ .../operate/web/request/AntExcAddRequest.java | 55 ++++++++++++++++++++++ 3 files changed, 108 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 20f5730..bb85c19 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -6,7 +6,6 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; -import java.util.Map; /** * 产前检查初诊模型 @@ -97,14 +96,24 @@ public class AntExChuModel extends BaseModel { private String lungs; //外阴 private String vulva; + //外阴选项 + private String vulvaSele; //阴道 private String vagina; + //阴道选项 + private String vaginaSele; // 宫颈 private String cervical; + // 宫颈选项 + private String cervicalSele; //子宫 private String uterus; + //子宫选项 + private String uterusSele; //附件 private String fujian; + //附件选项 + private String fujianSele; private Date created; private String hospitalId; private String bp; @@ -590,8 +599,45 @@ public class AntExChuModel extends BaseModel { this.cestationInfo = cestationInfo; } + public String getVulvaSele() { + return vulvaSele; + } + public void setVulvaSele(String vulvaSele) { + this.vulvaSele = vulvaSele; + } + public String getVaginaSele() { + return vaginaSele; + } + + public void setVaginaSele(String vaginaSele) { + this.vaginaSele = vaginaSele; + } + + public String getCervicalSele() { + return cervicalSele; + } + + public void setCervicalSele(String cervicalSele) { + this.cervicalSele = cervicalSele; + } + + public String getUterusSele() { + return uterusSele; + } + + public void setUterusSele(String uterusSele) { + this.uterusSele = uterusSele; + } + + public String getFujianSele() { + return fujianSele; + } + + public void setFujianSele(String fujianSele) { + this.fujianSele = fujianSele; + } public String getDiagnosis() { return diagnosis; 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 11fda76..75bc82b 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 @@ -1313,10 +1313,16 @@ public class ViewFacade { map.put("heart", data.getHeart()); map.put("lungs", data.getLungs()); map.put("vulva", data.getVulva()); + map.put("vulvaSele", data.getVulvaSele()); map.put("vagina", data.getVagina()); + map.put("vaginaSele", data.getVaginaSele()); map.put("cervical", data.getCervical()); + map.put("cervicalSele", data.getCervicalSele()); map.put("uterus", data.getUterus()); + map.put("uterusSele", data.getUterusSele()); map.put("fujian", data.getFujian()); + map.put("fujianSele", data.getFujianSele()); + map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 0725587..1413cfe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -88,14 +88,24 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String lungs; //外阴 private String vulva; + //外阴选项 + private String vulvaSele; //阴道 private String vagina; + //阴道选项 + private String vaginaSele; // 宫颈 private String cervical; + // 宫颈选项 + private String cervicalSele; //子宫 private String uterus; + //子宫选项 + private String uterusSele; //附件 private String fujian; + //附件选项 + private String fujianSele; // 宫高 private String gonggao; // 宫高选项 @@ -320,6 +330,46 @@ public class AntExcAddRequest implements IBasicRequestConvert { //传染病史 private Map infectDiseases; + public String getVulvaSele() { + return vulvaSele; + } + + public void setVulvaSele(String vulvaSele) { + this.vulvaSele = vulvaSele; + } + + public String getVaginaSele() { + return vaginaSele; + } + + public void setVaginaSele(String vaginaSele) { + this.vaginaSele = vaginaSele; + } + + public String getCervicalSele() { + return cervicalSele; + } + + public void setCervicalSele(String cervicalSele) { + this.cervicalSele = cervicalSele; + } + + public String getUterusSele() { + return uterusSele; + } + + public void setUterusSele(String uterusSele) { + this.uterusSele = uterusSele; + } + + public String getFujianSele() { + return fujianSele; + } + + public void setFujianSele(String fujianSele) { + this.fujianSele = fujianSele; + } + public String getSyjgSelect() { return syjgSelect; } @@ -1102,6 +1152,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + antExChuModel.setVulvaSele(vaginaSele); + antExChuModel.setVaginaSele(vaginaSele); + antExChuModel.setCervicalSele(cervicalSele); + antExChuModel.setUterusSele(uterusSele); + antExChuModel.setFujianSele(fujianSele); antExChuModel.setYinchan(yinchan); antExChuModel.setGongwaiyun(gongwaiyun); antExChuModel.setYaowu(yaowu); -- 1.8.3.1