Commit 8e5270803e7db4adc425e55af7bbb6bbf8ee0c45
1 parent
4a1c839649
Exists in
master
and in
6 other branches
诸城人民医院
Showing 3 changed files with 34 additions and 20 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
View file @
8e52708
| ... | ... | @@ -366,22 +366,22 @@ |
| 366 | 366 | private Integer monthCompliance; |
| 367 | 367 | |
| 368 | 368 | //妊娠异常 |
| 369 | - private Integer pregnancyExcpetion; | |
| 369 | + private String pregnancyExcpetion; | |
| 370 | 370 | |
| 371 | - public Integer getPregnancyExcpetion() { | |
| 372 | - return pregnancyExcpetion; | |
| 373 | - } | |
| 374 | - | |
| 375 | - public void setPregnancyExcpetion(Integer pregnancyExcpetion) { | |
| 376 | - this.pregnancyExcpetion = pregnancyExcpetion; | |
| 377 | - } | |
| 378 | - | |
| 379 | 371 | public Integer getPregnancyMethod() { |
| 380 | 372 | return pregnancyMethod; |
| 381 | 373 | } |
| 382 | 374 | |
| 383 | 375 | public void setPregnancyMethod(Integer pregnancyMethod) { |
| 384 | 376 | this.pregnancyMethod = pregnancyMethod; |
| 377 | + } | |
| 378 | + | |
| 379 | + public String getPregnancyExcpetion() { | |
| 380 | + return pregnancyExcpetion; | |
| 381 | + } | |
| 382 | + | |
| 383 | + public void setPregnancyExcpetion(String pregnancyExcpetion) { | |
| 384 | + this.pregnancyExcpetion = pregnancyExcpetion; | |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | public Integer getMonthCompliance() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
8e52708
| ... | ... | @@ -2128,7 +2128,21 @@ |
| 2128 | 2128 | |
| 2129 | 2129 | map.put("monthCompliance",data.getMonthCompliance() == null ? "" : data.getMonthCompliance() == 1 ? "是" : "否"); |
| 2130 | 2130 | map.put("pregnancyMethod", data.getPregnancyMethod() == null ? "" : PregnancyMethodEnums.getNameById(data.getPregnancyMethod())); |
| 2131 | - map.put("pregnancyMethod", data.getPregnancyExcpetion() == null ? "" : PregnancyExceptionEnums.getNameById(data.getPregnancyExcpetion())); | |
| 2131 | + | |
| 2132 | + StringBuilder pe = new StringBuilder(); | |
| 2133 | + if (StringUtils.isNotEmpty(data.getPregnancyExcpetion())) | |
| 2134 | + { | |
| 2135 | + String[] arrs = data.getPregnancyExcpetion().split(","); | |
| 2136 | + for (int i = 0 ; i < arrs.length ; i++) | |
| 2137 | + { | |
| 2138 | + pe.append(PregnancyExceptionEnums.getNameById(Integer.valueOf(arrs[i]))); | |
| 2139 | + if (i != arrs.length - 1) | |
| 2140 | + { | |
| 2141 | + pe.append(","); | |
| 2142 | + } | |
| 2143 | + } | |
| 2144 | + } | |
| 2145 | + map.put("PregnancyExcpetion",pe.toString()); | |
| 2132 | 2146 | |
| 2133 | 2147 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 2134 | 2148 | br.setErrormsg("成功"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
8e52708
| ... | ... | @@ -355,20 +355,12 @@ |
| 355 | 355 | |
| 356 | 356 | //妊娠方法 |
| 357 | 357 | private Integer pregnancyMethod; |
| 358 | - //符合月份 1是 2否 | |
| 358 | + //符合月份 1是 2否 | |
| 359 | 359 | private Integer monthCompliance; |
| 360 | 360 | |
| 361 | 361 | //妊娠异常 |
| 362 | - private Integer pregnancyExcpetion; | |
| 362 | + private String pregnancyExcpetion; | |
| 363 | 363 | |
| 364 | - public Integer getPregnancyExcpetion() { | |
| 365 | - return pregnancyExcpetion; | |
| 366 | - } | |
| 367 | - | |
| 368 | - public void setPregnancyExcpetion(Integer pregnancyExcpetion) { | |
| 369 | - this.pregnancyExcpetion = pregnancyExcpetion; | |
| 370 | - } | |
| 371 | - | |
| 372 | 364 | public Integer getPregnancyMethod() { |
| 373 | 365 | return pregnancyMethod; |
| 374 | 366 | } |
| ... | ... | @@ -383,6 +375,14 @@ |
| 383 | 375 | |
| 384 | 376 | public void setMonthCompliance(Integer monthCompliance) { |
| 385 | 377 | this.monthCompliance = monthCompliance; |
| 378 | + } | |
| 379 | + | |
| 380 | + public String getPregnancyExcpetion() { | |
| 381 | + return pregnancyExcpetion; | |
| 382 | + } | |
| 383 | + | |
| 384 | + public void setPregnancyExcpetion(String pregnancyExcpetion) { | |
| 385 | + this.pregnancyExcpetion = pregnancyExcpetion; | |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | public String getConfigItemId() { |