jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 31f32578f60761c465681c6e694190e5264b7f19

Authored by liquanyu
1 parent 10ae3036b0
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

建档、修改

Showing 4 changed files with 47 additions and 34 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 31f3257
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.lyms.hospitalapi.cdfy.CdfyHisService;
5 6 import com.lyms.hospitalapi.dzfy.DzfyHisService;
... ... @@ -229,7 +230,7 @@
229 230 */
230 231 public BaseObjectResponse addPregnantBookbuilding(
231 232 YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) {
232   -
  233 + yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors()));
233 234 if (StringUtils.isNotEmpty(yunRequest.getOrgName()))
234 235 {
235 236 OrganizationQuery organizationQuery = new OrganizationQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DoctorDTO.java View file @ 31f3257
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +public class DoctorDTO {
  4 + private String name;
  5 + private Integer id;
  6 +
  7 + @Override
  8 + public String toString() {
  9 + return "DoctorDTO{" +
  10 + "name='" + name + '\'' +
  11 + ", id=" + id +
  12 + '}';
  13 + }
  14 +
  15 + public String getName() {
  16 + return name;
  17 + }
  18 +
  19 + public void setName(String name) {
  20 + this.name = name;
  21 + }
  22 +
  23 + public Integer getId() {
  24 + return id;
  25 + }
  26 +
  27 + public void setId(Integer id) {
  28 + this.id = id;
  29 + }
  30 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 31f3257
... ... @@ -52,8 +52,11 @@
52 52 private FilePathModel filePath;
53 53  
54 54 //随访医生
55   - private DoctorDTO booksuifangDoctor;
  55 + private String booksuifangDoctor;
56 56  
  57 + //随访医生
  58 + private DoctorDTO booksuifangDoctors;
  59 +
57 60 //孕妇证件核验方式 1 自动核验 2人工核验
58 61 private String patientVerifType;
59 62  
60 63  
61 64  
... ... @@ -83,14 +86,22 @@
83 86 //归属地id
84 87 private String addressId;
85 88  
86   - public DoctorDTO getBooksuifangDoctor() {
  89 + public String getBooksuifangDoctor() {
87 90 return booksuifangDoctor;
88 91 }
89 92  
90   - public void setBooksuifangDoctor(DoctorDTO booksuifangDoctor) {
  93 + public void setBooksuifangDoctor(String booksuifangDoctor) {
91 94 this.booksuifangDoctor = booksuifangDoctor;
92 95 }
93 96  
  97 + public DoctorDTO getBooksuifangDoctors() {
  98 + return booksuifangDoctors;
  99 + }
  100 +
  101 + public void setBooksuifangDoctors(DoctorDTO booksuifangDoctors) {
  102 + this.booksuifangDoctors = booksuifangDoctors;
  103 + }
  104 +
94 105 public String getAddressId() {
95 106 return addressId;
96 107 }
... ... @@ -1550,35 +1561,6 @@
1550 1561 ", fillDate='" + fillDate + '\'' +
1551 1562 ", townOrgId='" + townOrgId + '\'' +
1552 1563 '}';
1553   - }
1554   -
1555   - public static class DoctorDTO {
1556   - private String name;
1557   - private Integer id;
1558   -
1559   - @Override
1560   - public String toString() {
1561   - return "DoctorDTO{" +
1562   - "name='" + name + '\'' +
1563   - ", id=" + id +
1564   - '}';
1565   - }
1566   -
1567   - public String getName() {
1568   - return name;
1569   - }
1570   -
1571   - public void setName(String name) {
1572   - this.name = name;
1573   - }
1574   -
1575   - public Integer getId() {
1576   - return id;
1577   - }
1578   -
1579   - public void setId(Integer id) {
1580   - this.id = id;
1581   - }
1582 1564 }
1583 1565 }
platform-transfer/src/main/resources/application-test.yml View file @ 31f3257
... ... @@ -8,5 +8,5 @@
8 8 #区域url地址
9 9 url: https://dev-rp-api.healthbaby.com.cn
10 10 type: 0 # 0孕妇 1儿童
11   - hospital-id: 2100001514 #216
  11 + hospital-id: 2100001514 #216findPatientData