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 be15f3a..0d823e6 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 @@ -13,6 +13,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.BookbuildingFacade; import com.lyms.platform.operate.web.request.*; +import net.sf.json.JSONObject; import org.apache.commons.httpclient.HttpClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -124,7 +125,15 @@ public class PregnantBuildController extends BaseController{ if (param != null && !StringUtils.isEmpty(param.getId()) ) { return bookbuildingFacade.updatePregnantByIdV2(param.getId(), param, param.getUserId(), false); } - return bookbuildingFacade.createOrUpdateYunBuildV2(param, param.getUserId(), false); + + return bookbuildingFacade.addPregnantBookbuilding(param, Integer.parseInt(param.getBookbuildingDoctor()), false); + } + //测试 + @RequestMapping(method = RequestMethod.POST, value = "/testv2url") + @ResponseBody + public BaseResponse sync_to_v2_url( @RequestBody JSONObject param) { + System.out.println(param); + return new BaseResponse(param.toString(), 666); } /** 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 43955e3..2811e10 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 @@ -724,7 +724,7 @@ public class BookbuildingFacade { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); JSONObject jsonObject = getQueryParam(patients); - String result = restTemplate.postForObject(syncToV2Url + "/李晓东提供", jsonObject, String.class); + String result = restTemplate.postForObject(syncToV2Url + "/testv2url", jsonObject, String.class); logger.info("建档数据同步到2.0系统,返回结果: {}", result); } }); @@ -744,13 +744,44 @@ public class BookbuildingFacade { */ private JSONObject getQueryParam(Patients patients) { JSONObject jsonObject = new JSONObject(64); - // TODO 2019/6/5 13:21 dongqing 数据组装 jsonObject.put("id", patients.getId()); - + jsonObject.put("P_NAME", patients.getUsername());//姓名 + jsonObject.put("P_CARDTYPE", patients.getPcerteTypeId());//证件类别 + jsonObject.put("P_CARDNO", patients.getCardNo());//证件号码 + jsonObject.put("P_BIRTHDAY", patients.getBirth());//出生日期 + jsonObject.put("P_COUNTRY", patients.getPcountryId());//国籍 + jsonObject.put("P_NATION", patients.getPnationId());//民族 + jsonObject.put("P_MOBILEPHONE", patients.getPhone());//联系电话 + jsonObject.put("P_UNITWORK", patients.getPworkUnit());//工作单位 + jsonObject.put("P_RRPROVINCE", patients.getProvinceId());//户口——省 + jsonObject.put("P_RRCITY", patients.getCityId());//户口——市 + jsonObject.put("P_RRCOUNTY", patients.getAreaId());//户口——区县 + jsonObject.put("P_RRSTREET", patients.getStreetId());//户口——街道 + jsonObject.put("P_ADDRESSPROVINCE", patients.getProvinceRegisterId());//省份 + jsonObject.put("P_ADDRESSCITY", patients.getCityRegisterId());//城市 + jsonObject.put("P_ADDRESSCOUNTY", patients.getAreaRegisterId());//县 + jsonObject.put("P_ADDRESSSTREET", patients.getStreetRegisterId());//街道 + jsonObject.put("P_POSTPARTUMPROVINCE", patients.getProvincePostRestId());//产后——省 + jsonObject.put("P_POSTPARTUMCITY", patients.getCityPostRestId());//产后——市 + jsonObject.put("P_POSTPARTUMCOUNTY", patients.getAreaPostRestId());//产后——区县 + jsonObject.put("P_POSTPARTUMSTREET", patients.getStreetPostRestId());//产后——街道 +// jsonObject.put("P_RESIDETYPE", patients.getId());//居住类别(0:本地 1:非本地居住一年以下 2:非本地居住一年以上) +// jsonObject.put("P_ACCOUNTTYPE", patients.getId());//户口类别(0:非农业户口 1:农业户口) + jsonObject.put("P_HUSBANDNAME", patients.getHusbandName());//丈夫姓名 + jsonObject.put("P_HUSBANDCARDTYPE", patients.getHcertificateTypeId());//丈夫证件类型 + jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码 + jsonObject.put("P_HUSBANDBIRTHDAY", patients.getHusbandBirth());//丈夫出生日期 + jsonObject.put("P_HUSBANDCOUNTRY", patients.getHcountryId());//丈夫国籍 + jsonObject.put("P_HUSBANDNATION", patients.getHnationId());//丈夫民族 + jsonObject.put("P_HUSBANDMOBILEPHONE", patients.getHusbandPhone());//丈夫联系电话 + jsonObject.put("P_HUSBANDUNITWORK", patients.getHworkUnit());//丈夫工作单位 + jsonObject.put("P_HUSBANDRRPROVINCE", patients.getHprovinceRegisterId());//丈夫户口所在地 省 + jsonObject.put("P_HUSBANDRRCITY", patients.getHcityRegisterId());//丈夫户口所在地 市 + jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地 县 + jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地 街道 return jsonObject; } - /** * 创建孕妇建档推送消息 */