diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index d093209..21b2102 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -1,8 +1,11 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.ApplyOrderService; +import com.lyms.platform.biz.service.SieveService; import com.lyms.platform.biz.service.SyncDataService; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Config; @@ -12,8 +15,15 @@ import com.lyms.platform.common.utils.LymsEncodeUtil; import com.lyms.platform.operate.web.facade.SysBaseFacade; import com.lyms.platform.operate.web.request.SqlRequest; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.pojo.SieveApplyOrderModel; +import com.lyms.platform.pojo.SieveModel; +import com.lyms.platform.pojo.SieveResultModel; +import com.lyms.platform.query.SieveApplyOrderQuery; +import com.lyms.platform.query.SieveQuery; +import com.lyms.platform.query.SieveResultQuery; import com.lyms.platform.query.SyncDataQuery; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -191,5 +201,52 @@ public class SyncDataController extends BaseController { } writeString(response, "success"); } + @Autowired + private SieveService sieveService; + @Autowired + private ApplyOrderService applyOrderService; + + @RequestMapping(value = "/handleSieveStatus", method = RequestMethod.GET) + @ResponseBody + public String doSieveTime(@RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String patientId) { + + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setHospitalId(hospitalId); + sieveQuery.setParentId(patientId); + sieveQuery.setStatus(1); + + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + + + List list = sieveService.queryList(sieveQuery); + if (CollectionUtils.isNotEmpty(list)) { + int batchSize = 1000; + int end = 0; + for (int i = 0; i < list.size(); i += batchSize) { + end = (end + batchSize); + if (end > list.size()) { + end = list.size(); + } + System.out.println("start:" + i + ",end:" + end); + final List sieveModels = list.subList(i, end); + for (SieveModel model : sieveModels) + { + sieveApplyOrderQuery1.setParentId(model.getParentId()); + sieveApplyOrderQuery1.setHospitalId(hospitalId); + List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isNotEmpty(list1)) + { + System.out.println(model.getParentId()); + model.setStatus(2); + sieveService.updateOneChanQianDiaSieve(model); + } + } + } + } + return "handleSieveStatus ....."; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 130d8ce..aad376b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1831,12 +1831,6 @@ public class TestController extends BaseController { return lcdcfFmService.queryFmPatient(bhnum); } - - - - - - @RequestMapping(value = "/handleSieveTime", method = RequestMethod.GET) @ResponseBody public String doSieveTime(@RequestParam(required = false) String hospitalId,