Commit e151e114be447596cedce65a856532f1bc29ef22
1 parent
a261e9f839
Exists in
master
and in
6 other branches
产前诊断
Showing 1 changed file with 9 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java
View file @
e151e11
... | ... | @@ -54,7 +54,7 @@ |
54 | 54 | @ResponseBody |
55 | 55 | @RequestMapping(value = "/addDiagnosis",method = RequestMethod.POST) |
56 | 56 | public BaseResponse addOrUpdateDiagnosis(@RequestBody @Valid DiagnosisAddRequest diagnosisAddRequest,HttpServletRequest request){ |
57 | - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
57 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
58 | 58 | /*diagnosisAddRequest.setName("aaaa"); |
59 | 59 | diagnosisAddRequest.setId("5bade15d0cf2d495ecedb46f"); |
60 | 60 | diagnosisAddRequest.setParentId("5b0d033f0cf2424cd354b770"); |
... | ... | @@ -78,7 +78,7 @@ |
78 | 78 | diagnosisAddRequest.setSendDate("2018-09-29"); |
79 | 79 | diagnosisAddRequest.setCollectHospitalId("216"); |
80 | 80 | diagnosisAddRequest.setHospitalId("216");*/ |
81 | - return diagnosisFacaed.addOrUpdateDiagnosis(diagnosisAddRequest, 1000000185); | |
81 | + return diagnosisFacaed.addOrUpdateDiagnosis(diagnosisAddRequest, loginState.getId()); | |
82 | 82 | } |
83 | 83 | |
84 | 84 | |
... | ... | @@ -90,7 +90,6 @@ |
90 | 90 | @ResponseBody |
91 | 91 | @RequestMapping(value = "/getOneDiagnosis",method = RequestMethod.GET) |
92 | 92 | public BaseResponse getDiagnosisById(String id){ |
93 | - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
94 | 93 | return diagnosisFacaed.queryOneDiaById(id); |
95 | 94 | } |
96 | 95 | |
... | ... | @@ -104,8 +103,8 @@ |
104 | 103 | @ResponseBody |
105 | 104 | @RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET) |
106 | 105 | public DiagnosisManagerResult getDiagnosisList(@RequestBody @Valid DiagnosisAddRequest dataresult,HttpServletRequest request){ |
107 | - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
108 | - dataresult.setHospitalId("1000000185"); | |
106 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
107 | + dataresult.setHospitalId(loginState.getId().toString()); | |
109 | 108 | return diagnosisFacaed.queryDiagnosisList(dataresult); |
110 | 109 | } |
111 | 110 | |
... | ... | @@ -119,8 +118,8 @@ |
119 | 118 | @ResponseBody |
120 | 119 | @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET) |
121 | 120 | public DiagnosisManagerResult getDiagnosisLab(@RequestBody @Valid DiagnosisAddRequest dataresult,HttpServletRequest request){ |
122 | - //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
123 | - dataresult.setHospitalId("1000000185"); | |
121 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
122 | + dataresult.setHospitalId(loginState.getId().toString()); | |
124 | 123 | return diagnosisFacaed.queryDiagnosisLab(dataresult); |
125 | 124 | } |
126 | 125 | |
127 | 126 | |
... | ... | @@ -132,15 +131,15 @@ |
132 | 131 | * @return |
133 | 132 | */ |
134 | 133 | @ResponseBody |
135 | - @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET) | |
136 | - public List<BaseResponse> getDiagnosisLab(String id,HttpServletRequest request){ | |
134 | + @RequestMapping(value = "/updateDiaStatus",method = RequestMethod.GET) | |
135 | + public List<BaseResponse> updateDiaStatus(String id,HttpServletRequest request){ | |
137 | 136 | //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
138 | 137 | List<BaseResponse> bList = new ArrayList<BaseResponse>(); |
139 | 138 | if(StringUtils.isNotEmpty(id)){ |
140 | 139 | String[] ary = id.split(","); |
141 | 140 | for(String item : ary){ |
142 | 141 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
143 | - bList.add(diagnosisFacaed.updateDiaStarts(item,loginState.getId())); | |
142 | + bList.add(diagnosisFacaed.updateDiaStarts(item, loginState.getId())); | |
144 | 143 | } |
145 | 144 | return bList; |
146 | 145 | } |