Commit 78590dc4474f07423a1e9cdd603f04092e211895
1 parent
d078be5539
Exists in
master
and in
6 other branches
增加字段
Showing 5 changed files with 55 additions and 55 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
View file @
78590dc
... | ... | @@ -127,9 +127,9 @@ |
127 | 127 | //产捡筛查 |
128 | 128 | private String cjsc; |
129 | 129 | //胎儿系统排畸b吵 |
130 | - private String text; | |
130 | + private String textpjbc; | |
131 | 131 | //75gODTT |
132 | - private String s75god; | |
132 | + private String s75gdgtt; | |
133 | 133 | //甲状腺功能 |
134 | 134 | private String jzxgn; |
135 | 135 | |
136 | 136 | |
137 | 137 | |
138 | 138 | |
... | ... | @@ -161,20 +161,20 @@ |
161 | 161 | this.cjsc = cjsc; |
162 | 162 | } |
163 | 163 | |
164 | - public String getText() { | |
165 | - return text; | |
164 | + public String getTextpjbc() { | |
165 | + return textpjbc; | |
166 | 166 | } |
167 | 167 | |
168 | - public void setText(String text) { | |
169 | - this.text = text; | |
168 | + public void setTextpjbc(String textpjbc) { | |
169 | + this.textpjbc = textpjbc; | |
170 | 170 | } |
171 | 171 | |
172 | - public String getS75god() { | |
173 | - return s75god; | |
172 | + public String getS75gdgtt() { | |
173 | + return s75gdgtt; | |
174 | 174 | } |
175 | 175 | |
176 | - public void setS75god(String s75god) { | |
177 | - this.s75god = s75god; | |
176 | + public void setS75gdgtt(String s75gdgtt) { | |
177 | + this.s75gdgtt = s75gdgtt; | |
178 | 178 | } |
179 | 179 | |
180 | 180 | public String getJzxgn() { |
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
View file @
78590dc
... | ... | @@ -121,9 +121,9 @@ |
121 | 121 | //产捡筛查 |
122 | 122 | private String cjsc; |
123 | 123 | //胎儿系统排畸b吵 |
124 | - private String text; | |
124 | + private String textpjbc; | |
125 | 125 | //75gODTT |
126 | - private String s75god; | |
126 | + private String s75gdgtt; | |
127 | 127 | //甲状腺功能 |
128 | 128 | private String jzxgn; |
129 | 129 | |
130 | 130 | |
131 | 131 | |
132 | 132 | |
... | ... | @@ -151,21 +151,20 @@ |
151 | 151 | this.cjsc = cjsc; |
152 | 152 | } |
153 | 153 | |
154 | - | |
155 | - public String getText() { | |
156 | - return text; | |
154 | + public String getTextpjbc() { | |
155 | + return textpjbc; | |
157 | 156 | } |
158 | 157 | |
159 | - public void setText(String text) { | |
160 | - this.text = text; | |
158 | + public void setTextpjbc(String textpjbc) { | |
159 | + this.textpjbc = textpjbc; | |
161 | 160 | } |
162 | 161 | |
163 | - public String getS75god() { | |
164 | - return s75god; | |
162 | + public String getS75gdgtt() { | |
163 | + return s75gdgtt; | |
165 | 164 | } |
166 | 165 | |
167 | - public void setS75god(String s75god) { | |
168 | - this.s75god = s75god; | |
166 | + public void setS75gdgtt(String s75gdgtt) { | |
167 | + this.s75gdgtt = s75gdgtt; | |
169 | 168 | } |
170 | 169 | |
171 | 170 | public String getJzxgn() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
78590dc
... | ... | @@ -2150,16 +2150,16 @@ |
2150 | 2150 | String zybd=model.getZyqbd(); |
2151 | 2151 | String ntjc= model.getNtjc(); |
2152 | 2152 | String cqsc= model.getCjsc(); |
2153 | - String text= model.getText(); | |
2154 | - String s75god= model.getS75god(); | |
2153 | + String text= model.getTextpjbc(); | |
2154 | + String s75gdgtt= model.getS75gdgtt(); | |
2155 | 2155 | String jzxgn= model.getJzxgn(); |
2156 | 2156 | if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| |
2157 | - StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){ | |
2157 | + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75gdgtt)||StringUtils.isNotEmpty(jzxgn)){ | |
2158 | 2158 | m.put("zybd",zybd); |
2159 | 2159 | m.put("ntjc",ntjc); |
2160 | 2160 | m.put("cjsc",cqsc); |
2161 | - m.put("text",text); | |
2162 | - m.put("s75god",s75god); | |
2161 | + m.put("textpjbc",text); | |
2162 | + m.put("s75gdgtt",s75gdgtt); | |
2163 | 2163 | m.put("jzxgn",jzxgn); |
2164 | 2164 | break; |
2165 | 2165 | } |
2166 | 2166 | |
2167 | 2167 | |
... | ... | @@ -2175,16 +2175,16 @@ |
2175 | 2175 | String zybd=chu.getZyqbd(); |
2176 | 2176 | String ntjc= chu.getNtjc(); |
2177 | 2177 | String cqsc= chu.getCjsc(); |
2178 | - String text= chu.getText(); | |
2179 | - String s75god= chu.getS75god(); | |
2178 | + String text= chu.getTextpjbc(); | |
2179 | + String s75gdgtt= chu.getS75gdgtt(); | |
2180 | 2180 | String jzxgn= chu.getJzxgn(); |
2181 | 2181 | if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| |
2182 | - StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){ | |
2182 | + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75gdgtt)||StringUtils.isNotEmpty(jzxgn)){ | |
2183 | 2183 | m.put("zybd",zybd); |
2184 | 2184 | m.put("ntjc",ntjc); |
2185 | 2185 | m.put("cjsc",cqsc); |
2186 | - m.put("text",text); | |
2187 | - m.put("s75god",s75god); | |
2186 | + m.put("textpjbc",text); | |
2187 | + m.put("s75gdgtt",s75gdgtt); | |
2188 | 2188 | m.put("jzxgn",jzxgn); |
2189 | 2189 | break; |
2190 | 2190 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
View file @
78590dc
... | ... | @@ -105,9 +105,9 @@ |
105 | 105 | //产捡筛查 |
106 | 106 | private String cjsc; |
107 | 107 | //胎儿系统排畸b吵 |
108 | - private String text; | |
108 | + private String textpjbc; | |
109 | 109 | //75gODTT |
110 | - private String s75god; | |
110 | + private String s75gdgtt; | |
111 | 111 | //甲状腺功能 |
112 | 112 | private String jzxgn; |
113 | 113 | |
114 | 114 | |
115 | 115 | |
116 | 116 | |
... | ... | @@ -136,20 +136,21 @@ |
136 | 136 | } |
137 | 137 | |
138 | 138 | |
139 | - public String getText() { | |
140 | - return text; | |
139 | + public String getTextpjbc() { | |
140 | + return textpjbc; | |
141 | 141 | } |
142 | 142 | |
143 | - public void setText(String text) { | |
144 | - this.text = text; | |
143 | + public void setTextpjbc(String textpjbc) { | |
144 | + this.textpjbc = textpjbc; | |
145 | 145 | } |
146 | 146 | |
147 | - public String getS75god() { | |
148 | - return s75god; | |
147 | + | |
148 | + public String getS75gdgtt() { | |
149 | + return s75gdgtt; | |
149 | 150 | } |
150 | 151 | |
151 | - public void setS75god(String s75god) { | |
152 | - this.s75god = s75god; | |
152 | + public void setS75gdgtt(String s75gdgtt) { | |
153 | + this.s75gdgtt = s75gdgtt; | |
153 | 154 | } |
154 | 155 | |
155 | 156 | public String getJzxgn() { |
... | ... | @@ -258,8 +259,8 @@ |
258 | 259 | examinationModel.setZyqbd(zyqbdjc); |
259 | 260 | examinationModel.setNtjc(ntjc); |
260 | 261 | examinationModel.setCjsc(cjsc); |
261 | - examinationModel.setText(text); | |
262 | - examinationModel.setS75god(s75god); | |
262 | + examinationModel.setTextpjbc(textpjbc); | |
263 | + examinationModel.setS75gdgtt(s75gdgtt); | |
263 | 264 | examinationModel.setJzxgn(jzxgn); |
264 | 265 | examinationModel.setId(id); |
265 | 266 | examinationModel.setDiagnosisOther(diagnosisOther); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
78590dc
... | ... | @@ -205,9 +205,9 @@ |
205 | 205 | //产前筛查 |
206 | 206 | private String cjsc; |
207 | 207 | //胎儿系统排畸b吵 |
208 | - private String text; | |
208 | + private String textpjbc; | |
209 | 209 | //75gODTT |
210 | - private String s75god; | |
210 | + private String s75gdgtt; | |
211 | 211 | //甲状腺功能 |
212 | 212 | private String jzxgn; |
213 | 213 | |
214 | 214 | |
215 | 215 | |
216 | 216 | |
... | ... | @@ -235,20 +235,20 @@ |
235 | 235 | this.cjsc = cjsc; |
236 | 236 | } |
237 | 237 | |
238 | - public String getText() { | |
239 | - return text; | |
238 | + public String getTextpjbc() { | |
239 | + return textpjbc; | |
240 | 240 | } |
241 | 241 | |
242 | - public void setText(String text) { | |
243 | - this.text = text; | |
242 | + public void setTextpjbc(String textpjbc) { | |
243 | + this.textpjbc = textpjbc; | |
244 | 244 | } |
245 | 245 | |
246 | - public String getS75god() { | |
247 | - return s75god; | |
246 | + public String getS75gdgtt() { | |
247 | + return s75gdgtt; | |
248 | 248 | } |
249 | 249 | |
250 | - public void setS75god(String s75god) { | |
251 | - this.s75god = s75god; | |
250 | + public void setS75gdgtt(String s75gdgtt) { | |
251 | + this.s75gdgtt = s75gdgtt; | |
252 | 252 | } |
253 | 253 | |
254 | 254 | public String getJzxgn() { |
... | ... | @@ -1059,8 +1059,8 @@ |
1059 | 1059 | antExChuModel.setZyqbd(zyqbdjc); |
1060 | 1060 | antExChuModel.setNtjc(ntjc); |
1061 | 1061 | antExChuModel.setCjsc(cjsc); |
1062 | - antExChuModel.setText(text); | |
1063 | - antExChuModel.setS75god(s75god); | |
1062 | + antExChuModel.setTextpjbc(textpjbc); | |
1063 | + antExChuModel.setS75gdgtt(s75gdgtt); | |
1064 | 1064 | antExChuModel.setJzxgn(jzxgn); |
1065 | 1065 | antExChuModel.setBarCode(barCode); |
1066 | 1066 | antExChuModel.setId(id); |