Commit 8b6c6c2bba4460e8d6697efffb0cc8b099cec221
1 parent
8ee72946aa
Exists in
master
and in
6 other branches
荣成男女婚检建档字段增加
Showing 2 changed files with 227 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
8b6c6c2
... | ... | @@ -4677,6 +4677,32 @@ |
4677 | 4677 | result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDay())); |
4678 | 4678 | result.setId(model.getId()); |
4679 | 4679 | |
4680 | + result.setCcnl(model.getCcnl()); | |
4681 | + if(null != model.getMcyj()){ | |
4682 | + result.setMcyj(DateUtil.getyyyy_MM_dd(model.getMcyj())); | |
4683 | + } | |
4684 | + result.setIsOrNotGl(model.getIsOrNotGl()); | |
4685 | + result.setJq(model.getJq()); | |
4686 | + result.setZq(model.getZq()); | |
4687 | + result.setYjl(model.getYjl()); | |
4688 | + result.setTj(model.getTj()); | |
4689 | + result.setIsOrNotHy(model.getIsOrNotHy()); | |
4690 | + result.setHycs(model.getHycs()); | |
4691 | + result.setHccs(model.getHccs()); | |
4692 | + result.setZyhc(model.getZyhc()); | |
4693 | + result.setZccs(model.getZccs()); | |
4694 | + result.setIsOrNotRsjj(model.getIsOrNotRsjj()); | |
4695 | + result.setStsc(model.getStsc()); | |
4696 | + result.setZylc(model.getZylc()); | |
4697 | + result.setRglc(model.getRglc()); | |
4698 | + result.setIsOrNotQxe(model.getIsOrNotQxe()); | |
4699 | + result.setBz(model.getBz()); | |
4700 | + result.setXxqk(model.getXxqk()); | |
4701 | + result.setXyzns(model.getXyzns()); | |
4702 | + result.setZnstzk(model.getZnstzk()); | |
4703 | + result.setJtbm(model.getJtbm()); | |
4704 | + | |
4705 | + | |
4680 | 4706 | return result; |
4681 | 4707 | } |
4682 | 4708 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java
View file @
8b6c6c2
1 | 1 | package com.lyms.platform.operate.web.result; |
2 | 2 | |
3 | 3 | |
4 | +import java.util.Date; | |
4 | 5 | |
5 | - | |
6 | 6 | public class ResidentsPageResult { |
7 | 7 | |
8 | 8 | /************基本信息*************/ |
... | ... | @@ -85,6 +85,206 @@ |
85 | 85 | //建档号 |
86 | 86 | private String id; |
87 | 87 | |
88 | + /***********荣成新增女性建档字段**********/ | |
89 | + private String ccnl;//初潮年龄 | |
90 | + private String mcyj;//末次月经时间 | |
91 | + private String isOrNotGl;//月经周期是否规律(0:否;1:是;默认为1) | |
92 | + private String jq;//经期 | |
93 | + private String zq;//周期 | |
94 | + private String yjl;//月经量(0:多;1:中;2:少;默认为1) | |
95 | + private String tj;//痛经(0:无;1:轻;2:重;默认为1) | |
96 | + private String isOrNotHy;//是否曾经怀孕(0:无;1:有;默认为0) | |
97 | + private String hycs;//怀孕次数 | |
98 | + private String hccs;//活产次数 | |
99 | + private String zyhc;//足月活产次数 | |
100 | + private String zccs;//早产次数 | |
101 | + private String isOrNotRsjj;//是否有以下不良妊娠结局(0:无;默认为0) | |
102 | + private String stsc;//死胎死产次数 | |
103 | + private String zylc;//自然流产次数 | |
104 | + private String rglc;//人工流产次数 | |
105 | + private String isOrNotQxe;//是否分娩过出生缺陷儿(0:无;1:是;默认为0) | |
106 | + private String bz;//病种 | |
107 | + private String xxqk;//详细情况 | |
108 | + private String xyzns;//现有子女数 | |
109 | + private String znstzk;//子女身体状况(0:健康;1:疾病) | |
110 | + private String jtbm;//注明具体病名 | |
111 | + | |
112 | + | |
113 | + public String getCcnl() { | |
114 | + return ccnl; | |
115 | + } | |
116 | + | |
117 | + public void setCcnl(String ccnl) { | |
118 | + this.ccnl = ccnl; | |
119 | + } | |
120 | + | |
121 | + public String getMcyj() { | |
122 | + return mcyj; | |
123 | + } | |
124 | + | |
125 | + public void setMcyj(String mcyj) { | |
126 | + this.mcyj = mcyj; | |
127 | + } | |
128 | + | |
129 | + public String getIsOrNotGl() { | |
130 | + return isOrNotGl; | |
131 | + } | |
132 | + | |
133 | + public void setIsOrNotGl(String isOrNotGl) { | |
134 | + this.isOrNotGl = isOrNotGl; | |
135 | + } | |
136 | + | |
137 | + public String getJq() { | |
138 | + return jq; | |
139 | + } | |
140 | + | |
141 | + public void setJq(String jq) { | |
142 | + this.jq = jq; | |
143 | + } | |
144 | + | |
145 | + public String getZq() { | |
146 | + return zq; | |
147 | + } | |
148 | + | |
149 | + public void setZq(String zq) { | |
150 | + this.zq = zq; | |
151 | + } | |
152 | + | |
153 | + public String getYjl() { | |
154 | + return yjl; | |
155 | + } | |
156 | + | |
157 | + public void setYjl(String yjl) { | |
158 | + this.yjl = yjl; | |
159 | + } | |
160 | + | |
161 | + public String getTj() { | |
162 | + return tj; | |
163 | + } | |
164 | + | |
165 | + public void setTj(String tj) { | |
166 | + this.tj = tj; | |
167 | + } | |
168 | + | |
169 | + public String getIsOrNotHy() { | |
170 | + return isOrNotHy; | |
171 | + } | |
172 | + | |
173 | + public void setIsOrNotHy(String isOrNotHy) { | |
174 | + this.isOrNotHy = isOrNotHy; | |
175 | + } | |
176 | + | |
177 | + public String getHycs() { | |
178 | + return hycs; | |
179 | + } | |
180 | + | |
181 | + public void setHycs(String hycs) { | |
182 | + this.hycs = hycs; | |
183 | + } | |
184 | + | |
185 | + public String getHccs() { | |
186 | + return hccs; | |
187 | + } | |
188 | + | |
189 | + public void setHccs(String hccs) { | |
190 | + this.hccs = hccs; | |
191 | + } | |
192 | + | |
193 | + public String getZyhc() { | |
194 | + return zyhc; | |
195 | + } | |
196 | + | |
197 | + public void setZyhc(String zyhc) { | |
198 | + this.zyhc = zyhc; | |
199 | + } | |
200 | + | |
201 | + public String getZccs() { | |
202 | + return zccs; | |
203 | + } | |
204 | + | |
205 | + public void setZccs(String zccs) { | |
206 | + this.zccs = zccs; | |
207 | + } | |
208 | + | |
209 | + public String getIsOrNotRsjj() { | |
210 | + return isOrNotRsjj; | |
211 | + } | |
212 | + | |
213 | + public void setIsOrNotRsjj(String isOrNotRsjj) { | |
214 | + this.isOrNotRsjj = isOrNotRsjj; | |
215 | + } | |
216 | + | |
217 | + public String getStsc() { | |
218 | + return stsc; | |
219 | + } | |
220 | + | |
221 | + public void setStsc(String stsc) { | |
222 | + this.stsc = stsc; | |
223 | + } | |
224 | + | |
225 | + public String getZylc() { | |
226 | + return zylc; | |
227 | + } | |
228 | + | |
229 | + public void setZylc(String zylc) { | |
230 | + this.zylc = zylc; | |
231 | + } | |
232 | + | |
233 | + public String getRglc() { | |
234 | + return rglc; | |
235 | + } | |
236 | + | |
237 | + public void setRglc(String rglc) { | |
238 | + this.rglc = rglc; | |
239 | + } | |
240 | + | |
241 | + public String getIsOrNotQxe() { | |
242 | + return isOrNotQxe; | |
243 | + } | |
244 | + | |
245 | + public void setIsOrNotQxe(String isOrNotQxe) { | |
246 | + this.isOrNotQxe = isOrNotQxe; | |
247 | + } | |
248 | + | |
249 | + public String getBz() { | |
250 | + return bz; | |
251 | + } | |
252 | + | |
253 | + public void setBz(String bz) { | |
254 | + this.bz = bz; | |
255 | + } | |
256 | + | |
257 | + public String getXxqk() { | |
258 | + return xxqk; | |
259 | + } | |
260 | + | |
261 | + public void setXxqk(String xxqk) { | |
262 | + this.xxqk = xxqk; | |
263 | + } | |
264 | + | |
265 | + public String getXyzns() { | |
266 | + return xyzns; | |
267 | + } | |
268 | + | |
269 | + public void setXyzns(String xyzns) { | |
270 | + this.xyzns = xyzns; | |
271 | + } | |
272 | + | |
273 | + public String getZnstzk() { | |
274 | + return znstzk; | |
275 | + } | |
276 | + | |
277 | + public void setZnstzk(String znstzk) { | |
278 | + this.znstzk = znstzk; | |
279 | + } | |
280 | + | |
281 | + public String getJtbm() { | |
282 | + return jtbm; | |
283 | + } | |
284 | + | |
285 | + public void setJtbm(String jtbm) { | |
286 | + this.jtbm = jtbm; | |
287 | + } | |
88 | 288 | |
89 | 289 | public String getSpouseName() { |
90 | 290 | return spouseName; |