liquanyu / regional-platform

Download as
Browse Code »

Commit 265c3f8e2a8f9c8f918b501d9c5b685383334014

Authored by jiangjiazhi
1 parent 40a2d53fd3
Exists in master and in 3 other branches 0116, dev, nobuildprocess

修改新电子病历

Showing 3 changed files with 33 additions and 29 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 265c3f8
... ... @@ -67,13 +67,13 @@
67 67 // 脉搏
68 68 private String pulse;
69 69 // 一小时失血量
70   - private Integer oHloseBloodL;
  70 + private Double oHloseBloodL;
71 71 //二小时失血量
72   - private Integer tHloseBloodL;
  72 + private Double tHloseBloodL;
73 73 //二十四小时失血量
74   - private Integer rHloseBloodL;
  74 + private Double rHloseBloodL;
75 75 //第3产层+产后失血量
76   - private Integer sHloseBloodL;
  76 + private Double sHloseBloodL;
77 77 //失血原因
78 78 private String loseBloodCause;
79 79 //产科并发症
80 80  
81 81  
82 82  
83 83  
84 84  
85 85  
... ... @@ -568,30 +568,38 @@
568 568 this.pulse = pulse;
569 569 }
570 570  
571   - public Integer getoHloseBloodL() {
  571 + public Double getoHloseBloodL() {
572 572 return oHloseBloodL;
573 573 }
574 574  
575   - public void setoHloseBloodL(Integer oHloseBloodL) {
  575 + public void setoHloseBloodL(Double oHloseBloodL) {
576 576 this.oHloseBloodL = oHloseBloodL;
577 577 }
578 578  
579   - public Integer getrHloseBloodL() {
  579 + public Double getrHloseBloodL() {
580 580 return rHloseBloodL;
581 581 }
582 582  
583   - public void setrHloseBloodL(Integer rHloseBloodL) {
  583 + public void setrHloseBloodL(Double rHloseBloodL) {
584 584 this.rHloseBloodL = rHloseBloodL;
585 585 }
586 586  
587   - public Integer getsHloseBloodL() {
  587 + public Double getsHloseBloodL() {
588 588 return sHloseBloodL;
589 589 }
590 590  
591   - public void setsHloseBloodL(Integer sHloseBloodL) {
  591 + public void setsHloseBloodL(Double sHloseBloodL) {
592 592 this.sHloseBloodL = sHloseBloodL;
593 593 }
594 594  
  595 + public Double gettHloseBloodL() {
  596 + return tHloseBloodL;
  597 + }
  598 +
  599 + public void settHloseBloodL(Double tHloseBloodL) {
  600 + this.tHloseBloodL = tHloseBloodL;
  601 + }
  602 +
595 603 public Integer getSiLielevel() {
596 604 return siLielevel;
597 605 }
... ... @@ -600,13 +608,6 @@
600 608 this.siLielevel = siLielevel;
601 609 }
602 610  
603   - public Integer gettHloseBloodL() {
604   - return tHloseBloodL;
605   - }
606   -
607   - public void settHloseBloodL(Integer tHloseBloodL) {
608   - this.tHloseBloodL = tHloseBloodL;
609   - }
610 611  
611 612 public Integer getTireNumber() {
612 613 return tireNumber;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 265c3f8
... ... @@ -619,6 +619,7 @@
619 619 data.put("checkDoctor", rp.getCheckDoctor());
620 620 data.put("lName", rp.getlName());
621 621 data.put("phone", rp.getPhone());
  622 + datas.add(data);
622 623 }
623 624 cnames.put("name", "姓名");
624 625 cnames.put("age", "当前年龄");
... ... @@ -651,6 +652,7 @@
651 652 data.put("checkDoctor", rp.getCheckDoctor());
652 653 data.put("lName", rp.getlName());
653 654 data.put("phone", rp.getPhone());
  655 + datas.add(data);
654 656 }
655 657 cnames.put("name", "姓名");
656 658 cnames.put("age", "当前年龄");
... ... @@ -680,6 +682,7 @@
680 682 data.put("checkDoctor", rp.getCheckDoctor());
681 683 data.put("lName", rp.getlName());
682 684 data.put("phone", rp.getPhone());
  685 + datas.add(data);
683 686 }
684 687 cnames.put("name", "姓名");
685 688 cnames.put("age", "分娩年龄");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 265c3f8
... ... @@ -64,13 +64,13 @@
64 64 // 脉搏
65 65 private String pulse;
66 66 // 一小时失血量
67   - private Integer oHloseBloodL;
  67 + private Double oHloseBloodL;
68 68 //二小时失血量
69   - private Integer tHloseBloodL;
  69 + private Double tHloseBloodL;
70 70 //二十四小时失血量
71   - private Integer rHloseBloodL;
  71 + private Double rHloseBloodL;
72 72 //第3产层+产后失血量
73   - private Integer sHloseBloodL;
  73 + private Double sHloseBloodL;
74 74 //失血原因
75 75 private java.util.Map loseBloodCause;
76 76 //产科并发症
77 77  
78 78  
79 79  
80 80  
81 81  
82 82  
83 83  
... ... @@ -99,35 +99,35 @@
99 99 this.extPlacentas = extPlacentas;
100 100 }
101 101  
102   - public Integer getoHloseBloodL() {
  102 + public Double getoHloseBloodL() {
103 103 return oHloseBloodL;
104 104 }
105 105  
106   - public void setoHloseBloodL(Integer oHloseBloodL) {
  106 + public void setoHloseBloodL(Double oHloseBloodL) {
107 107 this.oHloseBloodL = oHloseBloodL;
108 108 }
109 109  
110   - public Integer getrHloseBloodL() {
  110 + public Double getrHloseBloodL() {
111 111 return rHloseBloodL;
112 112 }
113 113  
114   - public void setrHloseBloodL(Integer rHloseBloodL) {
  114 + public void setrHloseBloodL(Double rHloseBloodL) {
115 115 this.rHloseBloodL = rHloseBloodL;
116 116 }
117 117  
118   - public Integer getsHloseBloodL() {
  118 + public Double getsHloseBloodL() {
119 119 return sHloseBloodL;
120 120 }
121 121  
122   - public void setsHloseBloodL(Integer sHloseBloodL) {
  122 + public void setsHloseBloodL(Double sHloseBloodL) {
123 123 this.sHloseBloodL = sHloseBloodL;
124 124 }
125 125  
126   - public Integer gettHloseBloodL() {
  126 + public Double gettHloseBloodL() {
127 127 return tHloseBloodL;
128 128 }
129 129  
130   - public void settHloseBloodL(Integer tHloseBloodL) {
  130 + public void settHloseBloodL(Double tHloseBloodL) {
131 131 this.tHloseBloodL = tHloseBloodL;
132 132 }
133 133