Commit 6dde52f9dad4412ef9221e818a9a302ed156f25f
1 parent
a84a411d36
Exists in
master
and in
6 other branches
产前诊断
Showing 2 changed files with 7 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
View file @
6dde52f
| ... | ... | @@ -97,12 +97,12 @@ |
| 97 | 97 | * @param request |
| 98 | 98 | * @return |
| 99 | 99 | */ |
| 100 | - @TokenRequired | |
| 100 | + //@TokenRequired | |
| 101 | 101 | @ResponseBody |
| 102 | 102 | @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET) |
| 103 | 103 | public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){ |
| 104 | 104 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 105 | - dataresult.setHospitalId(loginState.getId().toString()); | |
| 105 | + dataresult.setHospitalId("1000000185"); | |
| 106 | 106 | return diagnosisFacaed.queryDiagnosisLab(dataresult); |
| 107 | 107 | } |
| 108 | 108 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
View file @
6dde52f
| ... | ... | @@ -303,8 +303,8 @@ |
| 303 | 303 | diagnosisQuery.setLimit(dataresult.getLimit()); |
| 304 | 304 | diagnosisQuery.setNeed("need"); |
| 305 | 305 | diagnosisQuery.setOrder("created"); |
| 306 | - //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId())); | |
| 307 | - diagnosisQuery.setHospitalId("216"); | |
| 306 | + diagnosisQuery.setHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getHospitalId()))); | |
| 307 | + //diagnosisQuery.setHospitalId("216"); | |
| 308 | 308 | List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery); |
| 309 | 309 | if(CollectionUtils.isEmpty(diaList)){ |
| 310 | 310 | diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); |
| ... | ... | @@ -453,8 +453,8 @@ |
| 453 | 453 | diagnosisQuery.setLimit(dataresult.getLimit()); |
| 454 | 454 | diagnosisQuery.setNeed("need"); |
| 455 | 455 | diagnosisQuery.setOrder("created"); |
| 456 | - //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId())); | |
| 457 | - diagnosisQuery.setHospitalId("216"); | |
| 456 | + diagnosisQuery.setHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getHospitalId()))); | |
| 457 | + //diagnosisQuery.setHospitalId("216"); | |
| 458 | 458 | List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery); |
| 459 | 459 | if(CollectionUtils.isEmpty(diaList)){ |
| 460 | 460 | diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); |
| ... | ... | @@ -505,6 +505,7 @@ |
| 505 | 505 | diagnosisModel.setZtfx("2"); |
| 506 | 506 | diagnosisModel.setZtfeText("高风险"); |
| 507 | 507 | } |
| 508 | + } | |
| 508 | 509 | |
| 509 | 510 | //产筛项目 |
| 510 | 511 | SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); |
| ... | ... | @@ -519,8 +520,6 @@ |
| 519 | 520 | } |
| 520 | 521 | } |
| 521 | 522 | diagnosisModel.setSieveProject(sList); |
| 522 | - | |
| 523 | - } | |
| 524 | 523 | |
| 525 | 524 | } |
| 526 | 525 | mList.add(diagnosisModel.contomap(patients)); |