Commit e9cab3e4a45d04f87d91cca618c1893c0d748b89
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
View file @
e9cab3e
1 | 1 | package com.lyms.platform.operate.web.controller; |
2 | 2 | |
3 | +import com.lyms.platform.biz.service.ApplyOrderService; | |
4 | +import com.lyms.platform.biz.service.SieveService; | |
3 | 5 | import com.lyms.platform.biz.service.SyncDataService; |
4 | 6 | import com.lyms.platform.common.base.BaseController; |
5 | 7 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
8 | +import com.lyms.platform.common.enums.YnEnums; | |
6 | 9 | import com.lyms.platform.common.pojo.SyncDataModel; |
7 | 10 | import com.lyms.platform.common.result.BaseResponse; |
8 | 11 | import com.lyms.platform.common.utils.Config; |
9 | 12 | |
... | ... | @@ -12,8 +15,15 @@ |
12 | 15 | import com.lyms.platform.operate.web.facade.SysBaseFacade; |
13 | 16 | import com.lyms.platform.operate.web.request.SqlRequest; |
14 | 17 | import com.lyms.platform.permission.service.OrganizationService; |
18 | +import com.lyms.platform.pojo.SieveApplyOrderModel; | |
19 | +import com.lyms.platform.pojo.SieveModel; | |
20 | +import com.lyms.platform.pojo.SieveResultModel; | |
21 | +import com.lyms.platform.query.SieveApplyOrderQuery; | |
22 | +import com.lyms.platform.query.SieveQuery; | |
23 | +import com.lyms.platform.query.SieveResultQuery; | |
15 | 24 | import com.lyms.platform.query.SyncDataQuery; |
16 | 25 | import org.apache.commons.codec.binary.Base64; |
26 | +import org.apache.commons.collections.CollectionUtils; | |
17 | 27 | import org.apache.commons.lang.StringUtils; |
18 | 28 | import org.apache.log4j.Logger; |
19 | 29 | import org.springframework.beans.factory.annotation.Autowired; |
... | ... | @@ -190,6 +200,53 @@ |
190 | 200 | return; |
191 | 201 | } |
192 | 202 | writeString(response, "success"); |
203 | + } | |
204 | + @Autowired | |
205 | + private SieveService sieveService; | |
206 | + @Autowired | |
207 | + private ApplyOrderService applyOrderService; | |
208 | + | |
209 | + @RequestMapping(value = "/handleSieveStatus", method = RequestMethod.GET) | |
210 | + @ResponseBody | |
211 | + public String doSieveTime(@RequestParam(required = false) String hospitalId, | |
212 | + @RequestParam(required = false) String patientId) { | |
213 | + | |
214 | + SieveQuery sieveQuery = new SieveQuery(); | |
215 | + sieveQuery.setYn(YnEnums.YES.getId()); | |
216 | + sieveQuery.setHospitalId(hospitalId); | |
217 | + sieveQuery.setParentId(patientId); | |
218 | + sieveQuery.setStatus(1); | |
219 | + | |
220 | + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); | |
221 | + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); | |
222 | + | |
223 | + | |
224 | + List<SieveModel> list = sieveService.queryList(sieveQuery); | |
225 | + if (CollectionUtils.isNotEmpty(list)) { | |
226 | + int batchSize = 1000; | |
227 | + int end = 0; | |
228 | + for (int i = 0; i < list.size(); i += batchSize) { | |
229 | + end = (end + batchSize); | |
230 | + if (end > list.size()) { | |
231 | + end = list.size(); | |
232 | + } | |
233 | + System.out.println("start:" + i + ",end:" + end); | |
234 | + final List<SieveModel> sieveModels = list.subList(i, end); | |
235 | + for (SieveModel model : sieveModels) | |
236 | + { | |
237 | + sieveApplyOrderQuery1.setParentId(model.getParentId()); | |
238 | + sieveApplyOrderQuery1.setHospitalId(hospitalId); | |
239 | + List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); | |
240 | + if (CollectionUtils.isNotEmpty(list1)) | |
241 | + { | |
242 | + System.out.println(model.getParentId()); | |
243 | + model.setStatus(2); | |
244 | + sieveService.updateOneChanQianDiaSieve(model); | |
245 | + } | |
246 | + } | |
247 | + } | |
248 | + } | |
249 | + return "handleSieveStatus ....."; | |
193 | 250 | } |
194 | 251 | |
195 | 252 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
e9cab3e
... | ... | @@ -1831,12 +1831,6 @@ |
1831 | 1831 | return lcdcfFmService.queryFmPatient(bhnum); |
1832 | 1832 | } |
1833 | 1833 | |
1834 | - | |
1835 | - | |
1836 | - | |
1837 | - | |
1838 | - | |
1839 | - | |
1840 | 1834 | @RequestMapping(value = "/handleSieveTime", method = RequestMethod.GET) |
1841 | 1835 | @ResponseBody |
1842 | 1836 | public String doSieveTime(@RequestParam(required = false) String hospitalId, |