diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index 95b5ac6..a52ea91 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -196,9 +196,10 @@ public class DiagnosisFacaed { * @return */ public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){ + String hospital = autoMatchFacade.getHospitalId(userId); + dataresult.setHospitalId(hospital); DiagnosisModel diagnosisModel = dataresult.convertToDataModel(); diagnosisModel.setModified(new Date()); - String hospital = autoMatchFacade.getHospitalId(userId); if(StringUtils.isNotEmpty(diagnosisModel.getId())){//更新数据 DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); diagnosisQuery.setId(diagnosisModel.getId()); @@ -469,7 +470,7 @@ public class DiagnosisFacaed { List pList = new ArrayList(); DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); String hospital = autoMatchFacade.getHospitalId(userId); - dataresult.setHospitalId(hospital); + dataresult.setCollectHospitalId(hospital); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); if(null != dataresult.getQueryNo()){ PatientsQuery patientsQuery = new PatientsQuery(); @@ -535,7 +536,7 @@ public class DiagnosisFacaed { diagnosisQuery.setLimit(dataresult.getLimit()); diagnosisQuery.setNeed("need"); diagnosisQuery.setOrder("created"); - diagnosisQuery.setHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getHospitalId()))); + diagnosisQuery.setCollectHospitalId(autoMatchFacade.getHospitalId(Integer.parseInt(dataresult.getCollectHospitalId()))); //diagnosisQuery.setHospitalId("216"); List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); if(CollectionUtils.isEmpty(diaList)){