Commit a88621174df1af8339e49cf84827553cdf89c7e7
1 parent
189376ff06
Exists in
master
and in
1 other branch
产筛问题
Showing 3 changed files with 36 additions and 31 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
View file @
a886211
| ... | ... | @@ -281,11 +281,11 @@ |
| 281 | 281 | private Integer smoking; |
| 282 | 282 | //I-型糖尿病 <空>:未知;0:无;1:有 |
| 283 | 283 | private Integer insulin; |
| 284 | - private Integer hC; | |
| 284 | + private Double hC; | |
| 285 | 285 | //B超孕天 如果7W2D,此处应填5 |
| 286 | 286 | private Integer mannualEntry; |
| 287 | 287 | //如果有NT,则必须有 |
| 288 | - private Integer nT; | |
| 288 | + private Double nT; | |
| 289 | 289 | //送检单位编号 30个字符以内,只能包含字母,数字,下划线和短杠 |
| 290 | 290 | private String responsibleCode; |
| 291 | 291 | //既往T21 <空>:未知;0:无;1:有 |
| 292 | 292 | |
| 293 | 293 | |
| ... | ... | @@ -445,14 +445,22 @@ |
| 445 | 445 | this.insulin = insulin; |
| 446 | 446 | } |
| 447 | 447 | |
| 448 | - public Integer gethC() { | |
| 448 | + public Double gethC() { | |
| 449 | 449 | return hC; |
| 450 | 450 | } |
| 451 | 451 | |
| 452 | - public void sethC(Integer hC) { | |
| 452 | + public void sethC(Double hC) { | |
| 453 | 453 | this.hC = hC; |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | + public Double getnT() { | |
| 457 | + return nT; | |
| 458 | + } | |
| 459 | + | |
| 460 | + public void setnT(Double nT) { | |
| 461 | + this.nT = nT; | |
| 462 | + } | |
| 463 | + | |
| 456 | 464 | public Integer getMannualEntry() { |
| 457 | 465 | return mannualEntry; |
| 458 | 466 | } |
| ... | ... | @@ -461,13 +469,6 @@ |
| 461 | 469 | this.mannualEntry = mannualEntry; |
| 462 | 470 | } |
| 463 | 471 | |
| 464 | - public Integer getnT() { | |
| 465 | - return nT; | |
| 466 | - } | |
| 467 | - | |
| 468 | - public void setnT(Integer nT) { | |
| 469 | - this.nT = nT; | |
| 470 | - } | |
| 471 | 472 | |
| 472 | 473 | public String getResponsibleCode() { |
| 473 | 474 | return responsibleCode; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
View file @
a886211
| ... | ... | @@ -275,11 +275,11 @@ |
| 275 | 275 | private Integer smoking; |
| 276 | 276 | //I-型糖尿病 <空>:未知;0:无;1:有 |
| 277 | 277 | private Integer insulin; |
| 278 | - private Integer hC; | |
| 278 | + private Double hC; | |
| 279 | 279 | //B超孕天 如果7W2D,此处应填5 |
| 280 | 280 | private Integer mannualEntry; |
| 281 | 281 | //如果有NT,则必须有 |
| 282 | - private Integer nT; | |
| 282 | + private Double nT; | |
| 283 | 283 | //送检单位编号 30个字符以内,只能包含字母,数字,下划线和短杠 |
| 284 | 284 | private String responsibleCode; |
| 285 | 285 | //既往T21 <空>:未知;0:无;1:有 |
| 286 | 286 | |
| 287 | 287 | |
| ... | ... | @@ -431,14 +431,22 @@ |
| 431 | 431 | this.insulin = insulin; |
| 432 | 432 | } |
| 433 | 433 | |
| 434 | - public Integer gethC() { | |
| 434 | + public Double gethC() { | |
| 435 | 435 | return hC; |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | - public void sethC(Integer hC) { | |
| 438 | + public void sethC(Double hC) { | |
| 439 | 439 | this.hC = hC; |
| 440 | 440 | } |
| 441 | 441 | |
| 442 | + public Double getnT() { | |
| 443 | + return nT; | |
| 444 | + } | |
| 445 | + | |
| 446 | + public void setnT(Double nT) { | |
| 447 | + this.nT = nT; | |
| 448 | + } | |
| 449 | + | |
| 442 | 450 | public Integer getMannualEntry() { |
| 443 | 451 | return mannualEntry; |
| 444 | 452 | } |
| 445 | 453 | |
| ... | ... | @@ -447,13 +455,7 @@ |
| 447 | 455 | this.mannualEntry = mannualEntry; |
| 448 | 456 | } |
| 449 | 457 | |
| 450 | - public Integer getnT() { | |
| 451 | - return nT; | |
| 452 | - } | |
| 453 | 458 | |
| 454 | - public void setnT(Integer nT) { | |
| 455 | - this.nT = nT; | |
| 456 | - } | |
| 457 | 459 | |
| 458 | 460 | public String getResponsibleCode() { |
| 459 | 461 | return responsibleCode; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java
View file @
a886211
| ... | ... | @@ -35,7 +35,7 @@ |
| 35 | 35 | private String crl; |
| 36 | 36 | //B超信息 bpd |
| 37 | 37 | private String bpd; |
| 38 | - private Integer hC; | |
| 38 | + private Double hC; | |
| 39 | 39 | //B超孕天 如果7W2D,此处应填51 |
| 40 | 40 | private Integer mannualEntry; |
| 41 | 41 | //I-型糖尿病 <空>:未知;0:无;1:有 |
| ... | ... | @@ -45,7 +45,7 @@ |
| 45 | 45 | //孕妇编号 30个字符以内,只能包含字母,数字,下划线和短杠 |
| 46 | 46 | private String patientID; |
| 47 | 47 | //如果有NT,则必须有 |
| 48 | - private Integer nT; | |
| 48 | + private Double nT; | |
| 49 | 49 | //送检单位编号 30个字符以内,只能包含字母,数字,下划线和短杠 |
| 50 | 50 | private String responsibleCode; |
| 51 | 51 | //既往T21 <空>:未知;0:无;1:有 |
| 52 | 52 | |
| 53 | 53 | |
| ... | ... | @@ -217,14 +217,22 @@ |
| 217 | 217 | this.noOfFetuses = noOfFetuses; |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - public Integer gethC() { | |
| 220 | + public Double gethC() { | |
| 221 | 221 | return hC; |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | - public void sethC(Integer hC) { | |
| 224 | + public void sethC(Double hC) { | |
| 225 | 225 | this.hC = hC; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | + public Double getnT() { | |
| 229 | + return nT; | |
| 230 | + } | |
| 231 | + | |
| 232 | + public void setnT(Double nT) { | |
| 233 | + this.nT = nT; | |
| 234 | + } | |
| 235 | + | |
| 228 | 236 | public Integer getMannualEntry() { |
| 229 | 237 | return mannualEntry; |
| 230 | 238 | } |
| 231 | 239 | |
| ... | ... | @@ -257,13 +265,7 @@ |
| 257 | 265 | this.patientID = patientID; |
| 258 | 266 | } |
| 259 | 267 | |
| 260 | - public Integer getnT() { | |
| 261 | - return nT; | |
| 262 | - } | |
| 263 | 268 | |
| 264 | - public void setnT(Integer nT) { | |
| 265 | - this.nT = nT; | |
| 266 | - } | |
| 267 | 269 | |
| 268 | 270 | public String getResponsibleCode() { |
| 269 | 271 | return responsibleCode; |