Commit 9873b031fc109ade6dc36148ec9c22954bb424d7
1 parent
da45ca1ccc
Exists in
master
and in
6 other branches
诸城初诊
Showing 1 changed file with 48 additions and 40 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
9873b03
| ... | ... | @@ -377,17 +377,17 @@ |
| 377 | 377 | |
| 378 | 378 | |
| 379 | 379 | //甲状腺功能 添加 |
| 380 | - private Double fTthree; | |
| 380 | + private String fTthree; | |
| 381 | 381 | |
| 382 | - private Double fTFour; | |
| 382 | + private String fTFour; | |
| 383 | 383 | |
| 384 | - private Double tSH; | |
| 384 | + private String tSH; | |
| 385 | 385 | |
| 386 | - private Double tpaAb; | |
| 386 | + private String tpaAb; | |
| 387 | 387 | |
| 388 | - private Double tgAb; | |
| 388 | + private String tgAb; | |
| 389 | 389 | |
| 390 | - private Double aTSHR; | |
| 390 | + private String aTSHR; | |
| 391 | 391 | |
| 392 | 392 | //妊娠方法 |
| 393 | 393 | private Integer pregnancyMethod; |
| 394 | 394 | |
| 395 | 395 | |
| 396 | 396 | |
| 397 | 397 | |
| 398 | 398 | |
| 399 | 399 | |
| 400 | 400 | |
| 401 | 401 | |
| 402 | 402 | |
| 403 | 403 | |
| 404 | 404 | |
| ... | ... | @@ -503,51 +503,51 @@ |
| 503 | 503 | this.edemaSelect = edemaSelect; |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - public Double getfTthree() { | |
| 506 | + public String getfTthree() { | |
| 507 | 507 | return fTthree; |
| 508 | 508 | } |
| 509 | 509 | |
| 510 | - public void setfTthree(Double fTthree) { | |
| 510 | + public void setfTthree(String fTthree) { | |
| 511 | 511 | this.fTthree = fTthree; |
| 512 | 512 | } |
| 513 | 513 | |
| 514 | - public Double getfTFour() { | |
| 514 | + public String getfTFour() { | |
| 515 | 515 | return fTFour; |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | - public void setfTFour(Double fTFour) { | |
| 518 | + public void setfTFour(String fTFour) { | |
| 519 | 519 | this.fTFour = fTFour; |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | - public Double gettSH() { | |
| 522 | + public String gettSH() { | |
| 523 | 523 | return tSH; |
| 524 | 524 | } |
| 525 | 525 | |
| 526 | - public void settSH(Double tSH) { | |
| 526 | + public void settSH(String tSH) { | |
| 527 | 527 | this.tSH = tSH; |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - public Double getTpaAb() { | |
| 530 | + public String getTpaAb() { | |
| 531 | 531 | return tpaAb; |
| 532 | 532 | } |
| 533 | 533 | |
| 534 | - public void setTpaAb(Double tpaAb) { | |
| 534 | + public void setTpaAb(String tpaAb) { | |
| 535 | 535 | this.tpaAb = tpaAb; |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | - public Double getTgAb() { | |
| 538 | + public String getTgAb() { | |
| 539 | 539 | return tgAb; |
| 540 | 540 | } |
| 541 | 541 | |
| 542 | - public void setTgAb(Double tgAb) { | |
| 542 | + public void setTgAb(String tgAb) { | |
| 543 | 543 | this.tgAb = tgAb; |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | - public Double getaTSHR() { | |
| 546 | + public String getaTSHR() { | |
| 547 | 547 | return aTSHR; |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | - public void setaTSHR(Double aTSHR) { | |
| 550 | + public void setaTSHR(String aTSHR) { | |
| 551 | 551 | this.aTSHR = aTSHR; |
| 552 | 552 | } |
| 553 | 553 | |
| ... | ... | @@ -2098,28 +2098,36 @@ |
| 2098 | 2098 | antExChuModel.setFuwei(fuwei); |
| 2099 | 2099 | antExChuModel.setTireNumber1(tireNumber1); |
| 2100 | 2100 | antExChuModel.setPlacentas(placentas); |
| 2101 | - /** | |
| 2102 | - * 产检项 | |
| 2103 | - * */ | |
| 2104 | - java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); | |
| 2105 | - if (null != fTFour) { | |
| 2106 | - antExChuModel.setfTFour(df.format(fTFour)); | |
| 2107 | - } | |
| 2108 | - if (null != fTthree) { | |
| 2109 | - antExChuModel.setfTthree(df.format(fTthree)); | |
| 2110 | - } | |
| 2111 | - if (null != tSH) { | |
| 2112 | - antExChuModel.settSH(df.format(tSH)); | |
| 2113 | - } | |
| 2114 | - if (null != tpaAb) { | |
| 2115 | - antExChuModel.setTpaAb(df.format(tpaAb)); | |
| 2116 | - } | |
| 2117 | - if (null != aTSHR) { | |
| 2118 | - antExChuModel.setaTSHR(df.format(aTSHR)); | |
| 2119 | - } | |
| 2120 | - if (null != tgAb) { | |
| 2121 | - antExChuModel.setTgAb(df.format(tgAb)); | |
| 2122 | - } | |
| 2101 | +// /** | |
| 2102 | +// * 产检项 | |
| 2103 | +// * */ | |
| 2104 | +// java.text.DecimalFormat df = new java.text.DecimalFormat("#.##"); | |
| 2105 | +// if (null != fTFour) { | |
| 2106 | +// antExChuModel.setfTFour(df.format(fTFour)); | |
| 2107 | +// } | |
| 2108 | +// if (null != fTthree) { | |
| 2109 | +// antExChuModel.setfTthree(df.format(fTthree)); | |
| 2110 | +// } | |
| 2111 | +// if (null != tSH) { | |
| 2112 | +// antExChuModel.settSH(df.format(tSH)); | |
| 2113 | +// } | |
| 2114 | +// if (null != tpaAb) { | |
| 2115 | +// antExChuModel.setTpaAb(df.format(tpaAb)); | |
| 2116 | +// } | |
| 2117 | +// if (null != aTSHR) { | |
| 2118 | +// antExChuModel.setaTSHR(df.format(aTSHR)); | |
| 2119 | +// } | |
| 2120 | +// if (null != tgAb) { | |
| 2121 | +// antExChuModel.setTgAb(df.format(tgAb)); | |
| 2122 | +// } | |
| 2123 | + | |
| 2124 | + antExChuModel.setfTFour(fTFour); | |
| 2125 | + antExChuModel.setfTthree(fTthree); | |
| 2126 | + antExChuModel.settSH(tSH); | |
| 2127 | + antExChuModel.setTpaAb(tpaAb); | |
| 2128 | + antExChuModel.setaTSHR(aTSHR); | |
| 2129 | + antExChuModel.setTgAb(tgAb); | |
| 2130 | + | |
| 2123 | 2131 | |
| 2124 | 2132 | if (null != bp) { |
| 2125 | 2133 | antExChuModel.setBp(JsonUtil.obj2JsonString(bp)); |