diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
index 51dc2ca..ded4151 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
@@ -86,8 +86,8 @@ public class DiagnosisController extends BaseController {
     @RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET)
     public DiagnosisManagerResult getDiagnosisList(DiagnosisAddRequest dataresult,HttpServletRequest request){
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        dataresult.setHospitalId(loginState.getId().toString());
-        return diagnosisFacaed.queryDiagnosisList(dataresult);
+        //dataresult.setHospitalId("1000000185");
+        return diagnosisFacaed.queryDiagnosisList(dataresult,loginState.getId());
     }
 
 
@@ -102,8 +102,8 @@ public class DiagnosisController extends BaseController {
     @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
     public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        dataresult.setHospitalId(loginState.getId().toString());
-        return diagnosisFacaed.queryDiagnosisLab(dataresult);
+        //dataresult.setHospitalId(loginState.getId().toString());
+        return diagnosisFacaed.queryDiagnosisLab(dataresult,loginState.getId());
     }
 
 
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 7cd9b30..a200d5a 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
@@ -255,8 +255,10 @@ public class DiagnosisFacaed {
      * @param dataresult
      * @return
      */
-    public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){
+    public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult,Integer userId){
         DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
+        String hospital = autoMatchFacade.getHospitalId(userId);
+        dataresult.setHospitalId(hospital);
         DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
         List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
         if(null != dataresult.getDiaResult()){
@@ -437,9 +439,11 @@ public class DiagnosisFacaed {
      * @param dataresult
      * @return
      */
-    public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){
+    public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult,Integer userId){
         List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
         DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
+        String hospital = autoMatchFacade.getHospitalId(userId);
+        dataresult.setHospitalId(hospital);
         DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
         if(StringUtils.isNotEmpty(dataresult.getApplyDate())){
             String[] dates = dataresult.getApplyDate().split(" - ");