fangcheng / regional-platform

Download as
Browse Code »

Commit 9be1d2127a1dfc9c21510208c202cad102b78660

Authored by jiangjiazhi
1 parent 3cb5b274f5
Exists in master and in 1 other branch nobuildprocess

增加是否通知

Showing 1 changed file with 32 additions and 30 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java View file @ 9be1d21
... ... @@ -36,13 +36,13 @@
36 36 //末次月经
37 37 private String lastMenses;
38 38 //产前诊断结果
39   - private Integer cqResult;
  39 + private Integer diaresult;
40 40  
41   - private String cqResultText;
  41 + private String diaresultText;
42 42 //妊娠结局
43   - private Integer renShenResult;
  43 + private Integer pregnancyOutcome;
44 44  
45   - private String renShenResultText;
  45 + private String pregnancyOutcomeText;
46 46 //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊
47 47 private Integer status;
48 48  
49 49  
... ... @@ -53,10 +53,22 @@
53 53 //录入人员
54 54 private String publishName;
55 55  
56   - public String getCqResultText() {
57   - return cqResultText;
  56 + public Integer getDiaresult() {
  57 + return diaresult;
58 58 }
59 59  
  60 + public void setDiaresult(Integer diaresult) {
  61 + this.diaresult = diaresult;
  62 + }
  63 +
  64 + public String getDiaresultText() {
  65 + return diaresultText;
  66 + }
  67 +
  68 + public void setDiaresultText(String diaresultText) {
  69 + this.diaresultText = diaresultText;
  70 + }
  71 +
60 72 public String getId() {
61 73 return id;
62 74 }
63 75  
64 76  
65 77  
... ... @@ -73,18 +85,22 @@
73 85 this.parentId = parentId;
74 86 }
75 87  
76   - public void setCqResultText(String cqResultText) {
77   - this.cqResultText = cqResultText;
  88 + public Integer getPregnancyOutcome() {
  89 + return pregnancyOutcome;
78 90 }
79 91  
80   - public String getRenShenResultText() {
81   - return renShenResultText;
  92 + public void setPregnancyOutcome(Integer pregnancyOutcome) {
  93 + this.pregnancyOutcome = pregnancyOutcome;
82 94 }
83 95  
84   - public void setRenShenResultText(String renShenResultText) {
85   - this.renShenResultText = renShenResultText;
  96 + public String getPregnancyOutcomeText() {
  97 + return pregnancyOutcomeText;
86 98 }
87 99  
  100 + public void setPregnancyOutcomeText(String pregnancyOutcomeText) {
  101 + this.pregnancyOutcomeText = pregnancyOutcomeText;
  102 + }
  103 +
88 104 public Integer getAge() {
89 105 return age;
90 106 }
91 107  
... ... @@ -93,14 +109,7 @@
93 109 this.age = age;
94 110 }
95 111  
96   - public Integer getCqResult() {
97   - return cqResult;
98   - }
99 112  
100   - public void setCqResult(Integer cqResult) {
101   - this.cqResult = cqResult;
102   - }
103   -
104 113 public String getDiaTime() {
105 114 return diaTime;
106 115 }
107 116  
... ... @@ -165,14 +174,7 @@
165 174 this.remarks = remarks;
166 175 }
167 176  
168   - public Integer getRenShenResult() {
169   - return renShenResult;
170   - }
171 177  
172   - public void setRenShenResult(Integer renShenResult) {
173   - this.renShenResult = renShenResult;
174   - }
175   -
176 178 public List getRiskFactor() {
177 179 return riskFactor;
178 180 }
179 181  
180 182  
181 183  
... ... @@ -239,13 +241,13 @@
239 241 private String publishName;*/
240 242 setId(sieveModel.getId());
241 243 setParentId(sieveModel.getParentId());
242   - setCqResult(sieveModel.getCqResult());
  244 + setDiaresult(sieveModel.getCqResult());
243 245 if(null!=sieveModel.getCqResult()){
244   - setCqResultText(ChanQResultEnums.getTitle(sieveModel.getCqResult()));
  246 + setDiaresultText(ChanQResultEnums.getTitle(sieveModel.getCqResult()));
245 247 }
246   - setRenShenResult(sieveModel.getRenShenResult());
  248 + setPregnancyOutcome(sieveModel.getRenShenResult());
247 249 if(null!=sieveModel.getRenShenResult()){
248   - setRenShenResultText(RenShenJieJuEnums.getTitle(sieveModel.getRenShenResult()));
  250 + setPregnancyOutcomeText(RenShenJieJuEnums.getTitle(sieveModel.getRenShenResult()));
249 251 }
250 252 setStatus(sieveModel.getStatus());
251 253 setDiaTime(sieveModel.getDiaTime());