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 60e4a59..563d912 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 @@ -342,6 +342,27 @@ public class AntExChuModel extends BaseModel { private String xqjq; // 血尿素氮 private String xnsd; + + + // 乙肝表面抗原 + private String ygbmkyValue; + //乙肝表面抗体 + private String ygbmktValue; + //乙肝e抗原 + private String ygekyValue; + // 乙肝e抗体 + private String ygektValue; + // 乙肝核心抗体 + private String yghxktValue; + + + //hit抗体检测 + private String hivktValue; + + //实验结果 + private String syjgValue; + + // 梅毒血清实验 // private String mdxqsy; // hit抗体检测 @@ -1809,4 +1830,60 @@ public class AntExChuModel extends BaseModel { public void setLastMenses(Date lastMenses) { this.lastMenses = lastMenses; } + + public String getYgbmkyValue() { + return ygbmkyValue; + } + + public void setYgbmkyValue(String ygbmkyValue) { + this.ygbmkyValue = ygbmkyValue; + } + + public String getYgbmktValue() { + return ygbmktValue; + } + + public void setYgbmktValue(String ygbmktValue) { + this.ygbmktValue = ygbmktValue; + } + + public String getYgekyValue() { + return ygekyValue; + } + + public void setYgekyValue(String ygekyValue) { + this.ygekyValue = ygekyValue; + } + + public String getYgektValue() { + return ygektValue; + } + + public void setYgektValue(String ygektValue) { + this.ygektValue = ygektValue; + } + + public String getYghxktValue() { + return yghxktValue; + } + + public void setYghxktValue(String yghxktValue) { + this.yghxktValue = yghxktValue; + } + + public String getHivktValue() { + return hivktValue; + } + + public void setHivktValue(String hivktValue) { + this.hivktValue = hivktValue; + } + + public String getSyjgValue() { + return syjgValue; + } + + public void setSyjgValue(String syjgValue) { + this.syjgValue = syjgValue; + } } 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 bdf1aed..9680b77 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 @@ -1922,6 +1922,18 @@ public class ViewFacade { map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt())); map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt())); + + + map.put("ygbmkyValue", data.getYgbmkyValue() == null ? "" : data.getYgbmkyValue()); + map.put("ygbmktValue", data.getYgbmktValue() == null ? "" : data.getYgbmktValue()); + map.put("ygekyValue", data.getYgekyValue() == null ? "" : data.getYgekyValue()); + map.put("ygektValue", data.getYgektValue() == null ? "" : data.getYgektValue()); + map.put("yghxktValue", data.getYghxktValue() == null ? "" : data.getYghxktValue()); + + + map.put("syjgValue", data.getSyjgValue() == null ? "" : data.getSyjgValue()); + map.put("hivktValue", data.getHivktValue() == null ? "" :data.getHivktValue()); + map.put("xqjq", UnitUtils.unitSplice(data.getXqjq(), UnitConstants.UMOLL)); map.put("xnsd", UnitUtils.unitSplice(data.getXnsd(), UnitConstants.MMOLL)); 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 b332525..98e5f3c 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 @@ -248,6 +248,21 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String ygekt; // 乙肝核心抗体 private String yghxkt; + + + + // 乙肝表面抗原 + private String ygbmkyValue; + //乙肝表面抗体 + private String ygbmktValue; + //乙肝e抗原 + private String ygekyValue; + // 乙肝e抗体 + private String ygektValue; + // 乙肝核心抗体 + private String yghxktValue; + + //血清肌 private String xqjq; //血尿素氮 @@ -256,6 +271,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String mdxqsy; //hit抗体检测 private String hivkt; + + //hit抗体检测 + private String hivktValue; + + //实验结果 + private String syjgValue; + //阴道分泌物 private Map ydfmw; //阴道清洁度 @@ -1852,6 +1874,62 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.pid = pid; } + public String getYgbmkyValue() { + return ygbmkyValue; + } + + public void setYgbmkyValue(String ygbmkyValue) { + this.ygbmkyValue = ygbmkyValue; + } + + public String getYgbmktValue() { + return ygbmktValue; + } + + public void setYgbmktValue(String ygbmktValue) { + this.ygbmktValue = ygbmktValue; + } + + public String getYgekyValue() { + return ygekyValue; + } + + public void setYgekyValue(String ygekyValue) { + this.ygekyValue = ygekyValue; + } + + public String getYgektValue() { + return ygektValue; + } + + public void setYgektValue(String ygektValue) { + this.ygektValue = ygektValue; + } + + public String getYghxktValue() { + return yghxktValue; + } + + public void setYghxktValue(String yghxktValue) { + this.yghxktValue = yghxktValue; + } + + public String getHivktValue() { + return hivktValue; + } + + public void setHivktValue(String hivktValue) { + this.hivktValue = hivktValue; + } + + public String getSyjgValue() { + return syjgValue; + } + + public void setSyjgValue(String syjgValue) { + this.syjgValue = syjgValue; + } + @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); @@ -1960,6 +2038,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setYgeky(ygeky); antExChuModel.setYgekt(ygekt); antExChuModel.setYghxkt(yghxkt); + + antExChuModel.setYgbmkyValue(ygbmkyValue); + antExChuModel.setYgbmktValue(ygbmktValue); + antExChuModel.setYgekyValue(ygekyValue); + antExChuModel.setYgektValue(ygektValue); + antExChuModel.setYghxktValue(yghxktValue); + antExChuModel.setXqjq(xqjq); antExChuModel.setXnsd(xnsd); antExChuModel.setHeart(heart); @@ -1974,6 +2059,10 @@ public class AntExcAddRequest implements IBasicRequestConvert { } // antExChuModel.setMdxqsy(mdxqsy); antExChuModel.setHivkt(hivkt); + + antExChuModel.setHivktValue(hivktValue); + antExChuModel.setSyjgValue(syjgValue); + antExChuModel.setYdfmw(JsonUtil.obj2JsonString(ydfmw)); antExChuModel.setYdqjd(ydqjd); antExChuModel.setPregnancyTimes(pregnancyTimes);