jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 32b9ecbf9390074902bef024ce8ae401cad8ec05

Authored by gengxiaokai
1 parent 363119cd2d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

威海产后观察记录

Showing 4 changed files with 233 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java View file @ 32b9ecb
... ... @@ -20,11 +20,14 @@
20 20 private String maternalDeliverId;//分娩ID
21 21 private String created;//创建时间
22 22 private String modified;//修改时间
23   - private List<Records> records;//记录列表
  23 + //private List<Records> records;//记录列表
24 24 private String hospitalId;//医院ID
25 25 private String doctor;//操作医生
  26 + private String oneCxl;//产后一小时出血量
  27 + private String twoCxl;//产后两小时出血量
  28 + private String gcStatus;//观察状态（0:正在观察；1:观察结束）
26 29  
27   - public static class Records implements Serializable {
  30 + /*public static class Records implements Serializable {
28 31 private static final long serialVersionUID = SerialIdEnum.Records.getCid();
29 32 private String id;
30 33 private String date;//时间
... ... @@ -147,7 +150,7 @@
147 150 public void setQm(String qm) {
148 151 this.qm = qm;
149 152 }
150   - }
  153 + }*/
151 154  
152 155  
153 156 public String getId() {
154 157  
... ... @@ -190,13 +193,13 @@
190 193 this.modified = modified;
191 194 }
192 195  
193   - public List<Records> getRecords() {
  196 + /*public List<Records> getRecords() {
194 197 return records;
195 198 }
196 199  
197 200 public void setRecords(List<Records> records) {
198 201 this.records = records;
199   - }
  202 + }*/
200 203  
201 204 public String getHospitalId() {
202 205 return hospitalId;
... ... @@ -212,6 +215,22 @@
212 215  
213 216 public void setDoctor(String doctor) {
214 217 this.doctor = doctor;
  218 + }
  219 +
  220 + public String getOneCxl() {
  221 + return oneCxl;
  222 + }
  223 +
  224 + public void setOneCxl(String oneCxl) {
  225 + this.oneCxl = oneCxl;
  226 + }
  227 +
  228 + public String getTwoCxl() {
  229 + return twoCxl;
  230 + }
  231 +
  232 + public void setTwoCxl(String twoCxl) {
  233 + this.twoCxl = twoCxl;
215 234 }
216 235 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java View file @ 32b9ecb
... ... @@ -84,15 +84,21 @@
84 84 postpartumRecordsResult.setName(list.get(0).getUsername());
85 85 postpartumRecordsResult.setBhnum(mdList.get(0).getBhNum());
86 86 postpartumRecordsResult.setOneCxl(mdList.get(0).getTotalOneCxl());
  87 + if(StringUtils.isNotEmpty(prList.get(0).getOneCxl())){
  88 + postpartumRecordsResult.setOneCxl(prList.get(0).getOneCxl());
  89 + }
87 90 postpartumRecordsResult.setTwoCxl(mdList.get(0).getTotalTwoCxl());
88   - List<PostpartumRecords.Records> records = prList.get(0).getRecords();
  91 + if(StringUtils.isNotEmpty(prList.get(0).getTwoCxl())){
  92 + postpartumRecordsResult.setTwoCxl(prList.get(0).getTwoCxl());
  93 + }
  94 + /*List<PostpartumRecords.Records> records = prList.get(0).getRecords();
89 95 List recordsList = new ArrayList();
90 96 if(CollectionUtils.isNotEmpty(records)){
91 97 for(PostpartumRecords.Records r : records){
92 98 recordsList.add(postpartumRecordsResult.new Records(r));
93 99 }
94 100 postpartumRecordsResult.setRecords(recordsList);
95   - }
  101 + }*/
96 102 }else{
97 103 postpartumRecordsResult.setName(list.get(0).getUsername());
98 104 postpartumRecordsResult.setBhnum(mdList.get(0).getBhNum());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java View file @ 32b9ecb
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +import com.lyms.platform.common.base.IBasicRequestConvert;
  4 +import com.lyms.platform.pojo.PostpartumRecords;
  5 +
  6 +import java.io.Serializable;
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * Created by Administrator on 2019/1/11.
  11 + * 产后观察增加或修改模型
  12 + */
  13 +public class PostpartumRecordsAddRequest {
  14 +
  15 + private String id;
  16 + private String oneCxl;
  17 + private String twoCxl;
  18 + //private List<Records> records;
  19 +
  20 + /*public class Records implements IBasicRequestConvert<PostpartumRecords.Records> {
  21 +
  22 + private String id;
  23 + private String date;//时间
  24 + private String tw;//体温
  25 + private String xy;//血压
  26 + private String mb;//脉搏
  27 + private String xybhd;//血氧饱和度
  28 + private String gd;//宫底
  29 + private String cxl;//出血量
  30 + private String pgjc;//膀胱检查
  31 + private String hyqk;//会阴情况
  32 + private String nz;//内诊
  33 + private String fz;//附注
  34 + private String qm;//签名
  35 +
  36 + public Records(){
  37 +
  38 + }
  39 +
  40 + @Override
  41 + public PostpartumRecords.Records convertToDataModel() {
  42 + PostpartumRecords.Records record= new PostpartumRecords.Records();
  43 + record.setId(id);
  44 + record.setDate(date);
  45 + record.setTw(tw);
  46 + record.setXy(xy);
  47 + record.setMb(mb);
  48 + record.setXybhd(xybhd);
  49 + record.setGd(gd);
  50 + record.setCxl(cxl);
  51 + record.setPgjc(pgjc);
  52 + record.setHyqk(hyqk);
  53 + record.setNz(nz);
  54 + record.setFz(fz);
  55 + record.setQm(qm);
  56 +
  57 + return record;
  58 + }
  59 +
  60 + public String getId() {
  61 + return id;
  62 + }
  63 +
  64 + public void setId(String id) {
  65 + this.id = id;
  66 + }
  67 +
  68 + public String getDate() {
  69 + return date;
  70 + }
  71 +
  72 + public void setDate(String date) {
  73 + this.date = date;
  74 + }
  75 +
  76 + public String getTw() {
  77 + return tw;
  78 + }
  79 +
  80 + public void setTw(String tw) {
  81 + this.tw = tw;
  82 + }
  83 +
  84 + public String getXy() {
  85 + return xy;
  86 + }
  87 +
  88 + public void setXy(String xy) {
  89 + this.xy = xy;
  90 + }
  91 +
  92 + public String getMb() {
  93 + return mb;
  94 + }
  95 +
  96 + public void setMb(String mb) {
  97 + this.mb = mb;
  98 + }
  99 +
  100 + public String getXybhd() {
  101 + return xybhd;
  102 + }
  103 +
  104 + public void setXybhd(String xybhd) {
  105 + this.xybhd = xybhd;
  106 + }
  107 +
  108 + public String getGd() {
  109 + return gd;
  110 + }
  111 +
  112 + public void setGd(String gd) {
  113 + this.gd = gd;
  114 + }
  115 +
  116 + public String getCxl() {
  117 + return cxl;
  118 + }
  119 +
  120 + public void setCxl(String cxl) {
  121 + this.cxl = cxl;
  122 + }
  123 +
  124 + public String getPgjc() {
  125 + return pgjc;
  126 + }
  127 +
  128 + public void setPgjc(String pgjc) {
  129 + this.pgjc = pgjc;
  130 + }
  131 +
  132 + public String getHyqk() {
  133 + return hyqk;
  134 + }
  135 +
  136 + public void setHyqk(String hyqk) {
  137 + this.hyqk = hyqk;
  138 + }
  139 +
  140 + public String getNz() {
  141 + return nz;
  142 + }
  143 +
  144 + public void setNz(String nz) {
  145 + this.nz = nz;
  146 + }
  147 +
  148 + public String getFz() {
  149 + return fz;
  150 + }
  151 +
  152 + public void setFz(String fz) {
  153 + this.fz = fz;
  154 + }
  155 +
  156 + public String getQm() {
  157 + return qm;
  158 + }
  159 +
  160 + public void setQm(String qm) {
  161 + this.qm = qm;
  162 + }
  163 + }*/
  164 +
  165 + public String getId() {
  166 + return id;
  167 + }
  168 +
  169 + public void setId(String id) {
  170 + this.id = id;
  171 + }
  172 +
  173 + public String getOneCxl() {
  174 + return oneCxl;
  175 + }
  176 +
  177 + public void setOneCxl(String oneCxl) {
  178 + this.oneCxl = oneCxl;
  179 + }
  180 +
  181 + public String getTwoCxl() {
  182 + return twoCxl;
  183 + }
  184 +
  185 + public void setTwoCxl(String twoCxl) {
  186 + this.twoCxl = twoCxl;
  187 + }
  188 +
  189 + /*public List<Records> getRecords() {
  190 + return records;
  191 + }
  192 +
  193 + public void setRecords(List<Records> records) {
  194 + this.records = records;
  195 + }*/
  196 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java View file @ 32b9ecb
... ... @@ -17,7 +17,7 @@
17 17 private String maternalDeliverId;//分娩ID
18 18 private String created;//创建时间
19 19 private String modified;//修改时间
20   - private List<Records> records;//记录列表
  20 + //private List<Records> records;//记录列表
21 21 private String hospitalId;//医院ID
22 22 private String doctor;//操作医生
23 23 private String name;//孕妇姓名
... ... @@ -25,7 +25,7 @@
25 25 private String oneCxl;//一小时出血量
26 26 private String twoCxl;//两小时出血量
27 27  
28   - public class Records implements Serializable {
  28 + /*public class Records implements Serializable {
29 29 private String id;
30 30 private String date;//时间
31 31 private String tw;//体温
... ... @@ -163,7 +163,7 @@
163 163 public void setQm(String qm) {
164 164 this.qm = qm;
165 165 }
166   - }
  166 + }*/
167 167  
168 168 public String getId() {
169 169 return id;
170 170  
... ... @@ -205,13 +205,13 @@
205 205 this.modified = modified;
206 206 }
207 207  
208   - public List<Records> getRecords() {
  208 + /*public List<Records> getRecords() {
209 209 return records;
210 210 }
211 211  
212 212 public void setRecords(List<Records> records) {
213 213 this.records = records;
214   - }
  214 + }*/
215 215  
216 216 public String getHospitalId() {
217 217 return hospitalId;