From 2295e456822037719aeabf82d0a074b7c0370d76 Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 11 Jun 2019 15:47:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E9=99=A2id=E5=92=8C?= =?UTF-8?q?=E5=8C=BB=E7=94=9Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PregnantBuildController.java | 9 ++++++--- .../operate/web/facade/BookbuildingFacade.java | 19 ++++++++++--------- .../operate/web/worker/SyncV2HistoryWorkerx.java | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 987fa19..6971d3f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -118,16 +118,18 @@ public class PregnantBuildController extends BaseController{ } /** + *2.0同步3.0代码注释 + * * 将来源于v2.0的数据同步到当前版本中 * * @param param - */ + @RequestMapping(method = RequestMethod.POST, value = "/v2/saveOrUpdate") @ResponseBody public BaseResponse saveOrUpdateByV2(@RequestBody SyncV2YunBookbuildingRequest param) { - param.setBookbuildingDoctor("1000000185");//todo + param.setBookbuildingDoctor("2100004880"); param.setLastMenstrualPeriod(null);//todo - param.setHospitalId("216");//todo + param.setHospitalId("2100001981"); // //1、使用JSONObject // JSONObject json = JSONObject.fromObject(param); @@ -144,6 +146,7 @@ public class PregnantBuildController extends BaseController{ return bookbuildingFacade.addPregnantBookbuildingV2(param, Integer.parseInt(param.getBookbuildingDoctor()), false); } + */ /** * 将v2.0的历史数据保存到当前库中 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e1dbaa3..b79df51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -731,7 +731,10 @@ public class BookbuildingFacade { * @param userId userId */ private void syncDataToV2(final Patients patients, String id, Integer userId) { - try { + + /* + 3.0同步2.0代码注释 + try { Thread syncThread = new Thread(new Runnable() { @Override public void run() { @@ -739,8 +742,6 @@ public class BookbuildingFacade { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); JSONObject jsonObject = getQueryParam(patients); -// String result = restTemplate.postForObject(syncToV2Url + "/v3/bookbuilding/savaOrUpdate", jsonObject, String.class); -// logger.info("建档数据同步到2.0系统，返回结果： {}", result); Map map = new HashMap<>(); map.put("jsonObject", jsonObject); ResponseEntity responseEntity = restTemplate.getForEntity(syncToV2Url +"/GetPatient.asmx/GetPatientInfo?data={jsonObject}", String.class, map); @@ -751,7 +752,7 @@ public class BookbuildingFacade { } catch (Exception e) { e.printStackTrace(); logger.error("建档数据同步到2.0系统失败", e); - } + }*/ } /** @@ -799,7 +800,7 @@ public class BookbuildingFacade { jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码 jsonObject.put("P_HUSBANDBIRTHDAY", sdf.format(patients.getHusbandBirth()));//丈夫出生日期 jsonObject.put("P_HUSBANDEDUCATIONLEVEL",""); - jsonObject.put("P_HOSPITALID", "");//todo建党机构 + jsonObject.put("P_HOSPITALID", "2100001981"); jsonObject.put("P_HUSBANDOCCUPATIONID",""); jsonObject.put("P_HUSBANDRRTOWNSHIP",""); jsonObject.put("P_HUSBANDRRVILLAGE",""); @@ -815,7 +816,7 @@ public class BookbuildingFacade { jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地 县 jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地 街道 jsonObject.put("P_CLINICNO", patients.getVcCardNo());//条码号 - jsonObject.put("P_DOCID", "建档人");//todo建档人 + jsonObject.put("P_DOCID", "2100004880"); //让写死桃城区，董勤说最后定 jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间 @@ -2372,9 +2373,9 @@ public class BookbuildingFacade { } else { param.setReqHusband(null); } - param.setTownOrgId("429663d7-acdb-7c90-e053-1164010a77c8");//todo - param.setBookbuildingDoctor("1000000185");//todo - param.setHospitalId("216");//todo + param.setTownOrgId("429663d7-acdb-7c90-e053-1164010a77c8"); + param.setBookbuildingDoctor("2100004880"); + param.setHospitalId("2100001981"); return param; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java index a6f60dd..c6fbef7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java @@ -57,8 +57,8 @@ public class SyncV2HistoryWorkerx implements Callable { continue; } - list.setHospitalId("216");//todo - list.setBookbuildingDoctor("1000000185");//todo + list.setHospitalId("2100001981"); + list.setBookbuildingDoctor("2100004880"); list.setBookbuildingDate(DateUtil.getyyyy_MM_dd(new Date())); list.setHusbandNationId(queryParentConfig(list.getHusbandNationId())); list.setPregnantNationId(queryParentConfig(list.getPregnantNationId())); -- 1.8.3.1