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 adeab53..8409a3c 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 @@ -344,8 +344,14 @@ public class AntExChuModel extends BaseModel { private String abo ; // rh private String rh ; - // 血糖 + // 血糖1 private String bloodSugar; + // 血糖2 + private String bloodSugar2; + // 血糖3 + private String bloodSugar3; + // 血糖4 + private String bloodSugar4; //B超 private String bChao ; //胎数 @@ -552,6 +558,29 @@ public class AntExChuModel extends BaseModel { this.placentas = placentas; } + public String getBloodSugar2() { + return bloodSugar2; + } + + public void setBloodSugar2(String bloodSugar2) { + this.bloodSugar2 = bloodSugar2; + } + + public String getBloodSugar3() { + return bloodSugar3; + } + + public void setBloodSugar3(String bloodSugar3) { + this.bloodSugar3 = bloodSugar3; + } + + public String getBloodSugar4() { + return bloodSugar4; + } + + public void setBloodSugar4(String bloodSugar4) { + this.bloodSugar4 = bloodSugar4; + } public String getTireNumber1() { return tireNumber1; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index e250e19..f0001c0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -70,6 +70,12 @@ public class AntenatalExaminationModel extends BaseModel { private String bChao; //血糖 private String bloodSugar; + // 血糖2 + private String bloodSugar2; + // 血糖3 + private String bloodSugar3; + // 血糖4 + private String bloodSugar4; //高危因素 private String riskFactor; // 高危评分 @@ -103,6 +109,30 @@ public class AntenatalExaminationModel extends BaseModel { //操作人 private Integer operator; + public String getBloodSugar2() { + return bloodSugar2; + } + + public void setBloodSugar2(String bloodSugar2) { + this.bloodSugar2 = bloodSugar2; + } + + public String getBloodSugar3() { + return bloodSugar3; + } + + public void setBloodSugar3(String bloodSugar3) { + this.bloodSugar3 = bloodSugar3; + } + + public String getBloodSugar4() { + return bloodSugar4; + } + + public void setBloodSugar4(String bloodSugar4) { + this.bloodSugar4 = bloodSugar4; + } + public String getDiagnosisOther() { return diagnosisOther; } 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 76d3d24..557eb97 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 @@ -641,6 +641,10 @@ public class ViewFacade { //孕妇基本信息 map.put("id",data.getId()); map.put("diagnosisOther",data.getDiagnosisOther()); + map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL)); + map.put("bloodSugar2",UnitUtils.unitSplice(data.getBloodSugar2(), UnitConstants.MMOLL)); + map.put("bloodSugar3",UnitUtils.unitSplice(data.getBloodSugar3(), UnitConstants.MMOLL)); + map.put("bloodSugar4",UnitUtils.unitSplice(data.getBloodSugar4(), UnitConstants.MMOLL)); map.put("username",patients.getUsername()); map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI)); @@ -733,7 +737,6 @@ public class ViewFacade { /* 辅助信息 */ map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL)); map.put("urineProtein",data.getUrineProtein()); - map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL)); map.put("bChao",data.getbChao()); /* 诊断指导 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 17fe8d1..7053fee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -64,7 +64,10 @@ public class AntExAddRequest implements IBasicRequestConvert riskFactor; // 高危评分 @@ -118,6 +121,30 @@ public class AntExAddRequest implements IBasicRequestConvert { private String ncgOther; private String abo; private String rh; - // 血糖 + // 血糖1 private String bloodSugar; // B超 private String bChao ; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index db2dfe7..0510fdf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -47,7 +47,13 @@ public class AntenatalExaminationResult implements IBasicResultConvert