jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0f8d8c58c2fe9aac1a80291e5675c36fbf7240d6

Authored by jiangjiazhi
1 parent 5ab6cf18fd
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

产妇增加字段

Showing 1 changed file with 24 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 0f8d8c5
... ... @@ -3,7 +3,6 @@
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
4 4 import com.lyms.platform.common.utils.JsonUtil;
5 5 import com.lyms.platform.pojo.AntenatalExaminationModel;
6   -import com.lyms.platform.pojo.PuerperaModel;
7 6  
8 7 import java.util.List;
9 8 import java.util.Map;
... ... @@ -13,7 +12,7 @@
13 12 * <p>
14 13 * Created by Administrator on 2016/6/15 0015.
15 14 */
16   -public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
  15 +public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
17 16  
18 17 private String id;
19 18  
... ... @@ -25,7 +24,7 @@
25 24 //重量
26 25 private Double weight;
27 26 //血压
28   - private String bp;
  27 + private java.util.Map bp;
29 28 //宫高
30 29 private String gongGao;
31 30 //腹围
... ... @@ -53,7 +52,7 @@
53 52 // 高危评分
54 53 private String riskScore;
55 54 //其他高危
56   - private String otherRisk;
  55 + private Map otherRisk;
57 56 //诊断
58 57 private String diagnosis;
59 58 //分类
... ... @@ -79,7 +78,12 @@
79 78 setAbdominalCircumference(destModel.getAbdominalCircumference());
80 79 setbChao(destModel.getbChao());
81 80 setBloodSugar(destModel.getBloodSugar());
82   - setBp(destModel.getBp());
  81 + try {
  82 +
  83 + setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
  84 + } catch (Exception e) {
  85 +
  86 + }
83 87 setChiefComplaint(destModel.getChiefComplaint());
84 88 setCheckDate(destModel.getCheckDate());
85 89 setCheckDoctor(destModel.getCheckDoctor());
86 90  
... ... @@ -87,13 +91,25 @@
87 91 setGuide(destModel.getGuide());
88 92 setHemoglobin(destModel.getHemoglobin());
89 93 setId(destModel.getId());
90   - setOtherRisk(destModel.getOtherRisk());
  94 + try {
  95 + setOtherRisk(JsonUtil.str2Obj(destModel.getOtherRisk(), Map.class));
  96 + } catch (Exception e) {
  97 + }
  98 +
91 99 setTireNumber(destModel.getTireNumber());
92 100 setTireData(destModel.getTireData());
93 101 setType(destModel.getType());
94 102 return this;
95 103 }
96 104  
  105 + public Map getBp() {
  106 + return bp;
  107 + }
  108 +
  109 + public void setBp(Map bp) {
  110 + this.bp = bp;
  111 + }
  112 +
97 113 public String getAbdominalCircumference() {
98 114 return abdominalCircumference;
99 115 }
100 116  
... ... @@ -118,14 +134,7 @@
118 134 this.bloodSugar = bloodSugar;
119 135 }
120 136  
121   - public String getBp() {
122   - return bp;
123   - }
124 137  
125   - public void setBp(String bp) {
126   - this.bp = bp;
127   - }
128   -
129 138 public String getCheckDate() {
130 139 return checkDate;
131 140 }
132 141  
... ... @@ -214,11 +223,11 @@
214 223 this.nextCheckDate = nextCheckDate;
215 224 }
216 225  
217   - public String getOtherRisk() {
  226 + public Map getOtherRisk() {
218 227 return otherRisk;
219 228 }
220 229  
221   - public void setOtherRisk(String otherRisk) {
  230 + public void setOtherRisk(Map otherRisk) {
222 231 this.otherRisk = otherRisk;
223 232 }
224 233