Commit 309aae1a34df7e0e1dce8cafb8e85447a3c51f4f
1 parent
a396aee4cb
Exists in
master
and in
1 other branch
产前诊断实验室修改
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
View file @
309aae1
| ... | ... | @@ -196,9 +196,10 @@ |
| 196 | 196 | * @return |
| 197 | 197 | */ |
| 198 | 198 | public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){ |
| 199 | + String hospital = autoMatchFacade.getHospitalId(userId); | |
| 200 | + dataresult.setHospitalId(hospital); | |
| 199 | 201 | DiagnosisModel diagnosisModel = dataresult.convertToDataModel(); |
| 200 | 202 | diagnosisModel.setModified(new Date()); |
| 201 | - String hospital = autoMatchFacade.getHospitalId(userId); | |
| 202 | 203 | if(StringUtils.isNotEmpty(diagnosisModel.getId())){//更新数据 |
| 203 | 204 | DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); |
| 204 | 205 | diagnosisQuery.setId(diagnosisModel.getId()); |
| ... | ... | @@ -469,7 +470,7 @@ |
| 469 | 470 | List<String> pList = new ArrayList<String>(); |
| 470 | 471 | DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); |
| 471 | 472 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 472 | - dataresult.setHospitalId(hospital); | |
| 473 | + dataresult.setCollectHospitalId(hospital); | |
| 473 | 474 | DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); |
| 474 | 475 | if(null != dataresult.getQueryNo()){ |
| 475 | 476 | PatientsQuery patientsQuery = new PatientsQuery(); |
| ... | ... | @@ -535,7 +536,7 @@ |
| 535 | 536 | diagnosisQuery.setLimit(dataresult.getLimit()); |
| 536 | 537 | diagnosisQuery.setNeed("need"); |
| 537 | 538 | diagnosisQuery.setOrder("created"); |
| 538 | - diagnosisQuery.setHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getHospitalId()))); | |
| 539 | + diagnosisQuery.setCollectHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getCollectHospitalId()))); | |
| 539 | 540 | //diagnosisQuery.setHospitalId("216"); |
| 540 | 541 | List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery); |
| 541 | 542 | if(CollectionUtils.isEmpty(diaList)){ |