Commit fae06c3e35e124b66b4047145421419edf44895a
1 parent
9d4bd54a98
Exists in
master
and in
1 other branch
产妇增加字段
Showing 1 changed file with 93 additions and 116 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
View file @
fae06c3
1 | 1 | package com.lyms.platform.operate.web.result; |
2 | 2 | |
3 | -import com.lyms.platform.common.base.IBasicResultConvert; | |
4 | -import com.lyms.platform.common.utils.DateUtil; | |
5 | 3 | import com.lyms.platform.common.utils.JsonUtil; |
6 | 4 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
7 | 5 | import com.lyms.platform.pojo.AntExChuModel; |
8 | -import com.lyms.platform.pojo.AntenatalExaminationModel; | |
9 | -import com.lyms.platform.pojo.Patients; | |
10 | -import com.sun.javafx.collections.MappingChange; | |
11 | -import org.apache.commons.collections.CollectionUtils; | |
12 | 6 | |
13 | -import java.util.ArrayList; | |
14 | -import java.util.Date; | |
15 | 7 | import java.util.List; |
16 | 8 | import java.util.Map; |
17 | 9 | |
18 | 10 | /** |
19 | - * | |
20 | 11 | * 产前检查初诊 * |
21 | 12 | * Created by Administrator on 2016/6/20 0020. |
22 | 13 | */ |
23 | -public class AntexChuResult { | |
14 | +public class AntexChuResult { | |
24 | 15 | |
25 | 16 | private String parentId; |
26 | - /**基本信息**/ | |
17 | + /** | |
18 | + * 基本信息 | |
19 | + **/ | |
27 | 20 | private String id; |
28 | - /* //名字 | |
29 | - private String name; | |
30 | - //年龄 | |
31 | - private Integer age; | |
32 | - //孕周 | |
33 | - private String dueWeek; | |
34 | - //预产期 | |
35 | - private String yChanQi; | |
36 | - //手机号 | |
37 | - private String phone; | |
38 | - //高危因素 | |
39 | - private String riskFactor; | |
40 | - //高危评分 | |
41 | - private String riskScore; | |
42 | - //备注 | |
43 | - private String remarks;*/ | |
21 | + /* //名字 | |
22 | + private String name; | |
23 | + //年龄 | |
24 | + private Integer age; | |
25 | + //孕周 | |
26 | + private String dueWeek; | |
27 | + //预产期 | |
28 | + private String yChanQi; | |
29 | + //手机号 | |
30 | + private String phone; | |
31 | + //高危因素 | |
32 | + private String riskFactor; | |
33 | + //高危评分 | |
34 | + private String riskScore; | |
35 | + //备注 | |
36 | + private String remarks;*/ | |
44 | 37 | //末次月经 |
45 | 38 | private String lastMenses; |
46 | 39 | |
47 | - /**初检信息 **/ | |
40 | + /** | |
41 | + * 初检信息 | |
42 | + **/ | |
48 | 43 | // 既往史 |
49 | - private Map pastHistory ; | |
44 | + private Map pastHistory; | |
50 | 45 | // 家族史 |
51 | - private Map familyHistory ; | |
46 | + private Map familyHistory; | |
52 | 47 | //个人史 |
53 | 48 | private Map personalHistory; |
54 | 49 | //疫苗接种史 |
55 | - private Map ymjzHistory ; | |
50 | + private Map ymjzHistory; | |
56 | 51 | //药物过敏史 |
57 | - private Map ywgmHistory ; | |
52 | + private Map ywgmHistory; | |
58 | 53 | //妇科手术史 |
59 | - private Map fksxHistory ; | |
54 | + private Map fksxHistory; | |
60 | 55 | // 叶酸服用 |
61 | - private Map ysfyHistory ; | |
56 | + private Map ysfyHistory; | |
62 | 57 | //孕次 |
63 | 58 | private String pregnancyTimes; |
64 | 59 | // 产次 |
65 | 60 | |
66 | 61 | |
67 | 62 | |
68 | 63 | |
... | ... | @@ -72,40 +67,40 @@ |
72 | 67 | //死胎 |
73 | 68 | private String stillbirth; |
74 | 69 | //死产 |
75 | - private String stillChan ; | |
70 | + private String stillChan; | |
76 | 71 | //新生儿死亡 |
77 | 72 | private String neoDeath; |
78 | 73 | //出生缺陷 |
79 | 74 | private String birthDefect; |
80 | 75 | // 身高 |
81 | - private String height; | |
82 | - //体重 | |
83 | - private String weight ; | |
84 | - //孕前体重 | |
85 | - private String yqWeight ; | |
86 | - //体重指数 | |
87 | - private String baricIndex ; | |
88 | - // 本次妊娠情况 | |
76 | + private String height; | |
77 | + //体重 | |
78 | + private String weight; | |
79 | + //孕前体重 | |
80 | + private String yqWeight; | |
81 | + //体重指数 | |
82 | + private String baricIndex; | |
83 | + // 本次妊娠情况 | |
89 | 84 | private Map cestationInfo; |
90 | - // 宫高 | |
91 | - private String gonggao ; | |
92 | - //腹围 | |
93 | - private String fuwei ; | |
94 | - // 胎数 | |
85 | + // 宫高 | |
86 | + private String gonggao; | |
87 | + //腹围 | |
88 | + private String fuwei; | |
89 | + // 胎数 | |
95 | 90 | private int tireNumber1; |
96 | 91 | |
97 | 92 | |
98 | 93 | private List<MatDeliverAddRequest.Placenta> placentas; |
99 | - /* //心率 | |
100 | - private double heartRate; | |
101 | - //胎方位 | |
102 | - private String fetalPosition; | |
103 | - //胎先露 | |
104 | - private String fetalPresentation; | |
105 | - // 衔接 | |
106 | - private String join;*/ | |
94 | + /* //心率 | |
95 | + private double heartRate; | |
96 | + //胎方位 | |
97 | + private String fetalPosition; | |
98 | + //胎先露 | |
99 | + private String fetalPresentation; | |
100 | + // 衔接 | |
101 | + private String join;*/ | |
107 | 102 | //高危因素 |
108 | - private String highrisk ; | |
103 | + private List highrisk; | |
109 | 104 | //高危评分 |
110 | 105 | private String highriskSocre; |
111 | 106 | // 其他高危 |
112 | 107 | |
113 | 108 | |
114 | 109 | |
115 | 110 | |
116 | 111 | |
117 | 112 | |
118 | 113 | |
119 | 114 | |
120 | 115 | |
121 | 116 | |
122 | 117 | |
123 | 118 | |
124 | 119 | |
125 | 120 | |
126 | 121 | |
... | ... | @@ -124,47 +119,49 @@ |
124 | 119 | private Map nextCheckTime; |
125 | 120 | |
126 | 121 | |
127 | -/**-------------辅助检查结果录入------------------**/ | |
122 | + /** | |
123 | + * -------------辅助检查结果录入------------------ | |
124 | + **/ | |
128 | 125 | //血红蛋白值 |
129 | - private String xhdb ; | |
126 | + private String xhdb; | |
130 | 127 | //白细胞计数值 |
131 | - private String bxbjs ; | |
128 | + private String bxbjs; | |
132 | 129 | //血小板 |
133 | 130 | private String platelet; |
134 | 131 | // 血常规其他 |
135 | - private String chgOther ; | |
132 | + private String chgOther; | |
136 | 133 | // 尿蛋白 |
137 | 134 | private String ndb; |
138 | 135 | //尿糖 |
139 | 136 | private String nt; |
140 | 137 | //尿同体 |
141 | - private String urineKetone ; | |
138 | + private String urineKetone; | |
142 | 139 | // 尿潜血 |
143 | - private String bld ; | |
140 | + private String bld; | |
144 | 141 | //尿常规其他 |
145 | 142 | private String ncgOther; |
146 | 143 | //ABO |
147 | - private String abo ; | |
144 | + private String abo; | |
148 | 145 | // rh |
149 | - private String rh ; | |
146 | + private String rh; | |
150 | 147 | // 血糖 |
151 | 148 | private String bloodSugar; |
152 | 149 | //B超 |
153 | - private String bChao ; | |
150 | + private String bChao; | |
154 | 151 | //胎数 |
155 | - private String tireNumber ; | |
152 | + private String tireNumber; | |
156 | 153 | //血清谷丙转氨酶 |
157 | - private String xqgbzam ; | |
154 | + private String xqgbzam; | |
158 | 155 | //血清谷草转氨酶 |
159 | - private String xqgczam ; | |
156 | + private String xqgczam; | |
160 | 157 | //白蛋白 |
161 | - private String albumin ; | |
158 | + private String albumin; | |
162 | 159 | //总胆红素 |
163 | - private String totalBilirubin; | |
160 | + private String totalBilirubin; | |
164 | 161 | // 结合胆红素 |
165 | - private String jhBilirubin ; | |
162 | + private String jhBilirubin; | |
166 | 163 | //乙肝表面抗原 |
167 | - private String ygbmky; | |
164 | + private String ygbmky; | |
168 | 165 | //乙肝表面抗体 |
169 | 166 | private String ygbmkt; |
170 | 167 | //乙肝e抗原 |
171 | 168 | |
172 | 169 | |
173 | 170 | |
174 | 171 | |
175 | 172 | |
176 | 173 | |
... | ... | @@ -172,19 +169,19 @@ |
172 | 169 | //乙肝e抗体 |
173 | 170 | private String ygekt; |
174 | 171 | // 乙肝核心抗体 |
175 | - private String yghxkt; | |
172 | + private String yghxkt; | |
176 | 173 | // 血清肌 |
177 | - private String xqjq; | |
174 | + private String xqjq; | |
178 | 175 | // 血尿素氮 |
179 | - private String xnsd; | |
176 | + private String xnsd; | |
180 | 177 | // 梅毒血清实验 |
181 | - private String mdxqsy; | |
178 | + private String mdxqsy; | |
182 | 179 | // hit抗体检测 |
183 | - private String hivkt; | |
180 | + private String hivkt; | |
184 | 181 | // 阴道分泌物 |
185 | - private Map ydfmw; | |
182 | + private Map ydfmw; | |
186 | 183 | // 阴道清洁度 |
187 | - private String ydqjd; | |
184 | + private String ydqjd; | |
188 | 185 | |
189 | 186 | |
190 | 187 | public String getAbo() { |
... | ... | @@ -204,7 +201,6 @@ |
204 | 201 | } |
205 | 202 | |
206 | 203 | |
207 | - | |
208 | 204 | public String getAlbumin() { |
209 | 205 | return albumin; |
210 | 206 | } |
... | ... | @@ -310,8 +306,6 @@ |
310 | 306 | } |
311 | 307 | |
312 | 308 | |
313 | - | |
314 | - | |
315 | 309 | public String getFuwei() { |
316 | 310 | return fuwei; |
317 | 311 | } |
318 | 312 | |
... | ... | @@ -336,11 +330,11 @@ |
336 | 330 | this.height = height; |
337 | 331 | } |
338 | 332 | |
339 | - public String getHighrisk() { | |
333 | + public List getHighrisk() { | |
340 | 334 | return highrisk; |
341 | 335 | } |
342 | 336 | |
343 | - public void setHighrisk(String highrisk) { | |
337 | + public void setHighrisk(List highrisk) { | |
344 | 338 | this.highrisk = highrisk; |
345 | 339 | } |
346 | 340 | |
... | ... | @@ -393,7 +387,6 @@ |
393 | 387 | } |
394 | 388 | |
395 | 389 | |
396 | - | |
397 | 390 | public String getNcgOther() { |
398 | 391 | return ncgOther; |
399 | 392 | } |
... | ... | @@ -491,7 +484,6 @@ |
491 | 484 | } |
492 | 485 | |
493 | 486 | |
494 | - | |
495 | 487 | public String getStillbirth() { |
496 | 488 | return stillbirth; |
497 | 489 | } |
498 | 490 | |
499 | 491 | |
500 | 492 | |
501 | 493 | |
502 | 494 | |
503 | 495 | |
504 | 496 | |
505 | 497 | |
... | ... | @@ -734,50 +726,36 @@ |
734 | 726 | } |
735 | 727 | |
736 | 728 | public AntexChuResult convertToResult(AntExChuModel antExChuModel) { |
737 | - if(null!=antExChuModel){ | |
729 | + if (null != antExChuModel) { | |
738 | 730 | setId(antExChuModel.getId()); |
739 | 731 | setParentId(antExChuModel.getParentId()); |
740 | 732 | try { |
741 | - | |
742 | 733 | setPastHistory(JsonUtil.str2Obj(antExChuModel.getPastHistory(), Map.class)); |
743 | - }catch (Exception e){ | |
744 | - | |
734 | + } catch (Exception e) { | |
745 | 735 | } |
746 | 736 | try { |
747 | 737 | setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(), Map.class)); |
748 | - | |
749 | - }catch (Exception e){ | |
750 | - | |
738 | + } catch (Exception e) { | |
751 | 739 | } |
752 | 740 | try { |
753 | 741 | setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(), Map.class)); |
754 | - | |
755 | - }catch (Exception e){ | |
756 | - | |
742 | + } catch (Exception e) { | |
757 | 743 | } |
758 | 744 | try { |
759 | 745 | setYmjzHistory(JsonUtil.str2Obj(antExChuModel.getYmjzHistory(), Map.class)); |
760 | - | |
761 | - }catch (Exception e){ | |
762 | - | |
746 | + } catch (Exception e) { | |
763 | 747 | } |
764 | 748 | try { |
765 | 749 | setYwgmHistory(JsonUtil.str2Obj(antExChuModel.getYwgmHistory(), Map.class)); |
766 | - | |
767 | - }catch (Exception e){ | |
768 | - | |
750 | + } catch (Exception e) { | |
769 | 751 | } |
770 | 752 | try { |
771 | 753 | setFksxHistory(JsonUtil.str2Obj(antExChuModel.getFksxHistory(), Map.class)); |
772 | - | |
773 | - }catch (Exception e){ | |
774 | - | |
754 | + } catch (Exception e) { | |
775 | 755 | } |
776 | 756 | try { |
777 | 757 | setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class)); |
778 | - | |
779 | - }catch (Exception e){ | |
780 | - | |
758 | + } catch (Exception e) { | |
781 | 759 | } |
782 | 760 | setPregnancyTimes(antExChuModel.getPregnancyTimes()); |
783 | 761 | setProdTime(antExChuModel.getProdTime()); |
784 | 762 | |
... | ... | @@ -792,11 +770,10 @@ |
792 | 770 | setWeight(antExChuModel.getWeight()); |
793 | 771 | setYqWeight(antExChuModel.getYqWeight()); |
794 | 772 | setBaricIndex(antExChuModel.getBaricIndex()); |
773 | + setHighrisk(JsonUtil.toList(antExChuModel.getHighrisk(), List.class)); | |
795 | 774 | try { |
796 | - | |
797 | - setCestationInfo(JsonUtil.str2Obj(antExChuModel.getCestationInfo(),Map.class)); | |
798 | - }catch (Exception e){ | |
799 | - | |
775 | + setCestationInfo(JsonUtil.str2Obj(antExChuModel.getCestationInfo(), Map.class)); | |
776 | + } catch (Exception e) { | |
800 | 777 | } |
801 | 778 | setGonggao(antExChuModel.getGonggao()); |
802 | 779 | setFuwei(antExChuModel.getFuwei()); |
... | ... | @@ -811,8 +788,8 @@ |
811 | 788 | setCheckTime(antExChuModel.getCheckTime()); |
812 | 789 | try { |
813 | 790 | |
814 | - setNextCheckTime(JsonUtil.str2Obj(antExChuModel.getNextCheckTime(),Map.class)); | |
815 | - }catch (Exception e){ | |
791 | + setNextCheckTime(JsonUtil.str2Obj(antExChuModel.getNextCheckTime(), Map.class)); | |
792 | + } catch (Exception e) { | |
816 | 793 | |
817 | 794 | } |
818 | 795 | setAbo(antExChuModel.getAbortion()); |
... | ... | @@ -844,7 +821,7 @@ |
844 | 821 | setXnsd(antExChuModel.getXnsd()); |
845 | 822 | setMdxqsy(antExChuModel.getMdxqsy()); |
846 | 823 | setHivkt(antExChuModel.getHivkt()); |
847 | - setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(),Map.class)); | |
824 | + setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class)); | |
848 | 825 | setYdqjd(antExChuModel.getYdqjd()); |
849 | 826 | } |
850 | 827 | return this; |