Commit aa8811ab2cd3ef5a01d05b593bd6c696ea9cc02e
1 parent
95b8e27c1e
Exists in
master
and in
6 other branches
修改电子病历
Showing 2 changed files with 15 additions and 16 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java
View file @
aa8811a
| ... | ... | @@ -77,7 +77,7 @@ |
| 77 | 77 | } |
| 78 | 78 | }else{ |
| 79 | 79 | //子当 |
| 80 | - babyModelQuery.setId(babyModel.getSource()); | |
| 80 | + babyModelQuery.setId(patients.getSource()); | |
| 81 | 81 | babyModelQuery.setYn(YnEnums.YES.getId()); |
| 82 | 82 | patientses=queryBabyBuildByCond(babyModelQuery); |
| 83 | 83 | if(CollectionUtils.isNotEmpty(patientses)){ |
| ... | ... | @@ -85,8 +85,7 @@ |
| 85 | 85 | babyModel.setId(patients1.getId()); |
| 86 | 86 | babyModel.setHospitalId(patients1.getHospitalId()); |
| 87 | 87 | babyModel.setCreated(patients1.getCreated()); |
| 88 | - updateBabyBuild(babyModel,babyModel.getId()); | |
| 89 | - patientsService.updateRefer(babyModel); | |
| 88 | + updateBabyBuild(babyModel, babyModel.getId()); | |
| 90 | 89 | } |
| 91 | 90 | } |
| 92 | 91 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
aa8811a
| ... | ... | @@ -69,7 +69,7 @@ |
| 69 | 69 | * @param request |
| 70 | 70 | * @return |
| 71 | 71 | */ |
| 72 | - public BaseResponse updateBabyCheck(BabyCheckRequest request,Integer userId) { | |
| 72 | + public BaseResponse updateBabyCheck(BabyCheckRequest request, Integer userId) { | |
| 73 | 73 | BabyCheckModel model = getBabyCheckModel(request); |
| 74 | 74 | model.setModified(new Date()); |
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | |
| ... | ... | @@ -99,13 +99,13 @@ |
| 99 | 99 | bm.setLastDiagnose(diagnoseNames); |
| 100 | 100 | } |
| 101 | 101 | babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); |
| 102 | - BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
| 102 | + BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
| 103 | 103 | babyModelQuery.setId(request.getBuildId()); |
| 104 | - List<BabyModel> list =babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 105 | - if(CollectionUtils.isNotEmpty(list)){ | |
| 104 | + List<BabyModel> list = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 105 | + if (CollectionUtils.isNotEmpty(list)) { | |
| 106 | 106 | bm.setPid(list.get(0).getPid()); |
| 107 | 107 | bm.setId(request.getBuildId()); |
| 108 | - if(autoMatchFacade.checkBStatus(userId)){ | |
| 108 | + if (autoMatchFacade.checkBStatus(userId)) { | |
| 109 | 109 | babyBookbuildingService.updateBaseData(bm); |
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | |
| 114 | 114 | |
| ... | ... | @@ -330,26 +330,26 @@ |
| 330 | 330 | babyModel = babyModels.get(0); |
| 331 | 331 | } |
| 332 | 332 | //表示这个记录是子档 |
| 333 | - if(babyModel!=null&&org.apache.commons.lang.StringUtils.isNotEmpty(babyModel.getSource())){ | |
| 334 | - BabyModel babyModel1=new BabyModel(); | |
| 333 | + if (babyModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(babyModel.getSource())) { | |
| 334 | + BabyModel babyModel1 = new BabyModel(); | |
| 335 | 335 | babyModel1.setNextDate(babyModel.getNextDate()); |
| 336 | 336 | babyModel1.setLastHighRisk(babyModel.getLastHighRisk()); |
| 337 | 337 | babyModel1.setLastDiagnose(babyModel.getLastDiagnose()); |
| 338 | 338 | babyModel1.setId(babyModel.getSource()); |
| 339 | - babyBookbuildingService.updateBabyBuild(babyModel1,babyModel.getSource()); | |
| 340 | - }else if(babyModel!=null){ | |
| 339 | + babyBookbuildingService.updateBabyBuild(babyModel1, babyModel.getSource()); | |
| 340 | + } else if (babyModel != null) { | |
| 341 | 341 | babyModelQuery.setId(null); |
| 342 | 342 | babyModelQuery.setSource(id); |
| 343 | 343 | babyModelQuery.setYn(YnEnums.YES.getId()); |
| 344 | 344 | babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); |
| 345 | - if(CollectionUtils.isNotEmpty(babyModels)){ | |
| 346 | - for(BabyModel baby:babyModels){ | |
| 347 | - BabyModel babyModel1=new BabyModel(); | |
| 345 | + if (CollectionUtils.isNotEmpty(babyModels)) { | |
| 346 | + for (BabyModel baby : babyModels) { | |
| 347 | + BabyModel babyModel1 = new BabyModel(); | |
| 348 | 348 | babyModel1.setNextDate(babyModel.getNextDate()); |
| 349 | 349 | babyModel1.setLastHighRisk(babyModel.getLastHighRisk()); |
| 350 | 350 | babyModel1.setLastDiagnose(babyModel.getLastDiagnose()); |
| 351 | 351 | babyModel1.setId(baby.getId()); |
| 352 | - babyBookbuildingService.updateBabyBuild(babyModel1,baby.getId()); | |
| 352 | + babyBookbuildingService.updateBabyBuild(babyModel1, baby.getId()); | |
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | } |