Commit 89813e3e2fe162201508915be313b63a5a5b2a57

Authored by wtt
1 parent 3fa9c8190c

体成分分析,获取基本信息增加返回参数,保存检查数据增加孕妇信息

Showing 3 changed files with 93 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java View file @ 89813e3
... ... @@ -11,7 +11,19 @@
11 11 public class VolumeComponentAnalysisModel extends BaseModel {
12 12 private static final long serialVersionUID = SerialIdEnum.VolumeComponentAnalysisModel.getCid();
13 13 private String id;
  14 + //医院id
14 15 private String hospitalId;
  16 + //病人id
  17 + private String patientId;
  18 + private String pid;
  19 + //就诊卡号
  20 + private String vcCardNo;
  21 + //身份证号
  22 + private String certNo;
  23 + //证件类型Id
  24 + private String certType;
  25 +
  26 +
15 27 private String parentId;
16 28 private String uuId;//  ABC-001;,    //单位代码
17 29 private String deviceID;// 16ART1B0007;       //仪器编号
... ... @@ -86,6 +98,50 @@
86 98 private String edemaMin; // 0.35;,    //水肿系数正常范围的低值
87 99 private String vfiMax; // 5;,    //内脏脂肪指数正常范围的高值
88 100 private String vfiMin; // 10;    //内脏脂肪指数正常范围的低值
  101 +
  102 + public static long getSerialVersionUID() {
  103 + return serialVersionUID;
  104 + }
  105 +
  106 + public String getCertType() {
  107 + return certType;
  108 + }
  109 +
  110 + public void setCertType(String certType) {
  111 + this.certType = certType;
  112 + }
  113 +
  114 + public String getPatientId() {
  115 + return patientId;
  116 + }
  117 +
  118 + public void setPatientId(String patientId) {
  119 + this.patientId = patientId;
  120 + }
  121 +
  122 + public String getPid() {
  123 + return pid;
  124 + }
  125 +
  126 + public void setPid(String pid) {
  127 + this.pid = pid;
  128 + }
  129 +
  130 + public String getVcCardNo() {
  131 + return vcCardNo;
  132 + }
  133 +
  134 + public void setVcCardNo(String vcCardNo) {
  135 + this.vcCardNo = vcCardNo;
  136 + }
  137 +
  138 + public String getCertNo() {
  139 + return certNo;
  140 + }
  141 +
  142 + public void setCertNo(String certNo) {
  143 + this.certNo = certNo;
  144 + }
89 145  
90 146 public String getHospitalId() {
91 147 return hospitalId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 89813e3
... ... @@ -282,7 +282,13 @@
282 282 result.setHeight(height);
283 283 }
284 284  
  285 + result.setWeeks(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
  286 + result.setDueDate(
  287 + patients.getLastMenses() == null ? null : DateUtil.getyyyy_MM_dd(DateUtil.addDay(patients.getLastMenses(), 280)));
285 288 result.setHospitalId(patients.getHospitalId());
  289 + result.setPid(patients.getPid());
  290 + result.setPatientId(patients.getId());
  291 +
286 292 result.setUserName(patients.getUsername());
287 293 result.setPhone(patients.getPhone());
288 294 result.setVcCardNo(patients.getVcCardNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureBaseInfoResult.java View file @ 89813e3
... ... @@ -39,6 +39,9 @@
39 39 //病人id
40 40 private String patientId;
41 41  
  42 + private String pid;
  43 +
  44 +
42 45 //户籍地址
43 46 private String address;
44 47  
... ... @@ -51,6 +54,34 @@
51 54 private String height;
52 55 //体重
53 56 private String weight;
  57 + //孕周
  58 + private String weeks;
  59 + //预产期
  60 + private Object dueDate;
  61 +
  62 + public String getPid() {
  63 + return pid;
  64 + }
  65 +
  66 + public void setPid(String pid) {
  67 + this.pid = pid;
  68 + }
  69 +
  70 + public String getWeeks() {
  71 + return weeks;
  72 + }
  73 +
  74 + public void setWeeks(String weeks) {
  75 + this.weeks = weeks;
  76 + }
  77 +
  78 + public Object getDueDate() {
  79 + return dueDate;
  80 + }
  81 +
  82 + public void setDueDate(Object dueDate) {
  83 + this.dueDate = dueDate;
  84 + }
54 85  
55 86 public String getHeight() {
56 87 return height;