Commit 45f5b58474490a5aff14da03d4b33f86d60f7fdd
1 parent
2695f82cb1
Exists in
master
and in
6 other branches
诸城复诊
Showing 1 changed file with 46 additions and 37 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
View file @
45f5b58
... | ... | @@ -266,17 +266,17 @@ |
266 | 266 | private String configItemId; |
267 | 267 | |
268 | 268 | //甲状腺功能 添加 |
269 | - private Double fTthree; | |
269 | + private String fTthree; | |
270 | 270 | |
271 | - private Double fTFour; | |
271 | + private String fTFour; | |
272 | 272 | |
273 | - private Double tSH; | |
273 | + private String tSH; | |
274 | 274 | |
275 | - private Double tpaAb; | |
275 | + private String tpaAb; | |
276 | 276 | |
277 | - private Double tgAb; | |
277 | + private String tgAb; | |
278 | 278 | |
279 | - private Double aTSHR; | |
279 | + private String aTSHR; | |
280 | 280 | |
281 | 281 | /** |
282 | 282 | * 腹围 1-未测 2-拒测 |
283 | 283 | |
284 | 284 | |
285 | 285 | |
286 | 286 | |
287 | 287 | |
288 | 288 | |
289 | 289 | |
290 | 290 | |
291 | 291 | |
292 | 292 | |
293 | 293 | |
... | ... | @@ -393,51 +393,51 @@ |
393 | 393 | this.ndbSelectOtherVal = ndbSelectOtherVal; |
394 | 394 | } |
395 | 395 | |
396 | - public double getfTthree() { | |
396 | + public String getfTthree() { | |
397 | 397 | return fTthree; |
398 | 398 | } |
399 | 399 | |
400 | - public void setfTthree(double fTthree) { | |
400 | + public void setfTthree(String fTthree) { | |
401 | 401 | this.fTthree = fTthree; |
402 | 402 | } |
403 | 403 | |
404 | - public double getfTFour() { | |
404 | + public String getfTFour() { | |
405 | 405 | return fTFour; |
406 | 406 | } |
407 | 407 | |
408 | - public void setfTFour(double fTFour) { | |
408 | + public void setfTFour(String fTFour) { | |
409 | 409 | this.fTFour = fTFour; |
410 | 410 | } |
411 | 411 | |
412 | - public double gettSH() { | |
412 | + public String gettSH() { | |
413 | 413 | return tSH; |
414 | 414 | } |
415 | 415 | |
416 | - public void settSH(double tSH) { | |
416 | + public void settSH(String tSH) { | |
417 | 417 | this.tSH = tSH; |
418 | 418 | } |
419 | 419 | |
420 | - public double getTpaAb() { | |
420 | + public String getTpaAb() { | |
421 | 421 | return tpaAb; |
422 | 422 | } |
423 | 423 | |
424 | - public void setTpaAb(double tpaAb) { | |
424 | + public void setTpaAb(String tpaAb) { | |
425 | 425 | this.tpaAb = tpaAb; |
426 | 426 | } |
427 | 427 | |
428 | - public double getTgAb() { | |
428 | + public String getTgAb() { | |
429 | 429 | return tgAb; |
430 | 430 | } |
431 | 431 | |
432 | - public void setTgAb(double tgAb) { | |
432 | + public void setTgAb(String tgAb) { | |
433 | 433 | this.tgAb = tgAb; |
434 | 434 | } |
435 | 435 | |
436 | - public double getaTSHR() { | |
436 | + public String getaTSHR() { | |
437 | 437 | return aTSHR; |
438 | 438 | } |
439 | 439 | |
440 | - public void setaTSHR(double aTSHR) { | |
440 | + public void setaTSHR(String aTSHR) { | |
441 | 441 | this.aTSHR = aTSHR; |
442 | 442 | } |
443 | 443 | |
... | ... | @@ -1207,25 +1207,34 @@ |
1207 | 1207 | examinationModel.setHivkt(hivkt); |
1208 | 1208 | examinationModel.setSupplement(supplement); |
1209 | 1209 | examinationModel.setConfigItemId(configItemId); |
1210 | - java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); | |
1211 | - if (null != fTFour) { | |
1212 | - examinationModel.setfTFour(df.format(fTFour)); | |
1213 | - } | |
1214 | - if (null != fTthree) { | |
1215 | - examinationModel.setfTthree(df.format(fTthree)); | |
1216 | - } | |
1217 | - if (null != tSH) { | |
1218 | - examinationModel.settSH(df.format(tSH)); | |
1219 | - } | |
1220 | - if (null != tpaAb) { | |
1221 | - examinationModel.setTpaAb(df.format(tpaAb)); | |
1222 | - } | |
1223 | - if (null != aTSHR) { | |
1224 | - examinationModel.setaTSHR(df.format(aTSHR)); | |
1225 | - } | |
1226 | - if (null != tgAb) { | |
1227 | - examinationModel.setTgAb(df.format(tgAb)); | |
1228 | - } | |
1210 | +// java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); | |
1211 | +// if (null != fTFour) { | |
1212 | +// examinationModel.setfTFour(df.format(fTFour)); | |
1213 | +// } | |
1214 | +// if (null != fTthree) { | |
1215 | +// examinationModel.setfTthree(df.format(fTthree)); | |
1216 | +// } | |
1217 | +// if (null != tSH) { | |
1218 | +// examinationModel.settSH(df.format(tSH)); | |
1219 | +// } | |
1220 | +// if (null != tpaAb) { | |
1221 | +// examinationModel.setTpaAb(df.format(tpaAb)); | |
1222 | +// } | |
1223 | +// if (null != aTSHR) { | |
1224 | +// examinationModel.setaTSHR(df.format(aTSHR)); | |
1225 | +// } | |
1226 | +// if (null != tgAb) { | |
1227 | +// examinationModel.setTgAb(df.format(tgAb)); | |
1228 | +// } | |
1229 | + | |
1230 | + | |
1231 | + examinationModel.setfTFour(fTFour); | |
1232 | + examinationModel.setfTthree(fTthree); | |
1233 | + examinationModel.settSH(tSH); | |
1234 | + examinationModel.setTpaAb(tpaAb); | |
1235 | + examinationModel.setaTSHR(aTSHR); | |
1236 | + examinationModel.setTgAb(tgAb); | |
1237 | + | |
1229 | 1238 | |
1230 | 1239 | if (StringUtils.isNotEmpty(fuweiSelect)) { |
1231 | 1240 | examinationModel.setFuweiSelect(fuweiSelect); |