Commit c538e7591c6c58cec2e466f493fc1775fbb982a0
1 parent
cbc0f7b68a
Exists in
master
and in
8 other branches
增加设置parentid
Showing 2 changed files with 13 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
c538e75
| ... | ... | @@ -8,7 +8,6 @@ |
| 8 | 8 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 9 | 9 | import com.lyms.platform.common.result.BaseResponse; |
| 10 | 10 | import com.lyms.platform.common.utils.DateUtil; |
| 11 | -import com.lyms.platform.common.utils.JsonUtil; | |
| 12 | 11 | import com.lyms.platform.common.utils.SystemConfig; |
| 13 | 12 | import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; |
| 14 | 13 | import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; |
| ... | ... | @@ -20,7 +19,10 @@ |
| 20 | 19 | import com.lyms.platform.permission.service.OrganizationService; |
| 21 | 20 | import com.lyms.platform.permission.service.UsersService; |
| 22 | 21 | import com.lyms.platform.pojo.*; |
| 23 | -import com.lyms.platform.query.*; | |
| 22 | +import com.lyms.platform.query.PatientsQuery; | |
| 23 | +import com.lyms.platform.query.ReferralApplyOrderQuery; | |
| 24 | +import com.lyms.platform.query.SieveApplyOrderQuery; | |
| 25 | +import com.lyms.platform.query.SieveQuery; | |
| 24 | 26 | import org.apache.commons.collections.CollectionUtils; |
| 25 | 27 | import org.apache.commons.lang.StringUtils; |
| 26 | 28 | import org.apache.commons.lang.math.NumberUtils; |
| ... | ... | @@ -59,6 +61,8 @@ |
| 59 | 61 | private BasicConfigService basicConfigService; |
| 60 | 62 | @Autowired |
| 61 | 63 | private BabyBookbuildingService babyBookbuildingService; |
| 64 | + @Autowired | |
| 65 | + private BabyCheckFacade babyCheckFacade; | |
| 62 | 66 | |
| 63 | 67 | /** |
| 64 | 68 | * 增加转诊申请 |
| 65 | 69 | |
| 66 | 70 | |
| 67 | 71 | |
| 68 | 72 | |
| 69 | 73 | |
| ... | ... | @@ -284,26 +288,21 @@ |
| 284 | 288 | if (null != zhuanc1) { |
| 285 | 289 | zhuanRname = zhuanc1.getName(); |
| 286 | 290 | } |
| 287 | - BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
| 291 | + /* BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
| 288 | 292 | babyModelQuery.setId(applyOrderModel.getParentId()); |
| 289 | 293 | babyModelQuery.setYn(YnEnums.YES.getId()); |
| 290 | - List<BabyModel> babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 294 | + List<BabyModel> babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);*/ | |
| 291 | 295 | babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); |
| 292 | - if(CollectionUtils.isNotEmpty(babyModel)){ | |
| 293 | - BabyModel model= babyModel.get(0); | |
| 296 | + List <String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); | |
| 294 | 297 | String diagnose = ""; |
| 295 | - if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getDiagnose())) { | |
| 296 | - List diagList = JsonUtil.toList(model.getDiagnose(), List.class); | |
| 297 | - if (CollectionUtils.isNotEmpty(diagList)) { | |
| 298 | + if (CollectionUtils.isNotEmpty(diagnoseList)) { | |
| 298 | 299 | diagnose = ""; |
| 299 | - for (Object obj : diagList) { | |
| 300 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); | |
| 300 | + for (String obj : diagnoseList) { | |
| 301 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj); | |
| 301 | 302 | if (basicConfig != null) { |
| 302 | 303 | diagnose += basicConfig.getName() + " "; |
| 303 | 304 | } |
| 304 | 305 | } |
| 305 | - } | |
| 306 | - } | |
| 307 | 306 | babyApplyOrderResult.sethRisk(diagnose); |
| 308 | 307 | } |
| 309 | 308 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
c538e75