diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java index 0b8c9e0..0caa3af 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java @@ -20,11 +20,14 @@ public class PostpartumRecords extends BaseModel { private String maternalDeliverId;//分娩ID private String created;//创建时间 private String modified;//修改时间 - private List records;//记录列表 + //private List records;//记录列表 private String hospitalId;//医院ID private String doctor;//操作医生 + private String oneCxl;//产后一小时出血量 + private String twoCxl;//产后两小时出血量 + private String gcStatus;//观察状态（0:正在观察；1:观察结束） - public static class Records implements Serializable { + /*public static class Records implements Serializable { private static final long serialVersionUID = SerialIdEnum.Records.getCid(); private String id; private String date;//时间 @@ -147,7 +150,7 @@ public class PostpartumRecords extends BaseModel { public void setQm(String qm) { this.qm = qm; } - } + }*/ public String getId() { @@ -190,13 +193,13 @@ public class PostpartumRecords extends BaseModel { this.modified = modified; } - public List getRecords() { + /*public List getRecords() { return records; } public void setRecords(List records) { this.records = records; - } + }*/ public String getHospitalId() { return hospitalId; @@ -213,4 +216,20 @@ public class PostpartumRecords extends BaseModel { public void setDoctor(String doctor) { this.doctor = doctor; } + + public String getOneCxl() { + return oneCxl; + } + + public void setOneCxl(String oneCxl) { + this.oneCxl = oneCxl; + } + + public String getTwoCxl() { + return twoCxl; + } + + public void setTwoCxl(String twoCxl) { + this.twoCxl = twoCxl; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java index 77b2e8c..c7d075f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java @@ -84,15 +84,21 @@ public class PostpartumRecordsFacade { postpartumRecordsResult.setName(list.get(0).getUsername()); postpartumRecordsResult.setBhnum(mdList.get(0).getBhNum()); postpartumRecordsResult.setOneCxl(mdList.get(0).getTotalOneCxl()); + if(StringUtils.isNotEmpty(prList.get(0).getOneCxl())){ + postpartumRecordsResult.setOneCxl(prList.get(0).getOneCxl()); + } postpartumRecordsResult.setTwoCxl(mdList.get(0).getTotalTwoCxl()); - List records = prList.get(0).getRecords(); + if(StringUtils.isNotEmpty(prList.get(0).getTwoCxl())){ + postpartumRecordsResult.setTwoCxl(prList.get(0).getTwoCxl()); + } + /*List records = prList.get(0).getRecords(); List recordsList = new ArrayList(); if(CollectionUtils.isNotEmpty(records)){ for(PostpartumRecords.Records r : records){ recordsList.add(postpartumRecordsResult.new Records(r)); } postpartumRecordsResult.setRecords(recordsList); - } + }*/ }else{ postpartumRecordsResult.setName(list.get(0).getUsername()); postpartumRecordsResult.setBhnum(mdList.get(0).getBhNum()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java new file mode 100644 index 0000000..d54e8df --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java @@ -0,0 +1,196 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.pojo.PostpartumRecords; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by Administrator on 2019/1/11. + * 产后观察增加或修改模型 + */ +public class PostpartumRecordsAddRequest { + + private String id; + private String oneCxl; + private String twoCxl; + //private List records; + + /*public class Records implements IBasicRequestConvert { + + private String id; + private String date;//时间 + private String tw;//体温 + private String xy;//血压 + private String mb;//脉搏 + private String xybhd;//血氧饱和度 + private String gd;//宫底 + private String cxl;//出血量 + private String pgjc;//膀胱检查 + private String hyqk;//会阴情况 + private String nz;//内诊 + private String fz;//附注 + private String qm;//签名 + + public Records(){ + + } + + @Override + public PostpartumRecords.Records convertToDataModel() { + PostpartumRecords.Records record= new PostpartumRecords.Records(); + record.setId(id); + record.setDate(date); + record.setTw(tw); + record.setXy(xy); + record.setMb(mb); + record.setXybhd(xybhd); + record.setGd(gd); + record.setCxl(cxl); + record.setPgjc(pgjc); + record.setHyqk(hyqk); + record.setNz(nz); + record.setFz(fz); + record.setQm(qm); + + return record; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getTw() { + return tw; + } + + public void setTw(String tw) { + this.tw = tw; + } + + public String getXy() { + return xy; + } + + public void setXy(String xy) { + this.xy = xy; + } + + public String getMb() { + return mb; + } + + public void setMb(String mb) { + this.mb = mb; + } + + public String getXybhd() { + return xybhd; + } + + public void setXybhd(String xybhd) { + this.xybhd = xybhd; + } + + public String getGd() { + return gd; + } + + public void setGd(String gd) { + this.gd = gd; + } + + public String getCxl() { + return cxl; + } + + public void setCxl(String cxl) { + this.cxl = cxl; + } + + public String getPgjc() { + return pgjc; + } + + public void setPgjc(String pgjc) { + this.pgjc = pgjc; + } + + public String getHyqk() { + return hyqk; + } + + public void setHyqk(String hyqk) { + this.hyqk = hyqk; + } + + public String getNz() { + return nz; + } + + public void setNz(String nz) { + this.nz = nz; + } + + public String getFz() { + return fz; + } + + public void setFz(String fz) { + this.fz = fz; + } + + public String getQm() { + return qm; + } + + public void setQm(String qm) { + this.qm = qm; + } + }*/ + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getOneCxl() { + return oneCxl; + } + + public void setOneCxl(String oneCxl) { + this.oneCxl = oneCxl; + } + + public String getTwoCxl() { + return twoCxl; + } + + public void setTwoCxl(String twoCxl) { + this.twoCxl = twoCxl; + } + + /*public List getRecords() { + return records; + } + + public void setRecords(List records) { + this.records = records; + }*/ +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java index acf1395..1a2265a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java @@ -17,7 +17,7 @@ public class PostpartumRecordsResult { private String maternalDeliverId;//分娩ID private String created;//创建时间 private String modified;//修改时间 - private List records;//记录列表 + //private List records;//记录列表 private String hospitalId;//医院ID private String doctor;//操作医生 private String name;//孕妇姓名 @@ -25,7 +25,7 @@ public class PostpartumRecordsResult { private String oneCxl;//一小时出血量 private String twoCxl;//两小时出血量 - public class Records implements Serializable { + /*public class Records implements Serializable { private String id; private String date;//时间 private String tw;//体温 @@ -163,7 +163,7 @@ public class PostpartumRecordsResult { public void setQm(String qm) { this.qm = qm; } - } + }*/ public String getId() { return id; @@ -205,13 +205,13 @@ public class PostpartumRecordsResult { this.modified = modified; } - public List getRecords() { + /*public List getRecords() { return records; } public void setRecords(List records) { this.records = records; - } + }*/ public String getHospitalId() { return hospitalId;