diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java index ea94ec3..dcef113 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java @@ -11,7 +11,19 @@ import org.springframework.data.mongodb.core.mapping.Document; public class VolumeComponentAnalysisModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.VolumeComponentAnalysisModel.getCid(); private String id; + //医院id private String hospitalId; + //病人id + private String patientId; + private String pid; + //就诊卡号 + private String vcCardNo; + //身份证号 + private String certNo; + //证件类型Id + private String certType; + + private String parentId; private String uuId;//  ABC-001;,    //单位代码 private String deviceID;// 16ART1B0007;       //仪器编号 @@ -87,6 +99,50 @@ public class VolumeComponentAnalysisModel extends BaseModel { private String vfiMax; // 5;,    //内脏脂肪指数正常范围的高值 private String vfiMin; // 10;    //内脏脂肪指数正常范围的低值 + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getCertType() { + return certType; + } + + public void setCertType(String certType) { + this.certType = certType; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getCertNo() { + return certNo; + } + + public void setCertNo(String certNo) { + this.certNo = certNo; + } + public String getHospitalId() { return hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 2f2d924..a503a56 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -282,7 +282,13 @@ public class MeasureInfoFacade { result.setHeight(height); } + result.setWeeks(DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); + result.setDueDate( + patients.getLastMenses() == null ? null : DateUtil.getyyyy_MM_dd(DateUtil.addDay(patients.getLastMenses(), 280))); result.setHospitalId(patients.getHospitalId()); + result.setPid(patients.getPid()); + result.setPatientId(patients.getId()); + result.setUserName(patients.getUsername()); result.setPhone(patients.getPhone()); result.setVcCardNo(patients.getVcCardNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java index 5f77ed1..9d41e25 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java @@ -39,6 +39,9 @@ public class MeasureBaseInfoResult { //病人id private String patientId; + private String pid; + + //户籍地址 private String address; @@ -51,6 +54,34 @@ public class MeasureBaseInfoResult { private String height; //体重 private String weight; + //孕周 + private String weeks; + //预产期 + private Object dueDate; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getWeeks() { + return weeks; + } + + public void setWeeks(String weeks) { + this.weeks = weeks; + } + + public Object getDueDate() { + return dueDate; + } + + public void setDueDate(Object dueDate) { + this.dueDate = dueDate; + } public String getHeight() { return height;