Commit 7f8830ee86485b33079d75a2049cecd698899ce1
1 parent
63eceabebf
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 12 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
7f8830e
| ... | ... | @@ -23,10 +23,7 @@ |
| 23 | 23 | import com.lyms.platform.permission.dao.master.CouponMapper; |
| 24 | 24 | import com.lyms.platform.permission.service.CouponService; |
| 25 | 25 | import com.lyms.platform.permission.service.OrganizationService; |
| 26 | -import com.lyms.platform.pojo.BabyModel; | |
| 27 | -import com.lyms.platform.pojo.NewbornVisit; | |
| 28 | -import com.lyms.platform.pojo.Patients; | |
| 29 | -import com.lyms.platform.pojo.PersonModel; | |
| 26 | +import com.lyms.platform.pojo.*; | |
| 30 | 27 | import com.lyms.platform.query.BabyModelQuery; |
| 31 | 28 | import com.lyms.platform.query.PatientsQuery; |
| 32 | 29 | import org.apache.commons.collections.map.HashedMap; |
| 33 | 30 | |
| ... | ... | @@ -504,13 +501,23 @@ |
| 504 | 501 | restMap.put("newbornIdNo", newbornVisit.getNewbornIdNo()); |
| 505 | 502 | restMap.put("newbornBirthDate", newbornVisit.getNewbornBirthDate()); |
| 506 | 503 | restMap.put("motherName", newbornVisit.getMotherName()); |
| 507 | - restMap.put("motherOccupName", newbornVisit.getMotherOccupName()); | |
| 504 | + restMap.put("motherOccupName", getBasicConfig(newbornVisit.getMotherOccupName())); | |
| 508 | 505 | restMap.put("motherTelNo", newbornVisit.getMotherTelNo()); |
| 509 | 506 | restMap.put("motherBirthDate", newbornVisit.getMotherBirthDate()); |
| 510 | 507 | |
| 511 | 508 | return RespBuilder.buildSuccess(restMap); |
| 512 | 509 | } |
| 513 | 510 | return RespBuilder.buildSuccess(); |
| 511 | + } | |
| 512 | + private String getBasicConfig(String id) { | |
| 513 | + if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) { | |
| 514 | + return ""; | |
| 515 | + } | |
| 516 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); | |
| 517 | + if (null != basicConfig) { | |
| 518 | + return basicConfig.getName(); | |
| 519 | + } | |
| 520 | + return ""; | |
| 514 | 521 | } |
| 515 | 522 | |
| 516 | 523 | @Override |