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 878d5ac..a9f8ec0 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 @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.lyms.hospitalapi.cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyHisService; @@ -229,7 +230,7 @@ public class BookbuildingFacade { */ public BaseObjectResponse addPregnantBookbuilding( YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) { - + yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors())); if (StringUtils.isNotEmpty(yunRequest.getOrgName())) { OrganizationQuery organizationQuery = new OrganizationQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DoctorDTO.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DoctorDTO.java new file mode 100644 index 0000000..fba6bbb --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DoctorDTO.java @@ -0,0 +1,30 @@ +package com.lyms.platform.operate.web.request; + +public class DoctorDTO { + private String name; + private Integer id; + + @Override + public String toString() { + return "DoctorDTO{" + + "name='" + name + '\'' + + ", id=" + id + + '}'; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 8329d20..8bb8985 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -52,7 +52,10 @@ public class YunBookbuildingAddRequest { private FilePathModel filePath; //随访医生 - private DoctorDTO booksuifangDoctor; + private String booksuifangDoctor; + + //随访医生 + private DoctorDTO booksuifangDoctors; //孕妇证件核验方式 1 自动核验 2人工核验 private String patientVerifType; @@ -83,14 +86,22 @@ public class YunBookbuildingAddRequest { //归属地id private String addressId; - public DoctorDTO getBooksuifangDoctor() { + public String getBooksuifangDoctor() { return booksuifangDoctor; } - public void setBooksuifangDoctor(DoctorDTO booksuifangDoctor) { + public void setBooksuifangDoctor(String booksuifangDoctor) { this.booksuifangDoctor = booksuifangDoctor; } + public DoctorDTO getBooksuifangDoctors() { + return booksuifangDoctors; + } + + public void setBooksuifangDoctors(DoctorDTO booksuifangDoctors) { + this.booksuifangDoctors = booksuifangDoctors; + } + public String getAddressId() { return addressId; } @@ -1551,33 +1562,4 @@ public class YunBookbuildingAddRequest { ", townOrgId='" + townOrgId + '\'' + '}'; } - - public static class DoctorDTO { - private String name; - private Integer id; - - @Override - public String toString() { - return "DoctorDTO{" + - "name='" + name + '\'' + - ", id=" + id + - '}'; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - } } diff --git a/platform-transfer/src/main/resources/application-test.yml b/platform-transfer/src/main/resources/application-test.yml index 08915b9..18a0774 100644 --- a/platform-transfer/src/main/resources/application-test.yml +++ b/platform-transfer/src/main/resources/application-test.yml @@ -8,4 +8,4 @@ param: #区域url地址 url: https://dev-rp-api.healthbaby.com.cn type: 0 # 0孕妇 1儿童 - hospital-id: 2100001514 #216 \ No newline at end of file + hospital-id: 2100001514 #216findPatientData \ No newline at end of file