diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java index e31b6e1..8e95158 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/SyncHsPatientService.java @@ -50,7 +50,7 @@ public class SyncHsPatientService implements InitializingBean { public void synchsPatientData() { int pageStart = 1; - int pageEnd = 5000; + int pageEnd = 4000; //查询孕妇档案 String sql = " select * from (select ROWNUM AS rowno, temp.* from (select replace(mp.P_NO, '-', '') as PID, " + @@ -68,7 +68,7 @@ public class SyncHsPatientService implements InitializingBean { System.out.println("查询数据完成"); break; } - int batchSize = 500; + int batchSize = 200; int end = 0; for (int i = 0; i < list.size(); i += batchSize) { end = (end + batchSize); @@ -79,10 +79,9 @@ public class SyncHsPatientService implements InitializingBean { List> tempList = list.subList(i, end); commonThreadPool.execute(new PatientWorker(tempList, mongoTemplate)); } - - pageStart += 5000; - pageEnd += 5000; - }while (false); + pageStart += 4000; + pageEnd += 4000; + }while (true); } private class PatientWorker extends Thread { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java index afc9fce..76a9be4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java @@ -97,7 +97,7 @@ public class ApplyOrderController extends BaseController { //衡水华大基因,检查结果回调 - @RequestMapping("/resultCallback") + @RequestMapping(value="/resultCallback",method = RequestMethod.GET) @ResponseBody public BaseResponse resultCallback(@RequestParam(value = "sampleNum") String sampleNum, @RequestHeader(value = "Authorization") String token diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 88db5cc..c6f6a96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -2058,6 +2058,16 @@ public class ApplyOrderFacade { return baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("Authorization错误"); } + /** + * 验证标本号是否存在 + */ + SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); + sieveApplyOrderModel.setNumber(sampleNum); + boolean existTwo = exists(sieveApplyOrderModel); + if (!existTwo) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("标本号不存在"); + } + new Thread(new Runnable() { @Override public void run() { @@ -2094,6 +2104,12 @@ public class ApplyOrderFacade { }catch (Exception e) { System.out.println(e.getMessage()+"调用失败"+i); + try { + Thread.sleep(1000); + }catch (Exception e1) + { + + } continue; } }