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 4a54164..f0b7072 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 @@ -784,6 +784,7 @@ public class BookbuildingFacade { jsonObject.put("P_RRVILLAGE", ""); jsonObject.put("P_POSTPARTUMVILLAGE", ""); jsonObject.put("P_RESIDETYPE", ""); + jsonObject.put("P_ACCOUNTTYPE", ""); jsonObject.put("P_HUSBANDNAME", patients.getHusbandName());//丈夫姓名 jsonObject.put("P_HUSBANDCARDTYPE", patients.getHcertificateTypeId());//丈夫证件类型 jsonObject.put("P_HUSBANDCARDNO", patients.getHusbandBirth());//丈夫证件号码 @@ -804,9 +805,9 @@ 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", patients.getBookbuildingDoctor());//建档人 + jsonObject.put("P_DOCID", "建档人");//todo建档人 //让写死桃城区,董勤说最后定 - jsonObject.put("P_HOSPITALID", "todo");//建党机构 + jsonObject.put("P_HOSPITALID", "52c15438-455f-4838-ae79-b18a2315a96e");//todo建党机构 jsonObject.put("P_FILINGTIME", sdf.format(patients.getBookbuildingDate()));//建档时间 if (patients.getReqHusband() != null) {//丈夫信息是否必须 @@ -2362,7 +2363,9 @@ public class BookbuildingFacade { } else { param.setReqHusband(null); } - param.setHospitalId("216"); + param.setTownOrgId("429663d7-acdb-7c90-e053-1164010a77c8");//todo + param.setBookbuildingDoctor("1000000185");//todo + param.setHospitalId("216");//todo return param; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java index 6416747..e0edd0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java @@ -92,8 +92,7 @@ public class SaveByV2ThreadPoolFacade { "t.P_HUSBANDNATION as husbandNationId," +//丈夫民族 "t.P_DOCID as bookbuildingDoctor," +//建档医生 "t.P_CARDNO as pregnantCertificateNum," +//证件号 - "t.P_CARDNO as pregnantNationId," +// 孕妇民族 - "t.P_CARDNO as pregnantPhone," +// 孕妇手机号 + "t.P_MOBILEPHONE as pregnantPhone," +// 孕妇手机号 "t.P_RRPROVINCE as pregnantLiveProvinceId," +//户口——省 "t.P_RRCITY as pregnantLiveCityId," +//户口——市 "t.P_RRCOUNTY as pregnantLiveAreaId," +//户口——区县 @@ -114,6 +113,7 @@ public class SaveByV2ThreadPoolFacade { "t.P_LASTMENSTRUALPERIOD as lastMenstrualPeriod," +//末次月经 "t.YCQ as dueDate," +//预产期 "t.P_FILINGTIME as bookbuildingDate," +//建档日期 + "t.P_NAME as pregnantName," +//孕妇姓名 "t.P_HOSPITALID as hospitalId ";//医院Id String sql = "select " + str + " from " + 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 74bca5a..1d95bf0 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 @@ -45,8 +45,8 @@ public class SyncV2HistoryWorkerx implements Callable { BaseObjectResponse p=null; for (YunBookbuildingAddRequest list : lists) { //董勤让写死的 - list.setHospitalId("216"); - list.setBookbuildingDoctor("1000000185"); + list.setHospitalId("216");//todo + list.setBookbuildingDoctor("1000000185");//todo p = bookbuildingFacade.addPregnantBookbuilding(list, null, false); System.out.println("当前线程名称:"+Thread.currentThread().getName()+"===保存好建档_id:"+p.getData());