Commit 8d70e7286a3d00b4842b80385638013a5b2d430f
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 4 changed files
- platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
View file @
8d70e72
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 | private String spouseCertificateTypeId; |
| 50 | 50 | //配偶证件号 |
| 51 | 51 | private String spouseCertificateNum; |
| 52 | - //血缘关系(1: 有 2: 无) | |
| 52 | + //血缘关系(1: 有 2: 无) (0:无,1:表,2:堂,3:其他) | |
| 53 | 53 | private Integer isBloodshed; |
| 54 | 54 | //具体血缘关系 |
| 55 | 55 | private String bloodshed; |
| ... | ... | @@ -344,6 +344,140 @@ |
| 344 | 344 | private String zhiDaoYiJian; |
| 345 | 345 | //婚检医生 |
| 346 | 346 | private String hunJianDoctor; |
| 347 | + | |
| 348 | + | |
| 349 | + /***********新增(gxk)***********/ | |
| 350 | + //既往病史 | |
| 351 | + private String maritalBingHistory; | |
| 352 | + //手术史(1:有 2:无 3:其他) | |
| 353 | + private String surgeryHistory; | |
| 354 | + //现病史 | |
| 355 | + private String nowBingHistory; | |
| 356 | + //足月 | |
| 357 | + private Integer zuyue; | |
| 358 | + //早产 | |
| 359 | + private Integer zaochan; | |
| 360 | + //流产 | |
| 361 | + private Integer liuchan; | |
| 362 | + //家庭史 | |
| 363 | + private String familyHistory; | |
| 364 | + //智力(1:异常 2:正常) | |
| 365 | + private Integer intelligence; | |
| 366 | + //皮肤毛发(1:异常 2:正常) | |
| 367 | + private Integer pfmf; | |
| 368 | + //五官(1: 异常 2: 正常) | |
| 369 | + private Integer wuguan; | |
| 370 | + //四肢脊柱 | |
| 371 | + private String siZhiJiZhu; | |
| 372 | + //体积左 | |
| 373 | + private String volumeLeft; | |
| 374 | + //体积右 | |
| 375 | + private String volumeRight; | |
| 376 | + | |
| 377 | + | |
| 378 | + public String getVolumeLeft() { | |
| 379 | + return volumeLeft; | |
| 380 | + } | |
| 381 | + | |
| 382 | + public void setVolumeLeft(String volumeLeft) { | |
| 383 | + this.volumeLeft = volumeLeft; | |
| 384 | + } | |
| 385 | + | |
| 386 | + public String getVolumeRight() { | |
| 387 | + return volumeRight; | |
| 388 | + } | |
| 389 | + | |
| 390 | + public void setVolumeRight(String volumeRight) { | |
| 391 | + this.volumeRight = volumeRight; | |
| 392 | + } | |
| 393 | + | |
| 394 | + public String getSiZhiJiZhu() { | |
| 395 | + return siZhiJiZhu; | |
| 396 | + } | |
| 397 | + | |
| 398 | + public void setSiZhiJiZhu(String siZhiJiZhu) { | |
| 399 | + this.siZhiJiZhu = siZhiJiZhu; | |
| 400 | + } | |
| 401 | + | |
| 402 | + public Integer getWuguan() { | |
| 403 | + return wuguan; | |
| 404 | + } | |
| 405 | + | |
| 406 | + public void setWuguan(Integer wuguan) { | |
| 407 | + this.wuguan = wuguan; | |
| 408 | + } | |
| 409 | + | |
| 410 | + public Integer getPfmf() { | |
| 411 | + return pfmf; | |
| 412 | + } | |
| 413 | + | |
| 414 | + public void setPfmf(Integer pfmf) { | |
| 415 | + this.pfmf = pfmf; | |
| 416 | + } | |
| 417 | + | |
| 418 | + public Integer getIntelligence() { | |
| 419 | + return intelligence; | |
| 420 | + } | |
| 421 | + | |
| 422 | + public void setIntelligence(Integer intelligence) { | |
| 423 | + this.intelligence = intelligence; | |
| 424 | + } | |
| 425 | + | |
| 426 | + public String getFamilyHistory() { | |
| 427 | + return familyHistory; | |
| 428 | + } | |
| 429 | + | |
| 430 | + public void setFamilyHistory(String familyHistory) { | |
| 431 | + this.familyHistory = familyHistory; | |
| 432 | + } | |
| 433 | + | |
| 434 | + public Integer getZuyue() { | |
| 435 | + return zuyue; | |
| 436 | + } | |
| 437 | + | |
| 438 | + public void setZuyue(Integer zuyue) { | |
| 439 | + this.zuyue = zuyue; | |
| 440 | + } | |
| 441 | + | |
| 442 | + public Integer getZaochan() { | |
| 443 | + return zaochan; | |
| 444 | + } | |
| 445 | + | |
| 446 | + public void setZaochan(Integer zaochan) { | |
| 447 | + this.zaochan = zaochan; | |
| 448 | + } | |
| 449 | + | |
| 450 | + public Integer getLiuchan() { | |
| 451 | + return liuchan; | |
| 452 | + } | |
| 453 | + | |
| 454 | + public void setLiuchan(Integer liuchan) { | |
| 455 | + this.liuchan = liuchan; | |
| 456 | + } | |
| 457 | + | |
| 458 | + public String getNowBingHistory() { | |
| 459 | + return nowBingHistory; | |
| 460 | + } | |
| 461 | + | |
| 462 | + public void setNowBingHistory(String nowBingHistory) { | |
| 463 | + this.nowBingHistory = nowBingHistory; | |
| 464 | + } | |
| 465 | + | |
| 466 | + public String getSurgeryHistory() { | |
| 467 | + return surgeryHistory; | |
| 468 | + } | |
| 469 | + | |
| 470 | + public void setSurgeryHistory(String surgeryHistory) { | |
| 471 | + this.surgeryHistory = surgeryHistory; | |
| 472 | + } | |
| 473 | + | |
| 474 | + public String getMaritalBingHistory() { | |
| 475 | + return maritalBingHistory; | |
| 476 | + } | |
| 477 | + | |
| 478 | + public void setMaritalBingHistory(String maritalBingHistory) { | |
| 479 | + this.maritalBingHistory = maritalBingHistory; | |
| 480 | + } | |
| 347 | 481 | |
| 348 | 482 | public Integer getSexType() { |
| 349 | 483 | return sexType; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
8d70e72
| ... | ... | @@ -377,6 +377,22 @@ |
| 377 | 377 | } |
| 378 | 378 | // checkupResult.setHunJianDoctor(result.getHunJianDoctor()); |
| 379 | 379 | checkupResult.setHunJianDoctor(hunJianDoctor); |
| 380 | + | |
| 381 | + //新增字段赋值 | |
| 382 | + checkupResult.setMaritalBingHistory(result.getMaritalBingHistory()); | |
| 383 | + checkupResult.setSurgeryHistory(result.getSurgeryHistory()); | |
| 384 | + checkupResult.setNowBingHistory(result.getNowBingHistory()); | |
| 385 | + checkupResult.setZuyue(result.getZuyue()); | |
| 386 | + checkupResult.setZaochan(result.getZaochan()); | |
| 387 | + checkupResult.setLiuchan(result.getLiuchan()); | |
| 388 | + checkupResult.setFamilyHistory(result.getFamilyHistory()); | |
| 389 | + checkupResult.setIntelligence(result.getIntelligence()); | |
| 390 | + checkupResult.setPfmf(result.getPfmf()); | |
| 391 | + checkupResult.setWuguan(result.getWuguan()); | |
| 392 | + checkupResult.setSiZhiJiZhu(result.getSiZhiJiZhu()); | |
| 393 | + checkupResult.setVolumeLeft(result.getVolumeLeft()); | |
| 394 | + checkupResult.setVolumeRight(result.getVolumeRight()); | |
| 395 | + | |
| 380 | 396 | return checkupResult; |
| 381 | 397 | } |
| 382 | 398 | |
| ... | ... | @@ -537,6 +553,35 @@ |
| 537 | 553 | } |
| 538 | 554 | checkup.setDeliverStatus(addRequest.getDeliverStatus()); |
| 539 | 555 | } |
| 556 | + //血缘关系 | |
| 557 | + checkup.setIsBloodshed(addRequest.getIsBloodshed()); | |
| 558 | + //既往病史 | |
| 559 | + checkup.setMaritalBingHistory(addRequest.getMaritalBingHistory()); | |
| 560 | + //手术史 | |
| 561 | + checkup.setSurgeryHistory(addRequest.getSurgeryHistory()); | |
| 562 | + //现病史 | |
| 563 | + checkup.setNowBingHistory(addRequest.getNowBingHistory()); | |
| 564 | + //足月 | |
| 565 | + checkup.setZuyue(addRequest.getZuyue()); | |
| 566 | + //早产 | |
| 567 | + checkup.setZaochan(addRequest.getZaochan()); | |
| 568 | + //流产 | |
| 569 | + checkup.setLiuchan(addRequest.getLiuchan()); | |
| 570 | + //家庭史 | |
| 571 | + checkup.setFamilyHistory(addRequest.getFamilyHistory()); | |
| 572 | + //智力 | |
| 573 | + checkup.setIntelligence(addRequest.getIntelligence()); | |
| 574 | + //皮肤毛发 | |
| 575 | + checkup.setPfmf(addRequest.getPfmf()); | |
| 576 | + //五官 | |
| 577 | + checkup.setWuguan(addRequest.getWuguan()); | |
| 578 | + //四肢脊柱 | |
| 579 | + checkup.setSiZhiJiZhu(addRequest.getSiZhiJiZhu()); | |
| 580 | + //双侧扪及左体积 | |
| 581 | + checkup.setVolumeLeft(addRequest.getVolumeLeft()); | |
| 582 | + //双侧扪及右体积 | |
| 583 | + checkup.setVolumeRight(addRequest.getVolumeRight()); | |
| 584 | + | |
| 540 | 585 | |
| 541 | 586 | /* 婚育史 */ |
| 542 | 587 | //女性 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
View file @
8d70e72
| ... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 | private String spouseCertificateTypeId; |
| 33 | 33 | //配偶证件号 |
| 34 | 34 | private String spouseCertificateNum; |
| 35 | - //血缘关系(1: 有 2: 无) | |
| 35 | + //血缘关系(1: 有 2: 无) (0:无,1:表,2:堂,3:其他) | |
| 36 | 36 | private Integer isBloodshed; |
| 37 | 37 | //具体血缘关系 |
| 38 | 38 | private String bloodshed; |
| ... | ... | @@ -54,6 +54,21 @@ |
| 54 | 54 | //人流 |
| 55 | 55 | private Integer renLiu; |
| 56 | 56 | |
| 57 | + | |
| 58 | + //既往病史 | |
| 59 | + private String maritalBingHistory; | |
| 60 | + //手术史 | |
| 61 | + private String surgeryHistory; | |
| 62 | + //现病史 | |
| 63 | + private String nowBingHistory; | |
| 64 | + //家庭史 | |
| 65 | + private String familyHistory; | |
| 66 | + //与本人关系 | |
| 67 | + private String relationWithMe; | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 57 | 72 | /* 男性只有这三种 */ |
| 58 | 73 | //既往婚育史(1: 有 2: 无) |
| 59 | 74 | private Integer maritalHistory; |
| ... | ... | @@ -61,6 +76,12 @@ |
| 61 | 76 | private Integer sangOu; |
| 62 | 77 | //离异(1:是 2:不是) |
| 63 | 78 | private Integer liYi; |
| 79 | + //足月 | |
| 80 | + private Integer zuyue; | |
| 81 | + //早产 | |
| 82 | + private Integer zaochan; | |
| 83 | + //流产 | |
| 84 | + private Integer liuchan; | |
| 64 | 85 | //子女(个数) |
| 65 | 86 | private Integer childrenNum; |
| 66 | 87 | //家族近亲婚配(1: 有 2: 无) |
| ... | ... | @@ -72,6 +93,10 @@ |
| 72 | 93 | private Integer grandparent; |
| 73 | 94 | //外祖父母(1:是 2:不是) |
| 74 | 95 | private Integer maternalGrandparents; |
| 96 | + //正页受检者签字 | |
| 97 | + private String sjzOneSign; | |
| 98 | + //医生签字 | |
| 99 | + private String oneDoctorSign; | |
| 75 | 100 | |
| 76 | 101 | /****************** 体格检查 ********************/ |
| 77 | 102 | //精神状态(1: 异常 2: 正常) |
| ... | ... | @@ -82,6 +107,10 @@ |
| 82 | 107 | private Integer yuYanNengLi; |
| 83 | 108 | //语言能力异常详情 |
| 84 | 109 | private String yuYanNengLiDetails; |
| 110 | + //智力(1:异常 2:正常) | |
| 111 | + private Integer intelligence; | |
| 112 | + //皮肤毛发(1:异常 2:正常) | |
| 113 | + private Integer pfmf; | |
| 85 | 114 | //特殊面容(1: 异常 2: 正常) |
| 86 | 115 | private Integer teShuMianRong; |
| 87 | 116 | //特殊面容详情 |
| ... | ... | @@ -90,6 +119,8 @@ |
| 90 | 119 | private Integer teShuTiTai; |
| 91 | 120 | //特殊体态详情 |
| 92 | 121 | private String teShuTiTaiDetails; |
| 122 | + //五官(1: 异常 2: 正常) | |
| 123 | + private Integer wuguan; | |
| 93 | 124 | //身高 |
| 94 | 125 | private String height; |
| 95 | 126 | //体重 |
| ... | ... | @@ -173,6 +204,10 @@ |
| 173 | 204 | private String pi; |
| 174 | 205 | //体格检查其他 |
| 175 | 206 | private String tiGeQiTa; |
| 207 | + //体格检查医生签字 | |
| 208 | + private String tiGeSign; | |
| 209 | + //四肢脊柱 | |
| 210 | + private String siZhiJiZhu; | |
| 176 | 211 | /****************** 生殖检查 ********************/ |
| 177 | 212 | /* 第二特征 */ |
| 178 | 213 | //体态(1: 异常 2: 正常) |
| ... | ... | @@ -215,6 +250,8 @@ |
| 215 | 250 | private String fuJian; |
| 216 | 251 | //阴道检查其他 |
| 217 | 252 | private String yinDaoQiTa; |
| 253 | + //同意阴道检查,本人签字 | |
| 254 | + private String sign; | |
| 218 | 255 | /* 生殖器(男) */ |
| 219 | 256 | //阴茎 |
| 220 | 257 | private String jBa; |
| ... | ... | @@ -224,6 +261,10 @@ |
| 224 | 261 | private Integer baoPi; |
| 225 | 262 | //睾丸(单选,选择扪及/未们及) |
| 226 | 263 | private Integer gaoWan; |
| 264 | + //体积左 | |
| 265 | + private String volumeLeft; | |
| 266 | + //体积右 | |
| 267 | + private String volumeRight; | |
| 227 | 268 | //睾丸(左) |
| 228 | 269 | private String gaoWanZuo; |
| 229 | 270 | //睾丸(右) |
| ... | ... | @@ -242,6 +283,8 @@ |
| 242 | 283 | private String jingMaiYou; |
| 243 | 284 | //生殖器其他 |
| 244 | 285 | private String shengZhiQiTa; |
| 286 | + //第二性征检查医生签字 | |
| 287 | + private String twoSign; | |
| 245 | 288 | /****************** 辅助检查结果 ********************/ |
| 246 | 289 | /* 血常规 */ |
| 247 | 290 | //血红蛋白 |
| 248 | 291 | |
| 249 | 292 | |
| ... | ... | @@ -320,15 +363,45 @@ |
| 320 | 363 | /****************** 婚前指导 ********************/ |
| 321 | 364 | //医学意见 |
| 322 | 365 | private Integer yiXueYiJian; |
| 366 | + //婚前卫生咨询 | |
| 367 | + private String hunqianHealth; | |
| 368 | + //咨询指导结果 | |
| 369 | + private String guidanceResults; | |
| 370 | + //反页受检者签字 | |
| 371 | + private String sjzTwoSign; | |
| 323 | 372 | //医学意见其他详情 |
| 324 | 373 | private String yiJianQiTaDetails; |
| 325 | 374 | //指导意见 |
| 326 | 375 | private String zhiDaoYiJian; |
| 327 | 376 | //婚检医生 |
| 328 | 377 | private String hunJianDoctor; |
| 378 | + //转诊医院 | |
| 379 | + private String referralHospital; | |
| 380 | + //转诊日期 | |
| 381 | + private String referralDate; | |
| 382 | + //出具证明时间 | |
| 383 | + private String issueTime; | |
| 384 | + //主检医师签名 | |
| 385 | + private String doctorSign; | |
| 329 | 386 | |
| 330 | 387 | private Integer sexType; |
| 331 | 388 | |
| 389 | + public String getSiZhiJiZhu() { | |
| 390 | + return siZhiJiZhu; | |
| 391 | + } | |
| 392 | + | |
| 393 | + public void setSiZhiJiZhu(String siZhiJiZhu) { | |
| 394 | + this.siZhiJiZhu = siZhiJiZhu; | |
| 395 | + } | |
| 396 | + | |
| 397 | + public Integer getPfmf() { | |
| 398 | + return pfmf; | |
| 399 | + } | |
| 400 | + | |
| 401 | + public void setPfmf(Integer pfmf) { | |
| 402 | + this.pfmf = pfmf; | |
| 403 | + } | |
| 404 | + | |
| 332 | 405 | public Integer getSexType() { |
| 333 | 406 | return sexType; |
| 334 | 407 | } |
| ... | ... | @@ -1480,6 +1553,200 @@ |
| 1480 | 1553 | |
| 1481 | 1554 | public void setHunJianDoctor(String hunJianDoctor) { |
| 1482 | 1555 | this.hunJianDoctor = hunJianDoctor; |
| 1556 | + } | |
| 1557 | + | |
| 1558 | + | |
| 1559 | + //新增 | |
| 1560 | + public String getMaritalBingHistory() { | |
| 1561 | + return maritalBingHistory; | |
| 1562 | + } | |
| 1563 | + | |
| 1564 | + public void setMaritalBingHistory(String maritalBingHistory) { | |
| 1565 | + this.maritalBingHistory = maritalBingHistory; | |
| 1566 | + } | |
| 1567 | + | |
| 1568 | + public String getSurgeryHistory() { | |
| 1569 | + return surgeryHistory; | |
| 1570 | + } | |
| 1571 | + | |
| 1572 | + public void setSurgeryHistory(String surgeryHistory) { | |
| 1573 | + this.surgeryHistory = surgeryHistory; | |
| 1574 | + } | |
| 1575 | + | |
| 1576 | + public String getNowBingHistory() { | |
| 1577 | + return nowBingHistory; | |
| 1578 | + } | |
| 1579 | + | |
| 1580 | + public void setNowBingHistory(String nowBingHistory) { | |
| 1581 | + this.nowBingHistory = nowBingHistory; | |
| 1582 | + } | |
| 1583 | + | |
| 1584 | + public String getFamilyHistory() { | |
| 1585 | + return familyHistory; | |
| 1586 | + } | |
| 1587 | + | |
| 1588 | + public void setFamilyHistory(String familyHistory) { | |
| 1589 | + this.familyHistory = familyHistory; | |
| 1590 | + } | |
| 1591 | + | |
| 1592 | + public String getRelationWithMe() { | |
| 1593 | + return relationWithMe; | |
| 1594 | + } | |
| 1595 | + | |
| 1596 | + public void setRelationWithMe(String relationWithMe) { | |
| 1597 | + this.relationWithMe = relationWithMe; | |
| 1598 | + } | |
| 1599 | + | |
| 1600 | + public Integer getZuyue() { | |
| 1601 | + return zuyue; | |
| 1602 | + } | |
| 1603 | + | |
| 1604 | + public void setZuyue(Integer zuyue) { | |
| 1605 | + this.zuyue = zuyue; | |
| 1606 | + } | |
| 1607 | + | |
| 1608 | + public Integer getZaochan() { | |
| 1609 | + return zaochan; | |
| 1610 | + } | |
| 1611 | + | |
| 1612 | + public void setZaochan(Integer zaochan) { | |
| 1613 | + this.zaochan = zaochan; | |
| 1614 | + } | |
| 1615 | + | |
| 1616 | + public Integer getLiuchan() { | |
| 1617 | + return liuchan; | |
| 1618 | + } | |
| 1619 | + | |
| 1620 | + public void setLiuchan(Integer liuchan) { | |
| 1621 | + this.liuchan = liuchan; | |
| 1622 | + } | |
| 1623 | + | |
| 1624 | + public String getSjzOneSign() { | |
| 1625 | + return sjzOneSign; | |
| 1626 | + } | |
| 1627 | + | |
| 1628 | + public void setSjzOneSign(String sjzOneSign) { | |
| 1629 | + this.sjzOneSign = sjzOneSign; | |
| 1630 | + } | |
| 1631 | + | |
| 1632 | + public String getOneDoctorSign() { | |
| 1633 | + return oneDoctorSign; | |
| 1634 | + } | |
| 1635 | + | |
| 1636 | + public void setOneDoctorSign(String oneDoctorSign) { | |
| 1637 | + this.oneDoctorSign = oneDoctorSign; | |
| 1638 | + } | |
| 1639 | + | |
| 1640 | + public Integer getIntelligence() { | |
| 1641 | + return intelligence; | |
| 1642 | + } | |
| 1643 | + | |
| 1644 | + public void setIntelligence(Integer intelligence) { | |
| 1645 | + this.intelligence = intelligence; | |
| 1646 | + } | |
| 1647 | + | |
| 1648 | + public Integer getWuguan() { | |
| 1649 | + return wuguan; | |
| 1650 | + } | |
| 1651 | + | |
| 1652 | + public void setWuguan(Integer wuguan) { | |
| 1653 | + this.wuguan = wuguan; | |
| 1654 | + } | |
| 1655 | + | |
| 1656 | + public String getTiGeSign() { | |
| 1657 | + return tiGeSign; | |
| 1658 | + } | |
| 1659 | + | |
| 1660 | + public void setTiGeSign(String tiGeSign) { | |
| 1661 | + this.tiGeSign = tiGeSign; | |
| 1662 | + } | |
| 1663 | + | |
| 1664 | + public String getSign() { | |
| 1665 | + return sign; | |
| 1666 | + } | |
| 1667 | + | |
| 1668 | + public void setSign(String sign) { | |
| 1669 | + this.sign = sign; | |
| 1670 | + } | |
| 1671 | + | |
| 1672 | + public String getVolumeLeft() { | |
| 1673 | + return volumeLeft; | |
| 1674 | + } | |
| 1675 | + | |
| 1676 | + public void setVolumeLeft(String volumeLeft) { | |
| 1677 | + this.volumeLeft = volumeLeft; | |
| 1678 | + } | |
| 1679 | + | |
| 1680 | + public String getVolumeRight() { | |
| 1681 | + return volumeRight; | |
| 1682 | + } | |
| 1683 | + | |
| 1684 | + public void setVolumeRight(String volumeRight) { | |
| 1685 | + this.volumeRight = volumeRight; | |
| 1686 | + } | |
| 1687 | + | |
| 1688 | + public String getTwoSign() { | |
| 1689 | + return twoSign; | |
| 1690 | + } | |
| 1691 | + | |
| 1692 | + public void setTwoSign(String twoSign) { | |
| 1693 | + this.twoSign = twoSign; | |
| 1694 | + } | |
| 1695 | + | |
| 1696 | + public String getHunqianHealth() { | |
| 1697 | + return hunqianHealth; | |
| 1698 | + } | |
| 1699 | + | |
| 1700 | + public void setHunqianHealth(String hunqianHealth) { | |
| 1701 | + this.hunqianHealth = hunqianHealth; | |
| 1702 | + } | |
| 1703 | + | |
| 1704 | + public String getGuidanceResults() { | |
| 1705 | + return guidanceResults; | |
| 1706 | + } | |
| 1707 | + | |
| 1708 | + public void setGuidanceResults(String guidanceResults) { | |
| 1709 | + this.guidanceResults = guidanceResults; | |
| 1710 | + } | |
| 1711 | + | |
| 1712 | + public String getSjzTwoSign() { | |
| 1713 | + return sjzTwoSign; | |
| 1714 | + } | |
| 1715 | + | |
| 1716 | + public void setSjzTwoSign(String sjzTwoSign) { | |
| 1717 | + this.sjzTwoSign = sjzTwoSign; | |
| 1718 | + } | |
| 1719 | + | |
| 1720 | + public String getReferralHospital() { | |
| 1721 | + return referralHospital; | |
| 1722 | + } | |
| 1723 | + | |
| 1724 | + public void setReferralHospital(String referralHospital) { | |
| 1725 | + this.referralHospital = referralHospital; | |
| 1726 | + } | |
| 1727 | + | |
| 1728 | + public String getReferralDate() { | |
| 1729 | + return referralDate; | |
| 1730 | + } | |
| 1731 | + | |
| 1732 | + public void setReferralDate(String referralDate) { | |
| 1733 | + this.referralDate = referralDate; | |
| 1734 | + } | |
| 1735 | + | |
| 1736 | + public String getIssueTime() { | |
| 1737 | + return issueTime; | |
| 1738 | + } | |
| 1739 | + | |
| 1740 | + public void setIssueTime(String issueTime) { | |
| 1741 | + this.issueTime = issueTime; | |
| 1742 | + } | |
| 1743 | + | |
| 1744 | + public String getDoctorSign() { | |
| 1745 | + return doctorSign; | |
| 1746 | + } | |
| 1747 | + | |
| 1748 | + public void setDoctorSign(String doctorSign) { | |
| 1749 | + this.doctorSign = doctorSign; | |
| 1483 | 1750 | } |
| 1484 | 1751 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
View file @
8d70e72
| ... | ... | @@ -330,6 +330,140 @@ |
| 330 | 330 | //婚检医生 |
| 331 | 331 | private String hunJianDoctor; |
| 332 | 332 | |
| 333 | + | |
| 334 | + /**********新增***********/ | |
| 335 | + //既往病史 | |
| 336 | + private String maritalBingHistory; | |
| 337 | + //手术史(1:有 2:无 3:其他) | |
| 338 | + private String surgeryHistory; | |
| 339 | + //现病史 | |
| 340 | + private String nowBingHistory; | |
| 341 | + //足月 | |
| 342 | + private Integer zuyue; | |
| 343 | + //早产 | |
| 344 | + private Integer zaochan; | |
| 345 | + //流产 | |
| 346 | + private Integer liuchan; | |
| 347 | + //家庭史 | |
| 348 | + private String familyHistory; | |
| 349 | + //智力(1:异常 2:正常) | |
| 350 | + private Integer intelligence; | |
| 351 | + //皮肤毛发(1:异常 2:正常) | |
| 352 | + private Integer pfmf; | |
| 353 | + //五官(1: 异常 2: 正常) | |
| 354 | + private Integer wuguan; | |
| 355 | + //四肢脊柱 | |
| 356 | + private String siZhiJiZhu; | |
| 357 | + //体积左 | |
| 358 | + private String volumeLeft; | |
| 359 | + //体积右 | |
| 360 | + private String volumeRight; | |
| 361 | + | |
| 362 | + | |
| 363 | + public String getMaritalBingHistory() { | |
| 364 | + return maritalBingHistory; | |
| 365 | + } | |
| 366 | + | |
| 367 | + public void setMaritalBingHistory(String maritalBingHistory) { | |
| 368 | + this.maritalBingHistory = maritalBingHistory; | |
| 369 | + } | |
| 370 | + | |
| 371 | + public String getSurgeryHistory() { | |
| 372 | + return surgeryHistory; | |
| 373 | + } | |
| 374 | + | |
| 375 | + public void setSurgeryHistory(String surgeryHistory) { | |
| 376 | + this.surgeryHistory = surgeryHistory; | |
| 377 | + } | |
| 378 | + | |
| 379 | + public String getNowBingHistory() { | |
| 380 | + return nowBingHistory; | |
| 381 | + } | |
| 382 | + | |
| 383 | + public void setNowBingHistory(String nowBingHistory) { | |
| 384 | + this.nowBingHistory = nowBingHistory; | |
| 385 | + } | |
| 386 | + | |
| 387 | + public Integer getZuyue() { | |
| 388 | + return zuyue; | |
| 389 | + } | |
| 390 | + | |
| 391 | + public void setZuyue(Integer zuyue) { | |
| 392 | + this.zuyue = zuyue; | |
| 393 | + } | |
| 394 | + | |
| 395 | + public Integer getZaochan() { | |
| 396 | + return zaochan; | |
| 397 | + } | |
| 398 | + | |
| 399 | + public void setZaochan(Integer zaochan) { | |
| 400 | + this.zaochan = zaochan; | |
| 401 | + } | |
| 402 | + | |
| 403 | + public Integer getLiuchan() { | |
| 404 | + return liuchan; | |
| 405 | + } | |
| 406 | + | |
| 407 | + public void setLiuchan(Integer liuchan) { | |
| 408 | + this.liuchan = liuchan; | |
| 409 | + } | |
| 410 | + | |
| 411 | + public String getFamilyHistory() { | |
| 412 | + return familyHistory; | |
| 413 | + } | |
| 414 | + | |
| 415 | + public void setFamilyHistory(String familyHistory) { | |
| 416 | + this.familyHistory = familyHistory; | |
| 417 | + } | |
| 418 | + | |
| 419 | + public Integer getIntelligence() { | |
| 420 | + return intelligence; | |
| 421 | + } | |
| 422 | + | |
| 423 | + public void setIntelligence(Integer intelligence) { | |
| 424 | + this.intelligence = intelligence; | |
| 425 | + } | |
| 426 | + | |
| 427 | + public Integer getPfmf() { | |
| 428 | + return pfmf; | |
| 429 | + } | |
| 430 | + | |
| 431 | + public void setPfmf(Integer pfmf) { | |
| 432 | + this.pfmf = pfmf; | |
| 433 | + } | |
| 434 | + | |
| 435 | + public Integer getWuguan() { | |
| 436 | + return wuguan; | |
| 437 | + } | |
| 438 | + | |
| 439 | + public void setWuguan(Integer wuguan) { | |
| 440 | + this.wuguan = wuguan; | |
| 441 | + } | |
| 442 | + | |
| 443 | + public String getSiZhiJiZhu() { | |
| 444 | + return siZhiJiZhu; | |
| 445 | + } | |
| 446 | + | |
| 447 | + public void setSiZhiJiZhu(String siZhiJiZhu) { | |
| 448 | + this.siZhiJiZhu = siZhiJiZhu; | |
| 449 | + } | |
| 450 | + | |
| 451 | + public String getVolumeLeft() { | |
| 452 | + return volumeLeft; | |
| 453 | + } | |
| 454 | + | |
| 455 | + public void setVolumeLeft(String volumeLeft) { | |
| 456 | + this.volumeLeft = volumeLeft; | |
| 457 | + } | |
| 458 | + | |
| 459 | + public String getVolumeRight() { | |
| 460 | + return volumeRight; | |
| 461 | + } | |
| 462 | + | |
| 463 | + public void setVolumeRight(String volumeRight) { | |
| 464 | + this.volumeRight = volumeRight; | |
| 465 | + } | |
| 466 | + | |
| 333 | 467 | public String getId() { |
| 334 | 468 | return id; |
| 335 | 469 | } |