From e151e114be447596cedce65a856532f1bc29ef22 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Sun, 30 Sep 2018 10:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/DiagnosisController.java   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 b535062..ea57e4a 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
@@ -54,7 +54,7 @@ public class DiagnosisController {
     @ResponseBody
     @RequestMapping(value = "/addDiagnosis",method = RequestMethod.POST)
     public BaseResponse addOrUpdateDiagnosis(@RequestBody @Valid DiagnosisAddRequest diagnosisAddRequest,HttpServletRequest request){
-        //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         /*diagnosisAddRequest.setName("aaaa");
         diagnosisAddRequest.setId("5bade15d0cf2d495ecedb46f");
         diagnosisAddRequest.setParentId("5b0d033f0cf2424cd354b770");
@@ -78,7 +78,7 @@ public class DiagnosisController {
         diagnosisAddRequest.setSendDate("2018-09-29");
         diagnosisAddRequest.setCollectHospitalId("216");
         diagnosisAddRequest.setHospitalId("216");*/
-        return diagnosisFacaed.addOrUpdateDiagnosis(diagnosisAddRequest, 1000000185);
+        return diagnosisFacaed.addOrUpdateDiagnosis(diagnosisAddRequest, loginState.getId());
     }
 
 
@@ -90,7 +90,6 @@ public class DiagnosisController {
     @ResponseBody
     @RequestMapping(value = "/getOneDiagnosis",method = RequestMethod.GET)
     public BaseResponse getDiagnosisById(String id){
-        //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return diagnosisFacaed.queryOneDiaById(id);
     }
 
@@ -104,8 +103,8 @@ public class DiagnosisController {
     @ResponseBody
     @RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET)
     public DiagnosisManagerResult getDiagnosisList(@RequestBody @Valid DiagnosisAddRequest dataresult,HttpServletRequest request){
-        //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        dataresult.setHospitalId("1000000185");
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        dataresult.setHospitalId(loginState.getId().toString());
         return diagnosisFacaed.queryDiagnosisList(dataresult);
     }
 
@@ -119,8 +118,8 @@ public class DiagnosisController {
     @ResponseBody
     @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
     public DiagnosisManagerResult getDiagnosisLab(@RequestBody @Valid DiagnosisAddRequest dataresult,HttpServletRequest request){
-        //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        dataresult.setHospitalId("1000000185");
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        dataresult.setHospitalId(loginState.getId().toString());
         return diagnosisFacaed.queryDiagnosisLab(dataresult);
     }
 
@@ -132,15 +131,15 @@ public class DiagnosisController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
-    public List<BaseResponse> getDiagnosisLab(String id,HttpServletRequest request){
+    @RequestMapping(value = "/updateDiaStatus",method = RequestMethod.GET)
+    public List<BaseResponse> updateDiaStatus(String id,HttpServletRequest request){
         //LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         List<BaseResponse> bList = new ArrayList<BaseResponse>();
         if(StringUtils.isNotEmpty(id)){
             String[] ary = id.split(",");
             for(String item : ary){
                 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-                bList.add(diagnosisFacaed.updateDiaStarts(item,loginState.getId()));
+                bList.add(diagnosisFacaed.updateDiaStarts(item, loginState.getId()));
             }
             return bList;
         }
-- 
1.8.3.1