fangcheng / regional-platform

Download as
Browse Code »

Commit 227fe63c88da9ae1982286f4778050f31a9119dd

Authored by jiangjiazhi
1 parent a7000be790
Exists in master and in 1 other branch nobuildprocess

产妇增加字段

Showing 1 changed file with 88 additions and 44 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 227fe63
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
4 4 import com.lyms.platform.common.utils.DateUtil;
  5 +import com.lyms.platform.common.utils.JsonUtil;
5 6 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
6 7 import com.lyms.platform.pojo.AntExChuModel;
7 8 import com.lyms.platform.pojo.AntenatalExaminationModel;
... ... @@ -11,6 +12,7 @@
11 12 import java.util.ArrayList;
12 13 import java.util.Date;
13 14 import java.util.List;
  15 +import java.util.Map;
14 16  
15 17 /**
16 18 *
17 19  
18 20  
19 21  
20 22  
21 23  
22 24  
... ... @@ -43,19 +45,19 @@
43 45  
44 46 /**初检信息 **/
45 47 // 既往史
46   - private String pastHistory ;
  48 + private Map pastHistory ;
47 49 // 家族史
48   - private String familyHistory ;
  50 + private Map familyHistory ;
49 51 //个人史
50   - private String personalHistory;
  52 + private Map personalHistory;
51 53 //疫苗接种史
52   - private String ymjzHistory ;
  54 + private Map ymjzHistory ;
53 55 //药物过敏史
54   - private String ywgmHistory ;
  56 + private Map ywgmHistory ;
55 57 //妇科手术史
56   - private String fksxHistory ;
  58 + private Map fksxHistory ;
57 59 // 叶酸服用
58   - private String ysfyHistory ;
  60 + private Map ysfyHistory ;
