jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8784a2501df08c7978228352572503cdec9627c

Authored by liquanyu
1 parent b557f7d24f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童

Showing 6 changed files with 105 additions and 27 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ c8784a2
... ... @@ -669,8 +669,11 @@
669 669 private String mfileCode; //纸质档案编号
670 670 private String beforeName; //曾用名
671 671 private String nationId; //民族
672   - private String ownPhone; //本人电话
673   - private String fixPhone; //固定电话
  672 + //private String mommyPhone; 本人电话
  673 + private String fixPhone; // 固定电话
  674 + private String cname; //联系人姓名
  675 + private String cphone; //联系人电话
  676 + private String remark;//备注
674 677 private String village;//村/居委会
675 678 private String smallArea; //小区
676 679 private String floor; //楼栋
677 680  
... ... @@ -752,12 +755,28 @@
752 755 this.nationId = nationId;
753 756 }
754 757  
755   - public String getOwnPhone() {
756   - return ownPhone;
  758 + public String getCname() {
  759 + return cname;
757 760 }
758 761  
759   - public void setOwnPhone(String ownPhone) {
760   - this.ownPhone = ownPhone;
  762 + public void setCname(String cname) {
  763 + this.cname = cname;
  764 + }
  765 +
  766 + public String getCphone() {
  767 + return cphone;
  768 + }
  769 +
  770 + public void setCphone(String cphone) {
  771 + this.cphone = cphone;
  772 + }
  773 +
  774 + public String getRemark() {
  775 + return remark;
  776 + }
  777 +
  778 + public void setRemark(String remark) {
  779 + this.remark = remark;
761 780 }
762 781  
763 782 public String getFixPhone() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c8784a2
... ... @@ -1435,8 +1435,11 @@
1435 1435 bm.setMfileCode(b.getMfileCode());
1436 1436 bm.setBeforeName(b.getBeforeName());
1437 1437 bm.setNationId(b.getNationId());
1438   - bm.setOwnPhone(b.getOwnPhone());
  1438 + //setOwnPhone(destModel.getOwnPhone());
1439 1439 bm.setFixPhone(b.getFixPhone());
  1440 + bm.setCname(b.getCname());
  1441 + bm.setCphone(b.getCphone());
  1442 + bm.setRemark(b.getRemark());
1440 1443 bm.setVillage(b.getVillage());
1441 1444 bm.setSmallArea(b.getSmallArea());
1442 1445 bm.setFloor(b.getFloor());
1443 1446  
... ... @@ -2194,8 +2197,11 @@
2194 2197 result.setMfileCode(model.getMfileCode());
2195 2198 result.setBeforeName(model.getBeforeName());
2196 2199 result.setNationId(model.getNationId());
2197   - result.setOwnPhone(model.getOwnPhone());
  2200 + //setOwnPhone(destModel.getOwnPhone());
2198 2201 result.setFixPhone(model.getFixPhone());
  2202 + result.setCname(model.getCname());
  2203 + result.setCphone(model.getCphone());
  2204 + result.setRemark(model.getRemark());
2199 2205 result.setVillage(model.getVillage());
2200 2206 result.setSmallArea(model.getSmallArea());
2201 2207 result.setFloor(model.getFloor());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ c8784a2
... ... @@ -2174,6 +2174,8 @@
2174 2174 List <String> hList = groupsFacade.findGroupHospital(userId, false);
2175 2175 babyQuery.setHospitalIdList(hList);
2176 2176  
  2177 + // babyQuery.setHospitalId(hospitalId);
  2178 +
2177 2179 Map <String, List <BabyChooseResult>> listMap = new HashMap <>();
2178 2180  
2179 2181 List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ c8784a2
... ... @@ -458,8 +458,11 @@
458 458 private String mfileCode; //纸质档案编号
459 459 private String beforeName; //曾用名
460 460 private String nationId; //民族
461   - private String ownPhone; //本人电话
462   - private String fixPhone; //固定电话
  461 + //private String mommyPhone; 本人电话
  462 + private String fixPhone; // 固定电话
  463 + private String cname; //联系人姓名
  464 + private String cphone; //联系人电话
  465 + private String remark;//备注
463 466 private String village;//村/居委会
464 467 private String smallArea; //小区
465 468 private String floor; //楼栋
466 469  
... ... @@ -541,12 +544,28 @@
541 544 this.nationId = nationId;
542 545 }
543 546  
544   - public String getOwnPhone() {
545   - return ownPhone;
  547 + public String getCname() {
  548 + return cname;
546 549 }
547 550  
548   - public void setOwnPhone(String ownPhone) {
549   - this.ownPhone = ownPhone;
  551 + public void setCname(String cname) {
  552 + this.cname = cname;
  553 + }
  554 +
  555 + public String getCphone() {
  556 + return cphone;
  557 + }
  558 +
  559 + public void setCphone(String cphone) {
  560 + this.cphone = cphone;
  561 + }
  562 +
  563 + public String getRemark() {
  564 + return remark;
  565 + }
  566 +
  567 + public void setRemark(String remark) {
  568 + this.remark = remark;
550 569 }
551 570  
552 571 public String getFixPhone() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ c8784a2
... ... @@ -401,8 +401,11 @@
401 401 private String mfileCode; //纸质档案编号
402 402 private String beforeName; //曾用名
403 403 private String nationId; //民族
404   - private String ownPhone; //本人电话
405   - private String fixPhone; //固定电话
  404 + //private String mommyPhone; 本人电话
  405 + private String fixPhone; // 固定电话
  406 + private String cname; //联系人姓名
  407 + private String cphone; //联系人电话
  408 + private String remark;//备注
406 409 private String village;//村/居委会
407 410 private String smallArea; //小区
408 411 private String floor; //楼栋
409 412  
... ... @@ -481,12 +484,28 @@
481 484 this.nationId = nationId;
482 485 }
483 486  
484   - public String getOwnPhone() {
485   - return ownPhone;
  487 + public String getCname() {
  488 + return cname;
486 489 }
487 490  
488   - public void setOwnPhone(String ownPhone) {
489   - this.ownPhone = ownPhone;
  491 + public void setCname(String cname) {
  492 + this.cname = cname;
  493 + }
  494 +
  495 + public String getCphone() {
  496 + return cphone;
  497 + }
  498 +
  499 + public void setCphone(String cphone) {
  500 + this.cphone = cphone;
  501 + }
  502 +
  503 + public String getRemark() {
  504 + return remark;
  505 + }
  506 +
  507 + public void setRemark(String remark) {
  508 + this.remark = remark;
490 509 }
491 510  
492 511 public String getFixPhone() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ c8784a2
... ... @@ -391,8 +391,10 @@
391 391 private String mfileCode; //纸质档案编号
392 392 private String beforeName; //曾用名
393 393 private String nationId; //民族
394   - private String ownPhone; //本人电话
395   - private String fixPhone; //固定电话
  394 + //private String mommyPhone; 本人电话
  395 + private String fixPhone; // 固定电话
  396 + private String cname; //联系人姓名
  397 + private String cphone; //联系人电话
396 398 private String village;//村/居委会
397 399 private String smallArea; //小区
398 400 private String floor; //楼栋
399 401  
400 402  
... ... @@ -471,14 +473,22 @@
471 473 this.nationId = nationId;
472 474 }
473 475  
474   - public String getOwnPhone() {
475   - return ownPhone;
  476 + public String getCname() {
  477 + return cname;
476 478 }
477 479  
478   - public void setOwnPhone(String ownPhone) {
479   - this.ownPhone = ownPhone;
  480 + public void setCname(String cname) {
  481 + this.cname = cname;
480 482 }
481 483  
  484 + public String getCphone() {
  485 + return cphone;
  486 + }
  487 +
  488 + public void setCphone(String cphone) {
  489 + this.cphone = cphone;
  490 + }
  491 +
482 492 public String getFixPhone() {
483 493 return fixPhone;
484 494 }
485 495  
... ... @@ -2041,8 +2051,11 @@
2041 2051 setMfileCode(destModel.getMfileCode());
2042 2052 setBeforeName(destModel.getBeforeName());
2043 2053 setNationId(destModel.getNationId());
2044   - setOwnPhone(destModel.getOwnPhone());
  2054 + //setOwnPhone(destModel.getOwnPhone());
2045 2055 setFixPhone(destModel.getFixPhone());
  2056 + setCname(destModel.getCname());
  2057 + setCphone(destModel.getCphone());
  2058 + setRemark(destModel.getRemark());
2046 2059 setVillage(destModel.getVillage());
2047 2060 setSmallArea(destModel.getSmallArea());
2048 2061 setFloor(destModel.getFloor());