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 6f1e393..31b8585 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 @@ -57,6 +57,7 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.sql.*; +import java.text.SimpleDateFormat; import java.util.*; import java.util.Date; import java.util.concurrent.Future; @@ -751,20 +752,24 @@ public class BookbuildingFacade { * @return */ private JSONObject getQueryParam(Patients patients) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); 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_BIRTHDAY", sdf.format(patients.getBirth()));//出生日期 jsonObject.put("P_COUNTRY", patients.getPcountryId());//国籍 jsonObject.put("P_NATION", patients.getPnationId());//民族 + jsonObject.put("P_EDUCATIONLEVEL", "");//文化程度 + jsonObject.put("P_OCCUPATIONID", "");//职业 jsonObject.put("P_MOBILEPHONE", patients.getPhone());//联系电话 jsonObject.put("P_UNITWORK", patients.getPworkUnit());//工作单位 + jsonObject.put("P_JIATINGNIANRENJUNSHOURU", "");//家庭年人均收入 jsonObject.put("P_RRPROVINCE", patients.getProvinceId());//户口——省 jsonObject.put("P_RRCITY", patients.getCityId());//户口——市 jsonObject.put("P_RRCOUNTY", patients.getAreaId());//户口——区县 + jsonObject.put("P_RRTOWNSHIP", "");//户口——乡镇 jsonObject.put("P_RRSTREET", patients.getStreetId());//户口——街道 jsonObject.put("P_ADDRESSPROVINCE", patients.getProvinceRegisterId());//省份 jsonObject.put("P_ADDRESSCITY", patients.getCityRegisterId());//城市 @@ -773,13 +778,23 @@ public class BookbuildingFacade { jsonObject.put("P_POSTPARTUMPROVINCE", patients.getProvincePostRestId());//产后——省 jsonObject.put("P_POSTPARTUMCITY", patients.getCityPostRestId());//产后——市 jsonObject.put("P_POSTPARTUMCOUNTY", patients.getAreaPostRestId());//产后——区县 + jsonObject.put("P_POSTPARTUMTOWNSHIP", "");//产后——乡镇 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_ADDRESSVILLAGE", ""); + jsonObject.put("P_RRVILLAGE", ""); + jsonObject.put("P_POSTPARTUMVILLAGE", ""); + jsonObject.put("P_RESIDETYPE", ""); 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_HUSBANDBIRTHDAY", sdf.format(patients.getHusbandBirth()));//丈夫出生日期 + jsonObject.put("P_HUSBANDEDUCATIONLEVEL",""); + jsonObject.put("P_HUSBANDOCCUPATIONID",""); + jsonObject.put("P_HUSBANDRRTOWNSHIP",""); + jsonObject.put("P_HUSBANDRRVILLAGE",""); + jsonObject.put("P_LASTMENSTRUALPERIOD",""); + jsonObject.put("P_ISVIP",""); + jsonObject.put("P_SERVICETYPE",""); jsonObject.put("P_HUSBANDCOUNTRY", patients.getHcountryId());//丈夫国籍 jsonObject.put("P_HUSBANDNATION", patients.getHnationId());//丈夫民族 jsonObject.put("P_HUSBANDMOBILEPHONE", patients.getHusbandPhone());//丈夫联系电话 @@ -789,10 +804,10 @@ public class BookbuildingFacade { jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地 县 jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地 街道 jsonObject.put("P_CLINICNO", patients.getVcCardNo());//条码号 - jsonObject.put("P_HOSPITALID", patients.getBookbuildingDoctor());//建档人 + jsonObject.put("P_DOCID", patients.getBookbuildingDoctor());//建档人 //让写死桃城区,董勤说最后定 jsonObject.put("P_HOSPITALID", "todo");//建党机构 - jsonObject.put("P_ISVIP", patients.getBookbuildingDate());//建档时间 + jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间 if (patients.getReqHusband() != null) {//丈夫信息是否必须 if (patients.getReqHusband()) {