Commit 21c632878f0d223ed646e407c2c72fe7b4476ffa
1 parent
0be88b2d9c
Exists in
dev
#fix:新增儿童出生详细地址字段
Showing 2 changed files with 6 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java
View file @
21c6328
| 1 | 1 | package com.lyms.platform.operate.web.controller; |
| 2 | 2 | |
| 3 | -import com.alibaba.fastjson.JSONObject; | |
| 4 | 3 | import com.lyms.platform.biz.service.ArchiveDataServicer; |
| 5 | -import com.lyms.platform.biz.service.PatientsService; | |
| 6 | 4 | import com.lyms.platform.common.annotation.TokenRequired; |
| 7 | 5 | import com.lyms.platform.common.base.BaseController; |
| 8 | 6 | import com.lyms.platform.common.base.LoginContext; |
| ... | ... | @@ -14,7 +12,6 @@ |
| 14 | 12 | import com.lyms.platform.operate.web.facade.PatientServiceFacade; |
| 15 | 13 | import com.lyms.platform.operate.web.facade.ViewFacade; |
| 16 | 14 | import com.lyms.platform.operate.web.result.BirthResult; |
| 17 | -import com.lyms.platform.operate.web.vo.ArchiveUsers; | |
| 18 | 15 | import com.lyms.platform.pojo.ArchiveData; |
| 19 | 16 | import com.lyms.platform.query.ArchiveDataQuery; |
| 20 | 17 | import com.lyms.platform.query.PatientsQuery; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
21c6328
| ... | ... | @@ -1898,12 +1898,12 @@ |
| 1898 | 1898 | baseResponse.setErrormsg("数据异常"); |
| 1899 | 1899 | return baseResponse; |
| 1900 | 1900 | } |
| 1901 | - Patients mPatients= patientsService.findOnePatientById(birthResult.getParentId()); | |
| 1901 | + /* Patients mPatients= patientsService.findOnePatientById(birthResult.getParentId()); | |
| 1902 | 1902 | if (mPatients==null){ |
| 1903 | 1903 | baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
| 1904 | 1904 | baseResponse.setErrormsg("数据异常"); |
| 1905 | 1905 | return baseResponse; |
| 1906 | - } | |
| 1906 | + }*/ | |
| 1907 | 1907 | Patients patients=new Patients(); |
| 1908 | 1908 | BeanUtils.copy(birthResult, patients); |
| 1909 | 1909 | patients.setId(birthResult.getParentId()); |
| ... | ... | @@ -1913,7 +1913,7 @@ |
| 1913 | 1913 | for (BirthBabyResult birthBaby:babyResults){ |
| 1914 | 1914 | BabyModel babyModel=new BabyModel(); |
| 1915 | 1915 | if (StringUtils.isEmpty(birthBaby.getBabyId())){ |
| 1916 | - babyModel=getBabyModel(babyModel,mPatients); | |
| 1916 | + // babyModel=getBabyModel(babyModel,mPatients); | |
| 1917 | 1917 | }else { |
| 1918 | 1918 | babyModel.setId(birthBaby.getBabyId()); |
| 1919 | 1919 | } |
| ... | ... | @@ -1963,7 +1963,7 @@ |
| 1963 | 1963 | babyModel.setBlNo(birthBaby.getBlNo()); |
| 1964 | 1964 | } |
| 1965 | 1965 | if (StringUtils.isEmpty(babyModel.getId())){ |
| 1966 | - babyService.addOneBaby(babyModel); | |
| 1966 | + // babyService.addOneBaby(babyModel); | |
| 1967 | 1967 | }else { |
| 1968 | 1968 | babyService.updateOneBaby(babyModel,babyModel.getId()); |
| 1969 | 1969 | } |
| ... | ... | @@ -2094,6 +2094,7 @@ |
| 2094 | 2094 | } |
| 2095 | 2095 | birthBabyResult.setFirstName(babyModel.getFirstName()); |
| 2096 | 2096 | birthBabyResult.setLastName(babyModel.getLastName()); |
| 2097 | + birthBabyResult.setBabyAddress(babyModel.getBabyAddress()); | |
| 2097 | 2098 | list.add(birthBabyResult); |
| 2098 | 2099 | } |
| 2099 | 2100 | birthResult.setResultList(list); |
| ... | ... | @@ -2155,6 +2156,7 @@ |
| 2155 | 2156 | } |
| 2156 | 2157 | birthBabyResult.setFirstName(babyModel.getFirstName()); |
| 2157 | 2158 | birthBabyResult.setLastName(babyModel.getLastName()); |
| 2159 | + birthBabyResult.setBabyAddress(babyModel.getBabyAddress()); | |
| 2158 | 2160 | babyResults.add(birthBabyResult); |
| 2159 | 2161 | } |
| 2160 | 2162 | birthResult.setResultList(babyResults); |