Commit 848539419be28afc3c30d2771350271ba6580fe5
1 parent
f730bb2aea
Exists in
master
and in
6 other branches
荣成男女婚检建档字段增加
Showing 3 changed files with 117 additions and 117 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
View file @
8485394
| ... | ... | @@ -123,14 +123,14 @@ |
| 123 | 123 | private String publishName; |
| 124 | 124 | |
| 125 | 125 | /***********荣成新增男性建档字段**********/ |
| 126 | - private Integer isOrNotrdl;//是否进食肉、蛋类(0:否;1:是;默认为1) | |
| 127 | - private Integer isOrNotSc;//是否厌食蔬菜(0:否;1:是;默认为0) | |
| 128 | - private Integer isOrNotSr;//是否有食用生肉嗜好(0:否;1:是;默认为0) | |
| 129 | - private Integer isOrNotXy;//是否吸烟(0:否;1:是;默认为0) | |
| 126 | + private String isOrNotrdl;//是否进食肉、蛋类(0:否;1:是;默认为1) | |
| 127 | + private String isOrNotSc;//是否厌食蔬菜(0:否;1:是;默认为0) | |
| 128 | + private String isOrNotSr;//是否有食用生肉嗜好(0:否;1:是;默认为0) | |
| 129 | + private String isOrNotXy;//是否吸烟(0:否;1:是;默认为0) | |
| 130 | 130 | private String jizhi;//每天抽烟几支 |
| 131 | - private Integer isOrNotBdXy;//是否存在被动吸烟(0:否;1:偶尔;2:经常;默认为0) | |
| 131 | + private String isOrNotBdXy;//是否存在被动吸烟(0:否;1:偶尔;2:经常;默认为0) | |
| 132 | 132 | private String bdXyHours;//平均每天被动吸烟分钟数 |
| 133 | - private Integer isOrNotYj;//是否饮酒(0:否;1:偶尔;2:经常;默认为0) | |
| 133 | + private String isOrNotYj;//是否饮酒(0:否;1:偶尔;2:经常;默认为0) | |
| 134 | 134 | private String yjMl;//每天饮酒量 |
| 135 | 135 | /***********荣成新增男性建档字段**********/ |
| 136 | 136 | |
| 137 | 137 | |
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | |
| 141 | 141 | |
| 142 | 142 | |
| 143 | 143 | |
| 144 | 144 | |
| 145 | 145 | |
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | |
| ... | ... | @@ -138,56 +138,56 @@ |
| 138 | 138 | /***********荣成新增女性建档字段**********/ |
| 139 | 139 | private String ccnl;//初潮年龄 |
| 140 | 140 | private Date mcyj;//末次月经时间 |
| 141 | - private Integer isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
| 141 | + private String isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
| 142 | 142 | private String jq;//经期 |
| 143 | 143 | private String zq;//周期 |
| 144 | - private Integer yjl;//月经量(0:多;1:中;2:少;默认为1) | |
| 145 | - private Integer tj;//痛经(0:无;1:轻;2:重;默认为1) | |
| 146 | - private Integer isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
| 144 | + private String yjl;//月经量(0:多;1:中;2:少;默认为1) | |
| 145 | + private String tj;//痛经(0:无;1:轻;2:重;默认为1) | |
| 146 | + private String isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
| 147 | 147 | private String hycs;//怀孕次数 |
| 148 | 148 | private String hccs;//活产次数 |
| 149 | 149 | private String zyhc;//足月活产次数 |
| 150 | 150 | private String zccs;//早产次数 |
| 151 | - private Integer isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
| 151 | + private String isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
| 152 | 152 | private String stsc;//死胎死产次数 |
| 153 | 153 | private String zylc;//自然流产次数 |
| 154 | 154 | private String rglc;//人工流产次数 |
| 155 | - private Integer isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
| 155 | + private String isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
| 156 | 156 | private String bz;//病种 |
| 157 | 157 | private String xxqk;//详细情况 |
| 158 | 158 | private String xyzns;//现有子女数 |
| 159 | - private Integer znstzk;//子女身体状况(0:健康;1:疾病) | |
| 159 | + private String znstzk;//子女身体状况(0:健康;1:疾病) | |
| 160 | 160 | private String jtbm;//注明具体病名 |
| 161 | 161 | |
| 162 | - public Integer getIsOrNotrdl() { | |
| 162 | + public String getIsOrNotrdl() { | |
| 163 | 163 | return isOrNotrdl; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - public void setIsOrNotrdl(Integer isOrNotrdl) { | |
| 166 | + public void setIsOrNotrdl(String isOrNotrdl) { | |
| 167 | 167 | this.isOrNotrdl = isOrNotrdl; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public Integer getIsOrNotSc() { | |
| 170 | + public String getIsOrNotSc() { | |
| 171 | 171 | return isOrNotSc; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public void setIsOrNotSc(Integer isOrNotSc) { | |
| 174 | + public void setIsOrNotSc(String isOrNotSc) { | |
| 175 | 175 | this.isOrNotSc = isOrNotSc; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - public Integer getIsOrNotSr() { | |
| 178 | + public String getIsOrNotSr() { | |
| 179 | 179 | return isOrNotSr; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - public void setIsOrNotSr(Integer isOrNotSr) { | |
| 182 | + public void setIsOrNotSr(String isOrNotSr) { | |
| 183 | 183 | this.isOrNotSr = isOrNotSr; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - public Integer getIsOrNotXy() { | |
| 186 | + public String getIsOrNotXy() { | |
| 187 | 187 | return isOrNotXy; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - public void setIsOrNotXy(Integer isOrNotXy) { | |
| 190 | + public void setIsOrNotXy(String isOrNotXy) { | |
| 191 | 191 | this.isOrNotXy = isOrNotXy; |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
| ... | ... | @@ -199,11 +199,11 @@ |
| 199 | 199 | this.jizhi = jizhi; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - public Integer getIsOrNotBdXy() { | |
| 202 | + public String getIsOrNotBdXy() { | |
| 203 | 203 | return isOrNotBdXy; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | - public void setIsOrNotBdXy(Integer isOrNotBdXy) { | |
| 206 | + public void setIsOrNotBdXy(String isOrNotBdXy) { | |
| 207 | 207 | this.isOrNotBdXy = isOrNotBdXy; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | |
| ... | ... | @@ -215,11 +215,11 @@ |
| 215 | 215 | this.bdXyHours = bdXyHours; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - public Integer getIsOrNotYj() { | |
| 218 | + public String getIsOrNotYj() { | |
| 219 | 219 | return isOrNotYj; |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | - public void setIsOrNotYj(Integer isOrNotYj) { | |
| 222 | + public void setIsOrNotYj(String isOrNotYj) { | |
| 223 | 223 | this.isOrNotYj = isOrNotYj; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | |
| ... | ... | @@ -247,11 +247,11 @@ |
| 247 | 247 | this.mcyj = mcyj; |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | - public Integer getIsOrNotGl() { | |
| 250 | + public String getIsOrNotGl() { | |
| 251 | 251 | return isOrNotGl; |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | - public void setIsOrNotGl(Integer isOrNotGl) { | |
| 254 | + public void setIsOrNotGl(String isOrNotGl) { | |
| 255 | 255 | this.isOrNotGl = isOrNotGl; |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | |
| 259 | 259 | |
| 260 | 260 | |
| 261 | 261 | |
| 262 | 262 | |
| ... | ... | @@ -271,27 +271,27 @@ |
| 271 | 271 | this.zq = zq; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - public Integer getYjl() { | |
| 274 | + public String getYjl() { | |
| 275 | 275 | return yjl; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - public void setYjl(Integer yjl) { | |
| 278 | + public void setYjl(String yjl) { | |
| 279 | 279 | this.yjl = yjl; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - public Integer getTj() { | |
| 282 | + public String getTj() { | |
| 283 | 283 | return tj; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - public void setTj(Integer tj) { | |
| 286 | + public void setTj(String tj) { | |
| 287 | 287 | this.tj = tj; |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - public Integer getIsOrNotHy() { | |
| 290 | + public String getIsOrNotHy() { | |
| 291 | 291 | return isOrNotHy; |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - public void setIsOrNotHy(Integer isOrNotHy) { | |
| 294 | + public void setIsOrNotHy(String isOrNotHy) { | |
| 295 | 295 | this.isOrNotHy = isOrNotHy; |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | |
| ... | ... | @@ -327,11 +327,11 @@ |
| 327 | 327 | this.zccs = zccs; |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | - public Integer getIsOrNotRsjj() { | |
| 330 | + public String getIsOrNotRsjj() { | |
| 331 | 331 | return isOrNotRsjj; |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - public void setIsOrNotRsjj(Integer isOrNotRsjj) { | |
| 334 | + public void setIsOrNotRsjj(String isOrNotRsjj) { | |
| 335 | 335 | this.isOrNotRsjj = isOrNotRsjj; |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | |
| ... | ... | @@ -359,11 +359,11 @@ |
| 359 | 359 | this.rglc = rglc; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - public Integer getIsOrNotQxe() { | |
| 362 | + public String getIsOrNotQxe() { | |
| 363 | 363 | return isOrNotQxe; |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - public void setIsOrNotQxe(Integer isOrNotQxe) { | |
| 366 | + public void setIsOrNotQxe(String isOrNotQxe) { | |
| 367 | 367 | this.isOrNotQxe = isOrNotQxe; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | |
| ... | ... | @@ -391,11 +391,11 @@ |
| 391 | 391 | this.xyzns = xyzns; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | - public Integer getZnstzk() { | |
| 394 | + public String getZnstzk() { | |
| 395 | 395 | return znstzk; |
| 396 | 396 | } |
| 397 | 397 | |
| 398 | - public void setZnstzk(Integer znstzk) { | |
| 398 | + public void setZnstzk(String znstzk) { | |
| 399 | 399 | this.znstzk = znstzk; |
| 400 | 400 | } |
| 401 | 401 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
View file @
8485394
| ... | ... | @@ -111,14 +111,14 @@ |
| 111 | 111 | private String buildDay; |
| 112 | 112 | |
| 113 | 113 | /***********荣成新增男性建档字段**********/ |
| 114 | - private Integer isOrNotrdl;//是否进食肉、蛋类(0:否;1:是;默认为1) | |
| 115 | - private Integer isOrNotSc;//是否厌食蔬菜(0:否;1:是;默认为0) | |
| 116 | - private Integer isOrNotSr;//是否有食用生肉嗜好(0:否;1:是;默认为0) | |
| 117 | - private Integer isOrNotXy;//是否吸烟(0:否;1:是;默认为0) | |
| 114 | + private String isOrNotrdl;//是否进食肉、蛋类(0:否;1:是;默认为1) | |
| 115 | + private String isOrNotSc;//是否厌食蔬菜(0:否;1:是;默认为0) | |
| 116 | + private String isOrNotSr;//是否有食用生肉嗜好(0:否;1:是;默认为0) | |
| 117 | + private String isOrNotXy;//是否吸烟(0:否;1:是;默认为0) | |
| 118 | 118 | private String jizhi;//每天抽烟几支 |
| 119 | - private Integer isOrNotBdXy;//是否存在被动吸烟(0:否;1:偶尔;2:经常;默认为0) | |
| 119 | + private String isOrNotBdXy;//是否存在被动吸烟(0:否;1:偶尔;2:经常;默认为0) | |
| 120 | 120 | private String bdXyHours;//平均每天被动吸烟分钟数 |
| 121 | - private Integer isOrNotYj;//是否饮酒(0:否;1:偶尔;2:经常;默认为0) | |
| 121 | + private String isOrNotYj;//是否饮酒(0:否;1:偶尔;2:经常;默认为0) | |
| 122 | 122 | private String yjMl;//每天饮酒量 |
| 123 | 123 | /***********荣成新增男性建档字段**********/ |
| 124 | 124 | |
| 125 | 125 | |
| 126 | 126 | |
| 127 | 127 | |
| 128 | 128 | |
| ... | ... | @@ -126,25 +126,25 @@ |
| 126 | 126 | /***********荣成新增女性建档字段**********/ |
| 127 | 127 | private String ccnl;//初潮年龄 |
| 128 | 128 | private String mcyj;//末次月经时间 |
| 129 | - private Integer isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
| 129 | + private String isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
| 130 | 130 | private String jq;//经期 |
| 131 | 131 | private String zq;//周期 |
| 132 | - private Integer yjl;//月经量(0:多;1:中;2:少;默认为1) | |
| 133 | - private Integer tj;//痛经(0:无;1:轻;2:重;默认为1) | |
| 134 | - private Integer isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
| 132 | + private String yjl;//月经量(0:多;1:中;2:少;默认为1) | |
| 133 | + private String tj;//痛经(0:无;1:轻;2:重;默认为1) | |
| 134 | + private String isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
| 135 | 135 | private String hycs;//怀孕次数 |
| 136 | 136 | private String hccs;//活产次数 |
| 137 | 137 | private String zyhc;//足月活产次数 |
| 138 | 138 | private String zccs;//早产次数 |
| 139 | - private Integer isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
| 139 | + private String isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
| 140 | 140 | private String stsc;//死胎死产次数 |
| 141 | 141 | private String zylc;//自然流产次数 |
| 142 | 142 | private String rglc;//人工流产次数 |
| 143 | - private Integer isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
| 143 | + private String isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
| 144 | 144 | private String bz;//病种 |
| 145 | 145 | private String xxqk;//详细情况 |
| 146 | 146 | private String xyzns;//现有子女数 |
| 147 | - private Integer znstzk;//子女身体状况(0:健康;1:疾病) | |
| 147 | + private String znstzk;//子女身体状况(0:健康;1:疾病) | |
| 148 | 148 | private String jtbm;//注明具体病名 |
| 149 | 149 | /***********荣成新增女性建档字段**********/ |
| 150 | 150 | |
| 151 | 151 | |
| 152 | 152 | |
| 153 | 153 | |
| 154 | 154 | |
| 155 | 155 | |
| 156 | 156 | |
| 157 | 157 | |
| ... | ... | @@ -554,35 +554,35 @@ |
| 554 | 554 | this.buildDay = buildDay; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | - public Integer getIsOrNotrdl() { | |
| 557 | + public String getIsOrNotrdl() { | |
| 558 | 558 | return isOrNotrdl; |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - public void setIsOrNotrdl(Integer isOrNotrdl) { | |
| 561 | + public void setIsOrNotrdl(String isOrNotrdl) { | |
| 562 | 562 | this.isOrNotrdl = isOrNotrdl; |
| 563 | 563 | } |
| 564 | 564 | |
| 565 | - public Integer getIsOrNotSc() { | |
| 565 | + public String getIsOrNotSc() { | |
| 566 | 566 | return isOrNotSc; |
| 567 | 567 | } |
| 568 | 568 | |
| 569 | - public void setIsOrNotSc(Integer isOrNotSc) { | |
| 569 | + public void setIsOrNotSc(String isOrNotSc) { | |
| 570 | 570 | this.isOrNotSc = isOrNotSc; |
| 571 | 571 | } |
| 572 | 572 | |
| 573 | - public Integer getIsOrNotSr() { | |
| 573 | + public String getIsOrNotSr() { | |
| 574 | 574 | return isOrNotSr; |
| 575 | 575 | } |
| 576 | 576 | |
| 577 | - public void setIsOrNotSr(Integer isOrNotSr) { | |
| 577 | + public void setIsOrNotSr(String isOrNotSr) { | |
| 578 | 578 | this.isOrNotSr = isOrNotSr; |
| 579 | 579 | } |
| 580 | 580 | |
| 581 | - public Integer getIsOrNotXy() { | |
| 581 | + public String getIsOrNotXy() { | |
| 582 | 582 | return isOrNotXy; |
| 583 | 583 | } |
| 584 | 584 | |
| 585 | - public void setIsOrNotXy(Integer isOrNotXy) { | |
| 585 | + public void setIsOrNotXy(String isOrNotXy) { | |
| 586 | 586 | this.isOrNotXy = isOrNotXy; |
| 587 | 587 | } |
| 588 | 588 | |
| 589 | 589 | |
| ... | ... | @@ -594,11 +594,11 @@ |
| 594 | 594 | this.jizhi = jizhi; |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - public Integer getIsOrNotBdXy() { | |
| 597 | + public String getIsOrNotBdXy() { | |
| 598 | 598 | return isOrNotBdXy; |
| 599 | 599 | } |
| 600 | 600 | |
| 601 | - public void setIsOrNotBdXy(Integer isOrNotBdXy) { | |
| 601 | + public void setIsOrNotBdXy(String isOrNotBdXy) { | |
| 602 | 602 | this.isOrNotBdXy = isOrNotBdXy; |
| 603 | 603 | } |
| 604 | 604 | |
| 605 | 605 | |
| ... | ... | @@ -610,11 +610,11 @@ |
| 610 | 610 | this.bdXyHours = bdXyHours; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | - public Integer getIsOrNotYj() { | |
| 613 | + public String getIsOrNotYj() { | |
| 614 | 614 | return isOrNotYj; |
| 615 | 615 | } |
| 616 | 616 | |
| 617 | - public void setIsOrNotYj(Integer isOrNotYj) { | |
| 617 | + public void setIsOrNotYj(String isOrNotYj) { | |
| 618 | 618 | this.isOrNotYj = isOrNotYj; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | |
| ... | ... | @@ -642,11 +642,11 @@ |
| 642 | 642 | this.mcyj = mcyj; |
| 643 | 643 | } |
| 644 | 644 | |
| 645 | - public Integer getIsOrNotGl() { | |
| 645 | + public String getIsOrNotGl() { | |
| 646 | 646 | return isOrNotGl; |
| 647 | 647 | } |
| 648 | 648 | |
| 649 | - public void setIsOrNotGl(Integer isOrNotGl) { | |
| 649 | + public void setIsOrNotGl(String isOrNotGl) { | |
| 650 | 650 | this.isOrNotGl = isOrNotGl; |
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | |
| 654 | 654 | |
| 655 | 655 | |
| 656 | 656 | |
| 657 | 657 | |
| ... | ... | @@ -666,27 +666,27 @@ |
| 666 | 666 | this.zq = zq; |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | - public Integer getYjl() { | |
| 669 | + public String getYjl() { | |
| 670 | 670 | return yjl; |
| 671 | 671 | } |
| 672 | 672 | |
| 673 | - public void setYjl(Integer yjl) { | |
| 673 | + public void setYjl(String yjl) { | |
| 674 | 674 | this.yjl = yjl; |
| 675 | 675 | } |
| 676 | 676 | |
| 677 | - public Integer getTj() { | |
| 677 | + public String getTj() { | |
| 678 | 678 | return tj; |
| 679 | 679 | } |
| 680 | 680 | |
| 681 | - public void setTj(Integer tj) { | |
| 681 | + public void setTj(String tj) { | |
| 682 | 682 | this.tj = tj; |
| 683 | 683 | } |
| 684 | 684 | |
| 685 | - public Integer getIsOrNotHy() { | |
| 685 | + public String getIsOrNotHy() { | |
| 686 | 686 | return isOrNotHy; |
| 687 | 687 | } |
| 688 | 688 | |
| 689 | - public void setIsOrNotHy(Integer isOrNotHy) { | |
| 689 | + public void setIsOrNotHy(String isOrNotHy) { | |
| 690 | 690 | this.isOrNotHy = isOrNotHy; |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | |
| ... | ... | @@ -722,11 +722,11 @@ |
| 722 | 722 | this.zccs = zccs; |
| 723 | 723 | } |
| 724 | 724 | |
| 725 | - public Integer getIsOrNotRsjj() { | |
| 725 | + public String getIsOrNotRsjj() { | |
| 726 | 726 | return isOrNotRsjj; |
| 727 | 727 | } |
| 728 | 728 | |
| 729 | - public void setIsOrNotRsjj(Integer isOrNotRsjj) { | |
| 729 | + public void setIsOrNotRsjj(String isOrNotRsjj) { | |
| 730 | 730 | this.isOrNotRsjj = isOrNotRsjj; |
| 731 | 731 | } |
| 732 | 732 | |
| 733 | 733 | |
| ... | ... | @@ -754,11 +754,11 @@ |
| 754 | 754 | this.rglc = rglc; |
| 755 | 755 | } |
| 756 | 756 | |
| 757 | - public Integer getIsOrNotQxe() { | |
| 757 | + public String getIsOrNotQxe() { | |
| 758 | 758 | return isOrNotQxe; |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | - public void setIsOrNotQxe(Integer isOrNotQxe) { | |
| 761 | + public void setIsOrNotQxe(String isOrNotQxe) { | |
| 762 | 762 | this.isOrNotQxe = isOrNotQxe; |
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | |
| ... | ... | @@ -786,11 +786,11 @@ |
| 786 | 786 | this.xyzns = xyzns; |
| 787 | 787 | } |
| 788 | 788 | |
| 789 | - public Integer getZnstzk() { | |
| 789 | + public String getZnstzk() { | |
| 790 | 790 | return znstzk; |
| 791 | 791 | } |
| 792 | 792 | |
| 793 | - public void setZnstzk(Integer znstzk) { | |
| 793 | + public void setZnstzk(String znstzk) { | |
| 794 | 794 | this.znstzk = znstzk; |
| 795 | 795 | } |
| 796 | 796 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
View file @
8485394
| ... | ... | @@ -107,14 +107,14 @@ |
| 107 | 107 | private Date modified; |
| 108 | 108 | |
| 109 | 109 | /***********荣成新增男性建档字段**********/ |
| 110 | - private Integer isOrNotrdl;//是否进食肉、蛋类(0:否;1:是;默认为1) | |
| 111 | - private Integer isOrNotSc;//是否厌食蔬菜(0:否;1:是;默认为0) | |
| 112 | - private Integer isOrNotSr;//是否有食用生肉嗜好(0:否;1:是;默认为0) | |
| 113 | - private Integer isOrNotXy;//是否吸烟(0:否;1:是;默认为0) | |
| 110 | + private String isOrNotrdl;//是否进食肉、蛋类(0:否;1:是;默认为1) | |
| 111 | + private String isOrNotSc;//是否厌食蔬菜(0:否;1:是;默认为0) | |
| 112 | + private String isOrNotSr;//是否有食用生肉嗜好(0:否;1:是;默认为0) | |
| 113 | + private String isOrNotXy;//是否吸烟(0:否;1:是;默认为0) | |
| 114 | 114 | private String jizhi;//每天抽烟几支 |
| 115 | - private Integer isOrNotBdXy;//是否存在被动吸烟(0:否;1:偶尔;2:经常;默认为0) | |
| 115 | + private String isOrNotBdXy;//是否存在被动吸烟(0:否;1:偶尔;2:经常;默认为0) | |
| 116 | 116 | private String bdXyHours;//平均每天被动吸烟分钟数 |
| 117 | - private Integer isOrNotYj;//是否饮酒(0:否;1:偶尔;2:经常;默认为0) | |
| 117 | + private String isOrNotYj;//是否饮酒(0:否;1:偶尔;2:经常;默认为0) | |
| 118 | 118 | private String yjMl;//每天饮酒量 |
| 119 | 119 | /***********荣成新增男性建档字段**********/ |
| 120 | 120 | |
| 121 | 121 | |
| 122 | 122 | |
| 123 | 123 | |
| 124 | 124 | |
| 125 | 125 | |
| 126 | 126 | |
| 127 | 127 | |
| 128 | 128 | |
| 129 | 129 | |
| 130 | 130 | |
| 131 | 131 | |
| 132 | 132 | |
| ... | ... | @@ -122,56 +122,56 @@ |
| 122 | 122 | /***********荣成新增女性建档字段**********/ |
| 123 | 123 | private String ccnl;//初潮年龄 |
| 124 | 124 | private String mcyj;//末次月经时间 |
| 125 | - private Integer isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
| 125 | + private String isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
| 126 | 126 | private String jq;//经期 |
| 127 | 127 | private String zq;//周期 |
| 128 | - private Integer yjl;//月经量(0:多;1:中;2:少;默认为1) | |
| 129 | - private Integer tj;//痛经(0:无;1:轻;2:重;默认为1) | |
| 130 | - private Integer isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
| 128 | + private String yjl;//月经量(0:多;1:中;2:少;默认为1) | |
| 129 | + private String tj;//痛经(0:无;1:轻;2:重;默认为1) | |
| 130 | + private String isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
| 131 | 131 | private String hycs;//怀孕次数 |
| 132 | 132 | private String hccs;//活产次数 |
| 133 | 133 | private String zyhc;//足月活产次数 |
| 134 | 134 | private String zccs;//早产次数 |
| 135 | - private Integer isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
| 135 | + private String isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
| 136 | 136 | private String stsc;//死胎死产次数 |
| 137 | 137 | private String zylc;//自然流产次数 |
| 138 | 138 | private String rglc;//人工流产次数 |
| 139 | - private Integer isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
| 139 | + private String isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
| 140 | 140 | private String bz;//病种 |
| 141 | 141 | private String xxqk;//详细情况 |
| 142 | 142 | private String xyzns;//现有子女数 |
| 143 | - private Integer znstzk;//子女身体状况(0:健康;1:疾病) | |
| 143 | + private String znstzk;//子女身体状况(0:健康;1:疾病) | |
| 144 | 144 | private String jtbm;//注明具体病名 |
| 145 | 145 | |
| 146 | - public Integer getIsOrNotrdl() { | |
| 146 | + public String getIsOrNotrdl() { | |
| 147 | 147 | return isOrNotrdl; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - public void setIsOrNotrdl(Integer isOrNotrdl) { | |
| 150 | + public void setIsOrNotrdl(String isOrNotrdl) { | |
| 151 | 151 | this.isOrNotrdl = isOrNotrdl; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - public Integer getIsOrNotSc() { | |
| 154 | + public String getIsOrNotSc() { | |
| 155 | 155 | return isOrNotSc; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - public void setIsOrNotSc(Integer isOrNotSc) { | |
| 158 | + public void setIsOrNotSc(String isOrNotSc) { | |
| 159 | 159 | this.isOrNotSc = isOrNotSc; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public Integer getIsOrNotSr() { | |
| 162 | + public String getIsOrNotSr() { | |
| 163 | 163 | return isOrNotSr; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - public void setIsOrNotSr(Integer isOrNotSr) { | |
| 166 | + public void setIsOrNotSr(String isOrNotSr) { | |
| 167 | 167 | this.isOrNotSr = isOrNotSr; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public Integer getIsOrNotXy() { | |
| 170 | + public String getIsOrNotXy() { | |
| 171 | 171 | return isOrNotXy; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public void setIsOrNotXy(Integer isOrNotXy) { | |
| 174 | + public void setIsOrNotXy(String isOrNotXy) { | |
| 175 | 175 | this.isOrNotXy = isOrNotXy; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | |
| ... | ... | @@ -183,11 +183,11 @@ |
| 183 | 183 | this.jizhi = jizhi; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - public Integer getIsOrNotBdXy() { | |
| 186 | + public String getIsOrNotBdXy() { | |
| 187 | 187 | return isOrNotBdXy; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - public void setIsOrNotBdXy(Integer isOrNotBdXy) { | |
| 190 | + public void setIsOrNotBdXy(String isOrNotBdXy) { | |
| 191 | 191 | this.isOrNotBdXy = isOrNotBdXy; |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
| ... | ... | @@ -199,11 +199,11 @@ |
| 199 | 199 | this.bdXyHours = bdXyHours; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - public Integer getIsOrNotYj() { | |
| 202 | + public String getIsOrNotYj() { | |
| 203 | 203 | return isOrNotYj; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | - public void setIsOrNotYj(Integer isOrNotYj) { | |
| 206 | + public void setIsOrNotYj(String isOrNotYj) { | |
| 207 | 207 | this.isOrNotYj = isOrNotYj; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | |
| ... | ... | @@ -231,11 +231,11 @@ |
| 231 | 231 | this.mcyj = mcyj; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - public Integer getIsOrNotGl() { | |
| 234 | + public String getIsOrNotGl() { | |
| 235 | 235 | return isOrNotGl; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - public void setIsOrNotGl(Integer isOrNotGl) { | |
| 238 | + public void setIsOrNotGl(String isOrNotGl) { | |
| 239 | 239 | this.isOrNotGl = isOrNotGl; |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | |
| 243 | 243 | |
| 244 | 244 | |
| 245 | 245 | |
| 246 | 246 | |
| ... | ... | @@ -255,27 +255,27 @@ |
| 255 | 255 | this.zq = zq; |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | - public Integer getYjl() { | |
| 258 | + public String getYjl() { | |
| 259 | 259 | return yjl; |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | - public void setYjl(Integer yjl) { | |
| 262 | + public void setYjl(String yjl) { | |
| 263 | 263 | this.yjl = yjl; |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - public Integer getTj() { | |
| 266 | + public String getTj() { | |
| 267 | 267 | return tj; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - public void setTj(Integer tj) { | |
| 270 | + public void setTj(String tj) { | |
| 271 | 271 | this.tj = tj; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - public Integer getIsOrNotHy() { | |
| 274 | + public String getIsOrNotHy() { | |
| 275 | 275 | return isOrNotHy; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - public void setIsOrNotHy(Integer isOrNotHy) { | |
| 278 | + public void setIsOrNotHy(String isOrNotHy) { | |
| 279 | 279 | this.isOrNotHy = isOrNotHy; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | |
| ... | ... | @@ -311,11 +311,11 @@ |
| 311 | 311 | this.zccs = zccs; |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | - public Integer getIsOrNotRsjj() { | |
| 314 | + public String getIsOrNotRsjj() { | |
| 315 | 315 | return isOrNotRsjj; |
| 316 | 316 | } |
| 317 | 317 | |
| 318 | - public void setIsOrNotRsjj(Integer isOrNotRsjj) { | |
| 318 | + public void setIsOrNotRsjj(String isOrNotRsjj) { | |
| 319 | 319 | this.isOrNotRsjj = isOrNotRsjj; |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | |
| ... | ... | @@ -343,11 +343,11 @@ |
| 343 | 343 | this.rglc = rglc; |
| 344 | 344 | } |
| 345 | 345 | |
| 346 | - public Integer getIsOrNotQxe() { | |
| 346 | + public String getIsOrNotQxe() { | |
| 347 | 347 | return isOrNotQxe; |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | - public void setIsOrNotQxe(Integer isOrNotQxe) { | |
| 350 | + public void setIsOrNotQxe(String isOrNotQxe) { | |
| 351 | 351 | this.isOrNotQxe = isOrNotQxe; |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | |
| ... | ... | @@ -375,11 +375,11 @@ |
| 375 | 375 | this.xyzns = xyzns; |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | - public Integer getZnstzk() { | |
| 378 | + public String getZnstzk() { | |
| 379 | 379 | return znstzk; |
| 380 | 380 | } |
| 381 | 381 | |
| 382 | - public void setZnstzk(Integer znstzk) { | |
| 382 | + public void setZnstzk(String znstzk) { | |
| 383 | 383 | this.znstzk = znstzk; |
| 384 | 384 | } |
| 385 | 385 |