jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4e1f3359dd9390eb8e000fd25797f87b2a950c03

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

产检增加流产相关字段

Showing 4 changed files with 41 additions and 33 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 4e1f335
... ... @@ -105,11 +105,11 @@
105 105 //丈夫健康情况
106 106 private String hHealthInfo;
107 107 //引产
108   - private String yinchan;
  108 + private Integer yinchan;
109 109 //宫外孕
110   - private String gongwaiyun;
  110 + private Integer gongwaiyun;
111 111 //药物流产次数
112   - private String yaowu;
  112 + private Integer yaowu;
113 113 //自然流产
114 114 private Integer abortionZR;
115 115 //人工流产
116 116  
117 117  
118 118  
119 119  
120 120  
... ... @@ -187,27 +187,27 @@
187 187 return hospitalId;
188 188 }
189 189  
190   - public String getYinchan() {
  190 + public Integer getYinchan() {
191 191 return yinchan;
192 192 }
193 193  
194   - public void setYinchan(String yinchan) {
  194 + public void setYinchan(Integer yinchan) {
195 195 this.yinchan = yinchan;
196 196 }
197 197  
198   - public String getGongwaiyun() {
  198 + public Integer getGongwaiyun() {
199 199 return gongwaiyun;
200 200 }
201 201  
202   - public void setGongwaiyun(String gongwaiyun) {
  202 + public void setGongwaiyun(Integer gongwaiyun) {
203 203 this.gongwaiyun = gongwaiyun;
204 204 }
205 205  
206   - public String getYaowu() {
  206 + public Integer getYaowu() {
207 207 return yaowu;
208 208 }
209 209  
210   - public void setYaowu(String yaowu) {
  210 + public void setYaowu(Integer yaowu) {
211 211 this.yaowu = yaowu;
212 212 }
213 213  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4e1f335
... ... @@ -281,7 +281,6 @@
281 281 /* 基本信息 */
282 282 //孕妇基本信息
283 283 map.put("id", data.getId());
284   - map.put("yaowu", data.getYaowu());
285 284 map.put("birthDefectTodo", data.getBirthDefectTodo());
286 285 map.put("diagnosisOther", data.getDiagnosisOther());
287 286 map.put("username", patients.getUsername());
288 287  
... ... @@ -399,13 +398,22 @@
399 398 map.put("yinchan", UnitUtils.unitSplice(data.getYinchan(), UnitConstants.CI));
400 399 map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI));
401 400 //流产
402   - String abortion = "";
403   - abortion = UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI);
404   - if (data.getAbortionZR() != null && data.getAbortionRG() != null) {
405   - abortion += "(自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" +
406   - data.getAbortionRG() + UnitConstants.CI + ")";
  401 + StringBuffer abortion = new StringBuffer();
  402 + abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI));
  403 + abortion.append("（");
  404 +
  405 + if (data.getAbortionZR() != null) {
  406 + abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI );
407 407 }
408 408  
  409 + if(data.getAbortionRG() != null){
  410 + abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + "");
  411 + }
  412 +
  413 + if(data.getYaowu()!=null){
  414 + abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + "");
  415 + }
  416 + abortion.append("）");
409 417  
410 418 map.put("abortion", abortion);
411 419  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 4e1f335
... ... @@ -192,11 +192,11 @@
192 192 //实验结果
193 193 private String syjg;
194 194 //引产
195   - private String yinchan;
  195 + private Integer yinchan;
196 196 //宫外孕
197   - private String gongwaiyun;
  197 + private Integer gongwaiyun;
198 198 //药物流产次数
199   - private String yaowu;
  199 + private Integer yaowu;
200 200 //自然流产
201 201 private Integer abortionZR;
202 202 //人工流产
203 203  
204 204  
205 205  
206 206  
207 207  
... ... @@ -255,27 +255,27 @@
255 255 this.couponType = couponType;
256 256 }
257 257  
258   - public String getYinchan() {
  258 + public Integer getYinchan() {
259 259 return yinchan;
260 260 }
261 261  
262   - public void setYinchan(String yinchan) {
  262 + public void setYinchan(Integer yinchan) {
263 263 this.yinchan = yinchan;
264 264 }
265 265  
266   - public String getGongwaiyun() {
  266 + public Integer getGongwaiyun() {
267 267 return gongwaiyun;
268 268 }
269 269  
270   - public void setGongwaiyun(String gongwaiyun) {
  270 + public void setGongwaiyun(Integer gongwaiyun) {
271 271 this.gongwaiyun = gongwaiyun;
272 272 }
273 273  
274   - public String getYaowu() {
  274 + public Integer getYaowu() {
275 275 return yaowu;
276 276 }
277 277  
278   - public void setYaowu(String yaowu) {
  278 + public void setYaowu(Integer yaowu) {
279 279 this.yaowu = yaowu;
280 280 }
281 281  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 4e1f335
... ... @@ -80,11 +80,11 @@
80 80 // 顺产
81 81 private Integer delivery;
82 82 //引产
83   - private String yinchan;
  83 + private Integer yinchan;
84 84 //宫外孕
85   - private String gongwaiyun;
  85 + private Integer gongwaiyun;
86 86 //药物流产次数
87   - private String yaowu;
  87 + private Integer yaowu;
88 88 //刨宫产
89 89 private Integer planedProd;
90 90 //流产
91 91  
92 92  
93 93  
94 94  
95 95  
... ... @@ -491,27 +491,27 @@
491 491 return gonggao;
492 492 }
493 493  
494   - public String getYinchan() {
  494 + public Integer getYinchan() {
495 495 return yinchan;
496 496 }
497 497  
498   - public void setYinchan(String yinchan) {
  498 + public void setYinchan(Integer yinchan) {
499 499 this.yinchan = yinchan;
500 500 }
501 501  
502   - public String getGongwaiyun() {
  502 + public Integer getGongwaiyun() {
503 503 return gongwaiyun;
504 504 }
505 505  
506   - public void setGongwaiyun(String gongwaiyun) {
  506 + public void setGongwaiyun(Integer gongwaiyun) {
507 507 this.gongwaiyun = gongwaiyun;
508 508 }
509 509  
510   - public String getYaowu() {
  510 + public Integer getYaowu() {
511 511 return yaowu;
512 512 }
513 513  
514   - public void setYaowu(String yaowu) {
  514 + public void setYaowu(Integer yaowu) {
515 515 this.yaowu = yaowu;
516 516 }
517 517