feature: 挂号订单详情返回分院信息

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -581,6 +581,16 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 data.setEndTime(Checker.getStringValue(item.getEndTime()));
                 data.setRegisteredDate(DateUtil.convertTimestampToDateString(item.getRegisteredDate(), "yyyy-MM-dd"));
                 data.setCardNum(Checker.getStringValue(item.getMedicalCardNo()));
+                int subHospitalId = item.getSubHospitalId();
+                String subHospital = "";
+                if (subHospitalId > 0) {
+                    // 从缓存读
+                    Hospital hospital = systemSrv.getHospitalById(subHospitalId);
+                    if (hospital != null) {
+                        subHospital = String.format("%s(%s)", hospital.getHospitalName(), hospital.getAddress());
+                    }
+                }
+                data.setSubHospital(subHospital);
                 return data;
             }
         }

onemini-hospital-empty/src/main/java/com/ywt/gapi/order/RegisteredOrder.java

@@ -51,6 +51,7 @@ private static final long serialVersionUID = 0L;
     hisClinicCode_ = "";
     medicalCardNo_ = "";
     hisPatientId_ = "";
+    subHospitalId_ = 0;
   }
 
   @java.lang.Override
@@ -253,6 +254,11 @@ private static final long serialVersionUID = 0L;
             hisPatientId_ = s;
             break;
           }
+          case 256: {
+
+            subHospitalId_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -906,6 +912,19 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int SUBHOSPITALID_FIELD_NUMBER = 32;
+  private int subHospitalId_;
+  /**
+   * <pre>
+   * 院区 id
+   * </pre>
+   *
+   * <code>int32 subHospitalId = 32;</code>
+   */
+  public int getSubHospitalId() {
+    return subHospitalId_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -1011,6 +1030,9 @@ private static final long serialVersionUID = 0L;
     if (!getHisPatientIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 31, hisPatientId_);
     }
+    if (subHospitalId_ != 0) {
+      output.writeInt32(32, subHospitalId_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -1129,6 +1151,10 @@ private static final long serialVersionUID = 0L;
     if (!getHisPatientIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(31, hisPatientId_);
     }
+    if (subHospitalId_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(32, subHospitalId_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1207,6 +1233,8 @@ private static final long serialVersionUID = 0L;
         .equals(other.getMedicalCardNo());
     result = result && getHisPatientId()
         .equals(other.getHisPatientId());
+    result = result && (getSubHospitalId()
+        == other.getSubHospitalId());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -1283,6 +1311,8 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getMedicalCardNo().hashCode();
     hash = (37 * hash) + HISPATIENTID_FIELD_NUMBER;
     hash = (53 * hash) + getHisPatientId().hashCode();
+    hash = (37 * hash) + SUBHOSPITALID_FIELD_NUMBER;
+    hash = (53 * hash) + getSubHospitalId();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1478,6 +1508,8 @@ private static final long serialVersionUID = 0L;
 
       hisPatientId_ = "";
 
+      subHospitalId_ = 0;
+
       return this;
     }
 
@@ -1531,6 +1563,7 @@ private static final long serialVersionUID = 0L;
       result.hisClinicCode_ = hisClinicCode_;
       result.medicalCardNo_ = medicalCardNo_;
       result.hisPatientId_ = hisPatientId_;
+      result.subHospitalId_ = subHospitalId_;
       onBuilt();
       return result;
     }
@@ -1679,6 +1712,9 @@ private static final long serialVersionUID = 0L;
         hisPatientId_ = other.hisPatientId_;
         onChanged();
       }
+      if (other.getSubHospitalId() != 0) {
+        setSubHospitalId(other.getSubHospitalId());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -3113,6 +3149,44 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int subHospitalId_ ;
+    /**
+     * <pre>
+     * 院区 id
+     * </pre>
+     *
+     * <code>int32 subHospitalId = 32;</code>
+     */
+    public int getSubHospitalId() {
+      return subHospitalId_;
+    }
+    /**
+     * <pre>
+     * 院区 id
+     * </pre>
+     *
+     * <code>int32 subHospitalId = 32;</code>
+     */
+    public Builder setSubHospitalId(int value) {
+      
+      subHospitalId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 院区 id
+     * </pre>
+     *
+     * <code>int32 subHospitalId = 32;</code>
+     */
+    public Builder clearSubHospitalId() {
+      
+      subHospitalId_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

onemini-hospital-empty/src/main/java/com/ywt/gapi/order/RegisteredOrderOrBuilder.java

@@ -231,4 +231,13 @@ public interface RegisteredOrderOrBuilder extends
    */
   com.google.protobuf.ByteString
       getHisPatientIdBytes();
+
+  /**
+   * <pre>
+   * 院区 id
+   * </pre>
+   *
+   * <code>int32 subHospitalId = 32;</code>
+   */
+  int getSubHospitalId();
 }

onemini-hospital-sdk/src/main/java/com/ywt/response/register/QueryOrderDetailResponseData.java

@@ -35,4 +35,5 @@ public class QueryOrderDetailResponseData implements IsvResponseData {
     private String registeredDate;//预约时间
     private String deptCode;
     private String hisPatientId;
+    private String subHospital; // 院区信息
 }