59 61 //孕次
60 62 private String pregnancyTimes;
61 63 // 产次
62 64  
63 65  
... ... @@ -307,22 +309,8 @@
307 309 }
308 310  
309 311  
310   - public String getFamilyHistory() {
311   - return familyHistory;
312   - }
313 312  
314   - public void setFamilyHistory(String familyHistory) {
315   - this.familyHistory = familyHistory;
316   - }
317 313  
318   - public String getFksxHistory() {
319   - return fksxHistory;
320   - }
321   -
322   - public void setFksxHistory(String fksxHistory) {
323   - this.fksxHistory = fksxHistory;
324   - }
325   -
326 314 public String getFuwei() {
327 315 return fuwei;
328 316 }
329 317  
330 318  
331 319  
... ... @@ -453,24 +441,9 @@
453 441 this.otherHighRisk = otherHighRisk;
454 442 }
455 443  
456   - public String getPastHistory() {
457   - return pastHistory;
458   - }
459 444  
460   - public void setPastHistory(String pastHistory) {
461   - this.pastHistory = pastHistory;
462   - }
463 445  
464   - public String getPersonalHistory() {
465   - return personalHistory;
466   - }
467 446  
468   - public void setPersonalHistory(String personalHistory) {
469   - this.personalHistory = personalHistory;
470   - }
471   -
472   -
473   -
474 447 public List<MatDeliverAddRequest.Placenta> getPlacentas() {
475 448 return placentas;
476 449 }
477 450  
... ... @@ -683,11 +656,51 @@
683 656 this.yghxkt = yghxkt;
684 657 }
685 658  
686   - public String getYmjzHistory() {
  659 + public Map getFamilyHistory() {
  660 + return familyHistory;
  661 + }
  662 +
  663 + public void setFamilyHistory(Map familyHistory) {
  664 + this.familyHistory = familyHistory;
  665 + }
  666 +
  667 + public Map getFksxHistory() {
  668 + return fksxHistory;
  669 + }
  670 +
  671 + public void setFksxHistory(Map fksxHistory) {
  672 + this.fksxHistory = fksxHistory;
  673 + }
  674 +
  675 + public Map getPastHistory() {
  676 + return pastHistory;
  677 + }
  678 +
  679 + public void setPastHistory(Map pastHistory) {
  680 + this.pastHistory = pastHistory;
  681 + }
  682 +
  683 + public Map getPersonalHistory() {
  684 + return personalHistory;
  685 + }
  686 +
  687 + public void setPersonalHistory(Map personalHistory) {
  688 + this.personalHistory = personalHistory;
  689 + }
  690 +
  691 + public String getRh() {
  692 + return rh;
  693 + }
  694 +
  695 + public void setRh(String rh) {
  696 + this.rh = rh;
  697 + }
  698 +
  699 + public Map getYmjzHistory() {
687 700 return ymjzHistory;
688 701 }
689 702  
690   - public void setYmjzHistory(String ymjzHistory) {
  703 + public void setYmjzHistory(Map ymjzHistory) {
691 704 this.ymjzHistory = ymjzHistory;
692 705 }
693 706  
694 707  
695 708  
696 709  
... ... @@ -699,19 +712,19 @@
699 712 this.yqWeight = yqWeight;
700 713 }
701 714  
702   - public String getYsfyHistory() {
  715 + public Map getYsfyHistory() {
703 716 return ysfyHistory;
704 717 }
705 718  
706   - public void setYsfyHistory(String ysfyHistory) {
  719 + public void setYsfyHistory(Map ysfyHistory) {
707 720 this.ysfyHistory = ysfyHistory;
708 721 }
709 722  
710   - public String getYwgmHistory() {
  723 + public Map getYwgmHistory() {
711 724 return ywgmHistory;
712 725 }
713 726  
714   - public void setYwgmHistory(String ywgmHistory) {
  727 + public void setYwgmHistory(Map ywgmHistory) {
715 728 this.ywgmHistory = ywgmHistory;
716 729 }
717 730  
718 731  
719 732  
... ... @@ -727,11 +740,42 @@
727 740 if(null!=antExChuModel){
728 741 setId(antExChuModel.getId());
729 742 setParentId(antExChuModel.getParentId());
  743 + setPastHistory(JsonUtil.str2Obj(antExChuModel.getPastHistory(),Map.class));
  744 + setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(),Map.class));
  745 + setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(),Map.class));
  746 + setYmjzHistory(JsonUtil.str2Obj(antExChuModel.getYmjzHistory(),Map.class));
  747 + setYwgmHistory(JsonUtil.str2Obj(antExChuModel.getYwgmHistory(),Map.class));
  748 + setFksxHistory(JsonUtil.str2Obj(antExChuModel.getFksxHistory(),Map.class));
  749 + setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(),Map.class));
  750 + setPregnancyTimes(antExChuModel.getPregnancyTimes());
  751 + setProdTime(antExChuModel.getProdTime());
  752 + setDelivery(antExChuModel.getDelivery());
  753 + setPlanedProd(antExChuModel.getPlanedProd());
  754 + setAbortion(antExChuModel.getAbortion());
  755 + setStillbirth(antExChuModel.getStillbirth());
  756 + setStillChan(antExChuModel.getStillChan());
  757 + setNeoDeath(antExChuModel.getNeoDeath());
  758 + setBirthDefect(antExChuModel.getBirthDefect());
  759 + setHeight(antExChuModel.getHeight());
  760 + setWeight(antExChuModel.getWeight());
  761 + setYqWeight(antExChuModel.getYqWeight());
  762 + setBaricIndex(antExChuModel.getBaricIndex());
  763 + setCestationInfo(antExChuModel.getCestationInfo());
  764 + setGonggao(antExChuModel.getGonggao());
  765 + setFuwei(antExChuModel.getFuwei());
  766 + setTireNumber1(antExChuModel.getTireNumber1());
  767 + setPlacentas(antExChuModel.getPlacentas());
  768 + setHighriskSocre(antExChuModel.getHighriskSocre());
  769 + setOtherHighRisk(antExChuModel.getOtherHighRisk());
  770 + setDiagnosis(antExChuModel.getDiagnosis());
  771 + setTreatOpinion(antExChuModel.getTreatOpinion());
  772 + setDirOpinion(antExChuModel.getDirOpinion());
  773 + setProdDoctor(antExChuModel.getProdDoctor());
  774 + setCheckTime(antExChuModel.getCheckTime());
  775 + setNextCheckTime(antExChuModel.getNextCheckTime());
730 776 setAbo(antExChuModel.getAbortion());
731 777 setAlbumin(antExChuModel.getAbortion());
732   - setBaricIndex(antExChuModel.getBaricIndex());
733 778 }
734   -
735 779 return this;
736 780 }
737 781 }