diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java index 9ac5698..9d7025f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java @@ -45,6 +45,48 @@ public class BloodPressure extends BaseModel { //0 未推送 1已经推送 private Integer sevenSend; + //孕前体重 + private String beforWeight; + //当前体重 + private String weight; + //身高 + private String height; + + //胎数 + private String foetusNum; + + public String getFoetusNum() { + return foetusNum; + } + + public void setFoetusNum(String foetusNum) { + this.foetusNum = foetusNum; + } + + public String getBeforWeight() { + return beforWeight; + } + + public void setBeforWeight(String beforWeight) { + this.beforWeight = beforWeight; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + public Integer getExceptionSend() { return exceptionSend; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 8ca31fe..4a4c7e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1386,12 +1386,28 @@ public class PatientFacade { patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); } catch (Exception e) { } + Patients p = mongoTemplate.findById(patientBaseResult.getId(), Patients.class); + if (p != null) { AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class); if (chuModel != null) { - patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); - patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : ""); + if (StringUtils.isNotEmpty(chuModel.getHeight()) && StringUtils.isNotEmpty(chuModel.getWeight())) + { + patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); + patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : ""); + patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : ""); + } + else + { + PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(p.getId())), PatientWeight.class); + if (patientWeight != null) + { + patientBaseResult.setHeight(StringUtils.isNotEmpty(patientWeight.getBeforeHeight()) ? patientWeight.getBeforeHeight() : ""); + patientBaseResult.setWeight(StringUtils.isNotEmpty(patientWeight.getNowWeight()) ? patientWeight.getNowWeight() : ""); + patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(patientWeight.getBeforeWeight()) ? patientWeight.getBeforeWeight() : ""); + } + } } } PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientBaseResult.getId())), PatientWeight.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index bb03c27..261247a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -50,6 +50,7 @@ public class PatientBaseResult { private String height; //体重 private String weight ; + private String beforWeight ; private String birth; @@ -58,6 +59,14 @@ public class PatientBaseResult { //新增产前诊断信息 private List> dia; + public String getBeforWeight() { + return beforWeight; + } + + public void setBeforWeight(String beforWeight) { + this.beforWeight = beforWeight; + } + public List> getDia() { return dia; }