瀏覽代碼

feature: 挂号列表返回院区信息

Walker 2 年之前
父節點
當前提交
b732b8bf0b

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

@@ -627,6 +627,16 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                     data.setCreateTime(Checker.getStringValue(item.getStartTime()));
                     data.setEndTime(Checker.getStringValue(item.getEndTime()));
                     data.setRegisteredDate(item.getRegisteredDate());
+                    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);
                     list.add(data);
                 }
             }

+ 5 - 0
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/services/SystemSrv.java

@@ -344,6 +344,11 @@ public class SystemSrv {
         return hospital == null ? "" : Checker.getStringValue(hospital.getHospitalName());
     }
 
+    public com.ywt.gapi.system.Hospital getHospitalById(int hospitalId) {
+        List<com.ywt.gapi.system.Hospital> list = getHospitalListFromCache();
+        return list.stream().filter(h -> hospitalId == h.getHospitalId()).findFirst().orElse(null);
+    }
+
     private List<Hospital> getHospitalListFromCache() {
         try {
             return (List<Hospital>) CacheUtil.getInstance().get(HOSPITAL_LIST, () -> getHospitalList(1, 1000));

+ 58 - 0
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CommonOrder.java

@@ -42,6 +42,7 @@ private static final long serialVersionUID = 0L;
     registeredType_ = 0;
     hisAdmAddr_ = "";
     hisPatientId_ = "";
+    subHospitalId_ = 0;
   }
 
   @java.lang.Override
@@ -200,6 +201,11 @@ private static final long serialVersionUID = 0L;
             hisPatientId_ = s;
             break;
           }
+          case 184: {
+
+            subHospitalId_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -813,6 +819,15 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int SUBHOSPITALID_FIELD_NUMBER = 23;
+  private int subHospitalId_;
+  /**
+   * <code>int32 subHospitalId = 23;</code>
+   */
+  public int getSubHospitalId() {
+    return subHospitalId_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -891,6 +906,9 @@ private static final long serialVersionUID = 0L;
     if (!getHisPatientIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 22, hisPatientId_);
     }
+    if (subHospitalId_ != 0) {
+      output.writeInt32(23, subHospitalId_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -972,6 +990,10 @@ private static final long serialVersionUID = 0L;
     if (!getHisPatientIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, hisPatientId_);
     }
+    if (subHospitalId_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(23, subHospitalId_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1032,6 +1054,8 @@ private static final long serialVersionUID = 0L;
         .equals(other.getHisAdmAddr());
     result = result && getHisPatientId()
         .equals(other.getHisPatientId());
+    result = result && (getSubHospitalId()
+        == other.getSubHospitalId());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -1088,6 +1112,8 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getHisAdmAddr().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;
@@ -1265,6 +1291,8 @@ private static final long serialVersionUID = 0L;
 
       hisPatientId_ = "";
 
+      subHospitalId_ = 0;
+
       return this;
     }
 
@@ -1309,6 +1337,7 @@ private static final long serialVersionUID = 0L;
       result.registeredType_ = registeredType_;
       result.hisAdmAddr_ = hisAdmAddr_;
       result.hisPatientId_ = hisPatientId_;
+      result.subHospitalId_ = subHospitalId_;
       onBuilt();
       return result;
     }
@@ -1431,6 +1460,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;
@@ -2718,6 +2750,32 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int subHospitalId_ ;
+    /**
+     * <code>int32 subHospitalId = 23;</code>
+     */
+    public int getSubHospitalId() {
+      return subHospitalId_;
+    }
+    /**
+     * <code>int32 subHospitalId = 23;</code>
+     */
+    public Builder setSubHospitalId(int value) {
+      
+      subHospitalId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 subHospitalId = 23;</code>
+     */
+    public Builder clearSubHospitalId() {
+      
+      subHospitalId_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

+ 5 - 0
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CommonOrderOrBuilder.java

@@ -207,4 +207,9 @@ public interface CommonOrderOrBuilder extends
    */
   com.google.protobuf.ByteString
       getHisPatientIdBytes();
+
+  /**
+   * <code>int32 subHospitalId = 23;</code>
+   */
+  int getSubHospitalId();
 }

+ 74 - 0
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateRegisteredRequest.java

@@ -41,6 +41,7 @@ private static final long serialVersionUID = 0L;
     lockQueueNo_ = "";
     availableNumStr_ = "";
     hospitalId_ = 0;
+    subHospitalId_ = 0;
   }
 
   @java.lang.Override
@@ -189,6 +190,11 @@ private static final long serialVersionUID = 0L;
             hospitalId_ = input.readInt32();
             break;
           }
+          case 176: {
+
+            subHospitalId_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -756,6 +762,19 @@ private static final long serialVersionUID = 0L;
     return hospitalId_;
   }
 
+  public static final int SUBHOSPITALID_FIELD_NUMBER = 22;
+  private int subHospitalId_;
+  /**
+   * <pre>
+   * 分院 id
+   * </pre>
+   *
+   * <code>int32 subHospitalId = 22;</code>
+   */
+  public int getSubHospitalId() {
+    return subHospitalId_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -831,6 +850,9 @@ private static final long serialVersionUID = 0L;
     if (hospitalId_ != 0) {
       output.writeInt32(21, hospitalId_);
     }
+    if (subHospitalId_ != 0) {
+      output.writeInt32(22, subHospitalId_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -913,6 +935,10 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(21, hospitalId_);
     }
+    if (subHospitalId_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(22, subHospitalId_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -971,6 +997,8 @@ private static final long serialVersionUID = 0L;
         .equals(other.getAvailableNumStr());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && (getSubHospitalId()
+        == other.getSubHospitalId());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -1025,6 +1053,8 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getAvailableNumStr().hashCode();
     hash = (37 * hash) + HOSPITALID_FIELD_NUMBER;
     hash = (53 * hash) + getHospitalId();
+    hash = (37 * hash) + SUBHOSPITALID_FIELD_NUMBER;
+    hash = (53 * hash) + getSubHospitalId();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1200,6 +1230,8 @@ private static final long serialVersionUID = 0L;
 
       hospitalId_ = 0;
 
+      subHospitalId_ = 0;
+
       return this;
     }
 
@@ -1243,6 +1275,7 @@ private static final long serialVersionUID = 0L;
       result.lockQueueNo_ = lockQueueNo_;
       result.availableNumStr_ = availableNumStr_;
       result.hospitalId_ = hospitalId_;
+      result.subHospitalId_ = subHospitalId_;
       onBuilt();
       return result;
     }
@@ -1357,6 +1390,9 @@ private static final long serialVersionUID = 0L;
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      if (other.getSubHospitalId() != 0) {
+        setSubHospitalId(other.getSubHospitalId());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -2639,6 +2675,44 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int subHospitalId_ ;
+    /**
+     * <pre>
+     * 分院 id
+     * </pre>
+     *
+     * <code>int32 subHospitalId = 22;</code>
+     */
+    public int getSubHospitalId() {
+      return subHospitalId_;
+    }
+    /**
+     * <pre>
+     * 分院 id
+     * </pre>
+     *
+     * <code>int32 subHospitalId = 22;</code>
+     */
+    public Builder setSubHospitalId(int value) {
+      
+      subHospitalId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 分院 id
+     * </pre>
+     *
+     * <code>int32 subHospitalId = 22;</code>
+     */
+    public Builder clearSubHospitalId() {
+      
+      subHospitalId_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

+ 9 - 0
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateRegisteredRequestOrBuilder.java

@@ -265,4 +265,13 @@ public interface CreateRegisteredRequestOrBuilder extends
    * <code>int32 hospitalId = 21;</code>
    */
   int getHospitalId();
+
+  /**
+   * <pre>
+   * 分院 id
+   * </pre>
+   *
+   * <code>int32 subHospitalId = 22;</code>
+   */
+  int getSubHospitalId();
 }

+ 310 - 0
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisterCheckInMessageRequest.java

@@ -25,6 +25,8 @@ private static final long serialVersionUID = 0L;
     hospitalId_ = 0;
     admBoroughDesc_ = "";
     admLoc_ = "";
+    admDoc_ = "";
+    rangTime_ = "";
   }
 
   @java.lang.Override
@@ -110,6 +112,18 @@ private static final long serialVersionUID = 0L;
             admLoc_ = s;
             break;
           }
+          case 82: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            admDoc_ = s;
+            break;
+          }
+          case 90: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            rangTime_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -446,6 +460,90 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int ADMDOC_FIELD_NUMBER = 10;
+  private volatile java.lang.Object admDoc_;
+  /**
+   * <pre>
+   *医生姓名
+   * </pre>
+   *
+   * <code>string admDoc = 10;</code>
+   */
+  public java.lang.String getAdmDoc() {
+    java.lang.Object ref = admDoc_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      admDoc_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   *医生姓名
+   * </pre>
+   *
+   * <code>string admDoc = 10;</code>
+   */
+  public com.google.protobuf.ByteString
+      getAdmDocBytes() {
+    java.lang.Object ref = admDoc_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      admDoc_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int RANGTIME_FIELD_NUMBER = 11;
+  private volatile java.lang.Object rangTime_;
+  /**
+   * <pre>
+   *时间范围
+   * </pre>
+   *
+   * <code>string rangTime = 11;</code>
+   */
+  public java.lang.String getRangTime() {
+    java.lang.Object ref = rangTime_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      rangTime_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   *时间范围
+   * </pre>
+   *
+   * <code>string rangTime = 11;</code>
+   */
+  public com.google.protobuf.ByteString
+      getRangTimeBytes() {
+    java.lang.Object ref = rangTime_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      rangTime_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -485,6 +583,12 @@ private static final long serialVersionUID = 0L;
     if (!getAdmLocBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, admLoc_);
     }
+    if (!getAdmDocBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 10, admDoc_);
+    }
+    if (!getRangTimeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 11, rangTime_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -522,6 +626,12 @@ private static final long serialVersionUID = 0L;
     if (!getAdmLocBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, admLoc_);
     }
+    if (!getAdmDocBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, admDoc_);
+    }
+    if (!getRangTimeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, rangTime_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -556,6 +666,10 @@ private static final long serialVersionUID = 0L;
         .equals(other.getAdmBoroughDesc());
     result = result && getAdmLoc()
         .equals(other.getAdmLoc());
+    result = result && getAdmDoc()
+        .equals(other.getAdmDoc());
+    result = result && getRangTime()
+        .equals(other.getRangTime());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -585,6 +699,10 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getAdmBoroughDesc().hashCode();
     hash = (37 * hash) + ADMLOC_FIELD_NUMBER;
     hash = (53 * hash) + getAdmLoc().hashCode();
+    hash = (37 * hash) + ADMDOC_FIELD_NUMBER;
+    hash = (53 * hash) + getAdmDoc().hashCode();
+    hash = (37 * hash) + RANGTIME_FIELD_NUMBER;
+    hash = (53 * hash) + getRangTime().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -732,6 +850,10 @@ private static final long serialVersionUID = 0L;
 
       admLoc_ = "";
 
+      admDoc_ = "";
+
+      rangTime_ = "";
+
       return this;
     }
 
@@ -763,6 +885,8 @@ private static final long serialVersionUID = 0L;
       result.hospitalId_ = hospitalId_;
       result.admBoroughDesc_ = admBoroughDesc_;
       result.admLoc_ = admLoc_;
+      result.admDoc_ = admDoc_;
+      result.rangTime_ = rangTime_;
       onBuilt();
       return result;
     }
@@ -838,6 +962,14 @@ private static final long serialVersionUID = 0L;
         admLoc_ = other.admLoc_;
         onChanged();
       }
+      if (!other.getAdmDoc().isEmpty()) {
+        admDoc_ = other.admDoc_;
+        onChanged();
+      }
+      if (!other.getRangTime().isEmpty()) {
+        rangTime_ = other.rangTime_;
+        onChanged();
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1539,6 +1671,184 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private java.lang.Object admDoc_ = "";
+    /**
+     * <pre>
+     *医生姓名
+     * </pre>
+     *
+     * <code>string admDoc = 10;</code>
+     */
+    public java.lang.String getAdmDoc() {
+      java.lang.Object ref = admDoc_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        admDoc_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     *医生姓名
+     * </pre>
+     *
+     * <code>string admDoc = 10;</code>
+     */
+    public com.google.protobuf.ByteString
+        getAdmDocBytes() {
+      java.lang.Object ref = admDoc_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        admDoc_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     *医生姓名
+     * </pre>
+     *
+     * <code>string admDoc = 10;</code>
+     */
+    public Builder setAdmDoc(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      admDoc_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *医生姓名
+     * </pre>
+     *
+     * <code>string admDoc = 10;</code>
+     */
+    public Builder clearAdmDoc() {
+      
+      admDoc_ = getDefaultInstance().getAdmDoc();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *医生姓名
+     * </pre>
+     *
+     * <code>string admDoc = 10;</code>
+     */
+    public Builder setAdmDocBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      admDoc_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object rangTime_ = "";
+    /**
+     * <pre>
+     *时间范围
+     * </pre>
+     *
+     * <code>string rangTime = 11;</code>
+     */
+    public java.lang.String getRangTime() {
+      java.lang.Object ref = rangTime_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        rangTime_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     *时间范围
+     * </pre>
+     *
+     * <code>string rangTime = 11;</code>
+     */
+    public com.google.protobuf.ByteString
+        getRangTimeBytes() {
+      java.lang.Object ref = rangTime_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        rangTime_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     *时间范围
+     * </pre>
+     *
+     * <code>string rangTime = 11;</code>
+     */
+    public Builder setRangTime(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      rangTime_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *时间范围
+     * </pre>
+     *
+     * <code>string rangTime = 11;</code>
+     */
+    public Builder clearRangTime() {
+      
+      rangTime_ = getDefaultInstance().getRangTime();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *时间范围
+     * </pre>
+     *
+     * <code>string rangTime = 11;</code>
+     */
+    public Builder setRangTimeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      rangTime_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);

+ 36 - 0
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisterCheckInMessageRequestOrBuilder.java

@@ -142,4 +142,40 @@ public interface RegisterCheckInMessageRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getAdmLocBytes();
+
+  /**
+   * <pre>
+   *医生姓名
+   * </pre>
+   *
+   * <code>string admDoc = 10;</code>
+   */
+  java.lang.String getAdmDoc();
+  /**
+   * <pre>
+   *医生姓名
+   * </pre>
+   *
+   * <code>string admDoc = 10;</code>
+   */
+  com.google.protobuf.ByteString
+      getAdmDocBytes();
+
+  /**
+   * <pre>
+   *时间范围
+   * </pre>
+   *
+   * <code>string rangTime = 11;</code>
+   */
+  java.lang.String getRangTime();
+  /**
+   * <pre>
+   *时间范围
+   * </pre>
+   *
+   * <code>string rangTime = 11;</code>
+   */
+  com.google.protobuf.ByteString
+      getRangTimeBytes();
 }

+ 129 - 127
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/TaiheRegister.java

@@ -194,7 +194,7 @@ public final class TaiheRegister {
   static {
     java.lang.String[] descriptorData = {
       "\n\024taihe_register.proto\022\033com.ywt.gapi.tai" +
-      "he.register\"\273\003\n\027CreateRegisteredRequest\022" +
+      "he.register\"\322\003\n\027CreateRegisteredRequest\022" +
       "\023\n\013doctorTitle\030\001 \001(\t\022\020\n\010deptCode\030\002 \001(\t\022\020" +
       "\n\010deptName\030\003 \001(\t\022\022\n\ndoctorCode\030\004 \001(\t\022\022\n\n" +
       "doctorName\030\005 \001(\t\022\r\n\005total\030\006 \001(\005\022\025\n\rregis" +
@@ -205,129 +205,131 @@ public final class TaiheRegister {
       "eItemCode\030\017 \001(\t\022\026\n\016paymentChannel\030\020 \001(\005\022" +
       "\016\n\006source\030\021 \001(\005\022\016\n\006deptId\030\022 \001(\005\022\023\n\013lockQ" +
       "ueueNo\030\023 \001(\t\022\027\n\017availableNumStr\030\024 \001(\t\022\022\n" +
-      "\nhospitalId\030\025 \001(\005\"\336\001\n\030CreateRegisteredRe" +
-      "sponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\022\021\n\tord" +
-      "erType\030\003 \001(\005\022\016\n\006status\030\004 \001(\005\022\025\n\rhisClini" +
-      "cCode\030\005 \001(\005\022\016\n\006mobile\030\006 \001(\t\022\014\n\004name\030\007 \001(" +
-      "\t\022\014\n\004idNo\030\010 \001(\t\022\017\n\007orderId\030\t \001(\005\022\017\n\007orde" +
-      "rNo\030\n \001(\t\022\020\n\010doctorId\030\013 \001(\005\022\r\n\005regId\030\014 \001" +
-      "(\005\"N\n\027CancelRegisteredRequest\022\017\n\007orderId" +
-      "\030\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001" +
-      "(\005\"E\n\030CancelRegisteredResponse\022\014\n\004code\030\001" +
-      " \001(\005\022\013\n\003msg\030\002 \001(\t\022\016\n\006status\030\003 \001(\005\"\234\002\n\022Pa" +
-      "yCallbackRequest\022\017\n\007orderNo\030\001 \001(\t\022\017\n\007ord" +
-      "erId\030\002 \001(\005\022\017\n\007payType\030\003 \001(\005\022\016\n\006custom\030\004 " +
-      "\001(\t\022\r\n\005bizId\030\005 \001(\005\022\021\n\tpaymentNo\030\006 \001(\t\022\016\n" +
-      "\006userId\030\007 \001(\005\022\020\n\010prepayId\030\010 \001(\t\022\020\n\010termi" +
-      "nal\030\t \001(\005\022\016\n\006openid\030\n \001(\t\022\026\n\016paymentChan" +
-      "nel\030\013 \001(\005\022\025\n\roneTimeCustom\030\014 \001(\t\022\027\n\017wxTr" +
-      "ansactionId\030\r \001(\t\022\025\n\rpayFinishDate\030\016 \001(\003" +
-      "\"1\n\023PayCallbackResponse\022\014\n\004code\030\001 \001(\005\022\014\n" +
-      "\004info\030\002 \001(\t\"\220\001\n\025RefundCallbackRequest\022\016\n" +
-      "\006amount\030\001 \001(\005\022\r\n\005bizId\030\002 \001(\005\022\017\n\007orderId\030" +
-      "\003 \001(\005\022\017\n\007orderNo\030\004 \001(\t\022\020\n\010refundNo\030\005 \001(\t" +
-      "\022\024\n\014refundStatus\030\006 \001(\005\022\016\n\006custom\030\007 \001(\t\"3" +
-      "\n\026RefundCallbackResponse\022\014\n\004code\030\001 \001(\005\022\013" +
-      "\n\003msg\030\002 \001(\t\" \n\017RegisterRequest\022\r\n\005regId\030" +
-      "\001 \001(\005\"-\n\020RegisterResponse\022\014\n\004code\030\001 \001(\005\022" +
-      "\013\n\003msg\030\002 \001(\t\"B\n\013TakeRequest\022\017\n\007orderId\030\001" +
-      " \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001(\005" +
-      "\"@\n\014TakeResponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 " +
-      "\001(\t\022\025\n\rhisClinicCode\030\003 \001(\t\"9\n\023GetQueueLi" +
-      "stRequest\022\016\n\006userId\030\001 \001(\005\022\022\n\nhospitalId\030" +
-      "\002 \001(\005\"\316\005\n\017RegisteredOrder\022\017\n\007orderId\030\001 \001" +
-      "(\005\022\024\n\014registeredId\030\002 \001(\005\022\016\n\006userId\030\003 \001(\005" +
-      "\022\022\n\nhospitalId\030\004 \001(\005\022\024\n\014hospitalName\030\005 \001" +
-      "(\t\022\026\n\016registeredDate\030\006 \001(\003\022\030\n\020registered" +
-      "Period\030\007 \001(\005\022\021\n\tstartTime\030\010 \001(\t\022\017\n\007endTi" +
-      "me\030\t \001(\t\022\025\n\rmedicalCardId\030\n \001(\005\022\023\n\013patie" +
-      "ntName\030\013 \001(\t\022\026\n\016paymentChannel\030\014 \001(\005\022\022\n\n" +
-      "updateTime\030\r \001(\003\022\022\n\ncreateTime\030\016 \001(\003\022\022\n\n" +
-      "doctorCode\030\017 \001(\t\022\020\n\010deptCode\030\020 \001(\t\022\020\n\010de" +
-      "ptName\030\021 \001(\t\022\025\n\rregisteredFee\030\022 \001(\005\022\022\n\nm" +
-      "edicalFee\030\023 \001(\005\022\025\n\rpaymentStatus\030\024 \001(\005\022\030" +
-      "\n\020registeredStatus\030\025 \001(\005\022\016\n\006remark\030\026 \001(\t" +
-      "\022\017\n\007orderNo\030\027 \001(\t\022\023\n\013orderRemark\030\030 \001(\t\022\021" +
-      "\n\torderType\030\031 \001(\005\022\r\n\005total\030\032 \001(\005\022\022\n\ndoct" +
-      "orName\030\033 \001(\t\022\013\n\003sex\030\034 \001(\005\022\025\n\rhisClinicCo" +
-      "de\030\035 \001(\t\022\017\n\007address\030\036 \001(\t\022\022\n\nstatusName\030" +
-      "\037 \001(\t\022\016\n\006status\030  \001(\005\022\023\n\013paymentDate\030! \001" +
-      "(\003\022\026\n\016registeredType\030\" \001(\005\022\022\n\nhisSeqCode" +
-      "\030# \001(\t\"n\n\024GetQueueListResponse\022\014\n\004code\030\001" +
-      " \001(\005\022\013\n\003msg\030\002 \001(\t\022;\n\005order\030\003 \003(\0132,.com.y" +
-      "wt.gapi.taihe.register.RegisteredOrder\"\274" +
-      "\003\n\013CommonOrder\022\017\n\007orderId\030\001 \001(\005\022\017\n\007order" +
-      "No\030\002 \001(\t\022\022\n\nhospitalId\030\003 \001(\005\022\024\n\014hospital" +
-      "Name\030\004 \001(\t\022\020\n\010deptName\030\005 \001(\t\022\016\n\006amount\030\006" +
-      " \001(\005\022\022\n\ndoctorName\030\007 \001(\t\022\023\n\013patientName\030" +
-      "\010 \001(\t\022\023\n\013doctorTitle\030\t \001(\t\022\022\n\nstatusName" +
-      "\030\n \001(\t\022\022\n\npatientSex\030\013 \001(\t\022\026\n\016registered" +
-      "Date\030\014 \001(\t\022\021\n\tstartTime\030\r \001(\t\022\017\n\007endTime" +
-      "\030\016 \001(\t\022\021\n\torderType\030\017 \001(\005\022\022\n\norderTitle\030" +
-      "\020 \001(\t\022\022\n\ncreateTime\030\021 \001(\003\022\016\n\006cancel\030\022 \001(" +
-      "\005\022\020\n\010deptCode\030\023 \001(\t\022\026\n\016registeredType\030\024 " +
-      "\001(\005\022\022\n\nhisAdmAddr\030\025 \001(\t\022\024\n\014hisPatientId\030" +
-      "\026 \001(\t\"t\n\031GetCommonOrderListRequest\022\016\n\006us" +
-      "erId\030\001 \001(\005\022\017\n\007endDate\030\002 \001(\003\022\021\n\tpageIndex" +
-      "\030\003 \001(\005\022\020\n\010pageSize\030\004 \001(\005\022\021\n\tstartDate\030\005 " +
-      "\001(\003\"\222\001\n\032GetCommonOrderListResponse\022\014\n\004co" +
-      "de\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\0227\n\005order\030\003 \003(\0132(.c" +
-      "om.ywt.gapi.taihe.register.CommonOrder\022\021" +
-      "\n\ttotalPage\030\004 \001(\005\022\r\n\005count\030\005 \001(\005\"{\n\030GetR" +
-      "egisteredListRequest\022\016\n\006userId\030\001 \001(\005\022\026\n\016" +
-      "registeredType\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001(\005" +
-      "\022\021\n\tpageIndex\030\004 \001(\005\022\020\n\010pageSize\030\005 \001(\005\"\225\001" +
-      "\n\031GetRegisteredListResponse\022\014\n\004code\030\001 \001(" +
-      "\005\022\013\n\003msg\030\002 \001(\t\022;\n\005order\030\003 \003(\0132,.com.ywt." +
-      "gapi.taihe.register.RegisteredOrder\022\021\n\tt" +
-      "otalPage\030\004 \001(\005\022\r\n\005count\030\005 \001(\005\"\263\003\n!Regist" +
-      "erWithoutMedicalCardRequest\022\016\n\006deptId\030\001 " +
-      "\001(\005\022\020\n\010deptCode\030\002 \001(\t\022\020\n\010deptName\030\003 \001(\t\022" +
-      "\022\n\ndoctorCode\030\004 \001(\t\022\022\n\ndoctorName\030\005 \001(\t\022" +
-      "\r\n\005total\030\006 \001(\005\022\025\n\rregisteredFee\030\007 \001(\005\022\022\n" +
-      "\nmedicalFee\030\010 \001(\005\022\026\n\016registeredDate\030\t \001(" +
-      "\003\022\016\n\006period\030\n \001(\005\022\021\n\tstartTime\030\013 \001(\t\022\017\n\007" +
-      "endTime\030\014 \001(\t\022\016\n\006userId\030\r \001(\005\022\030\n\020schedul" +
-      "eItemCode\030\016 \001(\t\022\016\n\006idType\030\017 \001(\t\022\014\n\004idNo\030" +
-      "\020 \001(\t\022\023\n\013patientName\030\021 \001(\t\022\025\n\rpatientMob" +
-      "ile\030\022 \001(\t\022\022\n\npatientSex\030\023 \001(\005\022\020\n\010birthda" +
-      "y\030\024 \001(\003\022\022\n\nhospitalId\030\025 \001(\005\"?\n\"RegisterW" +
-      "ithoutMedicalCardResponse\022\014\n\004code\030\001 \001(\005\022" +
-      "\013\n\003msg\030\002 \001(\t\"N\n&GetOfflineConsultInfoByD" +
-      "octorIdRequest\022\020\n\010doctorId\030\001 \001(\005\022\022\n\nhosp" +
-      "italId\030\002 \001(\005\"\270\001\n\'GetOfflineConsultInfoBy" +
-      "DoctorIdResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002" +
-      " \001(\t\022\020\n\010deptCode\030\003 \001(\t\022\022\n\ndoctorName\030\004 \001" +
-      "(\t\022\025\n\rdoctorHisCode\030\005 \001(\t\022\016\n\006deptId\030\006 \001(" +
-      "\005\022\020\n\010deptName\030\007 \001(\t\022\022\n\nconsultFee\030\010 \001(\005\"" +
-      "P\n\030GetLatestRegOrderRequest\022\020\n\010doctorId\030" +
-      "\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001(" +
-      "\005\"M\n\031GetLatestRegOrderResponse\022\014\n\004code\030\001" +
-      " \001(\005\022\014\n\004info\030\002 \001(\t\022\024\n\014registerDate\030\003 \001(\003" +
-      "\"k\n\027CalAdditionalFeeRequest\022\025\n\rmedicalCa" +
-      "rdId\030\001 \001(\005\022\022\n\nmedicalFee\030\002 \001(\005\022\025\n\rregist" +
-      "eredFee\030\003 \001(\005\022\016\n\006userId\030\004 \001(\005\"_\n\030CalAddi" +
-      "tionalFeeResponse\022\025\n\rpayMedicalFee\030\001 \001(\005" +
-      "\022\020\n\010payTotal\030\002 \001(\005\022\014\n\004code\030\003 \001(\005\022\014\n\004info" +
-      "\030\004 \001(\t\"\237\001\n\'GetHisPatientIdByUserIdAndMob" +
-      "ileRequest\022\016\n\006userId\030\001 \001(\005\022\016\n\006mobile\030\002 \001" +
-      "(\t\022\016\n\006cardNo\030\003 \001(\t\022\017\n\007address\030\004 \001(\t\022\021\n\tp" +
-      "atientNo\030\005 \001(\t\022\014\n\004name\030\006 \001(\t\022\022\n\nhospital" +
-      "Id\030\007 \001(\005\"\\\n(GetHisPatientIdByUserIdAndMo" +
-      "bileResponse\022\024\n\014hisPatientId\030\001 \001(\t\022\014\n\004co" +
-      "de\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\"\267\001\n\030CreateMedical" +
-      "CardRequest\022\017\n\007phoneNo\030\001 \001(\t\022\014\n\004idNo\030\002 \001" +
-      "(\t\022\023\n\013patientName\030\003 \001(\t\022\014\n\004city\030\004 \001(\t\022\017\n" +
-      "\007address\030\005 \001(\t\022\016\n\006isInsu\030\006 \001(\t\022\022\n\nhospit" +
-      "alId\030\007 \001(\005\022\016\n\006userId\030\010 \001(\005\022\024\n\014relationsh" +
-      "ip\030\t \001(\005\"e\n\031CreateMedicalCardResponse\022\014\n" +
-      "\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\025\n\rmedicalCard" +
-      "Id\030\003 \001(\005\022\025\n\rmedicalCardNo\030\004 \001(\t\"\306\001\n\035Regi" +
-      "sterCheckInMessageRequest\022\016\n\006cardNo\030\001 \001(" +
-      "\t\022\020\n\010areaCode\030\002 \001(\t\022\017\n\007patName\030\003 \001(\t\022\017\n\007" +
-      "queueNo\030\004 \001(\t\022\025\n\radmArriveDate\030\005 \001(\t\022\016\n\006" +
-      "userId\030\006 \001(\005\022\022\n\nhospitalId\030\007 \001(\005\022\026\n\016admB" +
-      "oroughDesc\030\010 \001(\t\022\016\n\006admLoc\030\t \001(\t\"<\n\036Regi" +
+      "\nhospitalId\030\025 \001(\005\022\025\n\rsubHospitalId\030\026 \001(\005" +
+      "\"\336\001\n\030CreateRegisteredResponse\022\014\n\004code\030\001 " +
+      "\001(\005\022\013\n\003msg\030\002 \001(\t\022\021\n\torderType\030\003 \001(\005\022\016\n\006s" +
+      "tatus\030\004 \001(\005\022\025\n\rhisClinicCode\030\005 \001(\005\022\016\n\006mo" +
+      "bile\030\006 \001(\t\022\014\n\004name\030\007 \001(\t\022\014\n\004idNo\030\010 \001(\t\022\017" +
+      "\n\007orderId\030\t \001(\005\022\017\n\007orderNo\030\n \001(\t\022\020\n\010doct" +
+      "orId\030\013 \001(\005\022\r\n\005regId\030\014 \001(\005\"N\n\027CancelRegis" +
+      "teredRequest\022\017\n\007orderId\030\001 \001(\005\022\016\n\006userId\030" +
+      "\002 \001(\005\022\022\n\nhospitalId\030\003 \001(\005\"E\n\030CancelRegis" +
+      "teredResponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t" +
+      "\022\016\n\006status\030\003 \001(\005\"\234\002\n\022PayCallbackRequest\022" +
+      "\017\n\007orderNo\030\001 \001(\t\022\017\n\007orderId\030\002 \001(\005\022\017\n\007pay" +
+      "Type\030\003 \001(\005\022\016\n\006custom\030\004 \001(\t\022\r\n\005bizId\030\005 \001(" +
+      "\005\022\021\n\tpaymentNo\030\006 \001(\t\022\016\n\006userId\030\007 \001(\005\022\020\n\010" +
+      "prepayId\030\010 \001(\t\022\020\n\010terminal\030\t \001(\005\022\016\n\006open" +
+      "id\030\n \001(\t\022\026\n\016paymentChannel\030\013 \001(\005\022\025\n\roneT" +
+      "imeCustom\030\014 \001(\t\022\027\n\017wxTransactionId\030\r \001(\t" +
+      "\022\025\n\rpayFinishDate\030\016 \001(\003\"1\n\023PayCallbackRe" +
+      "sponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"\220\001\n\025R" +
+      "efundCallbackRequest\022\016\n\006amount\030\001 \001(\005\022\r\n\005" +
+      "bizId\030\002 \001(\005\022\017\n\007orderId\030\003 \001(\005\022\017\n\007orderNo\030" +
+      "\004 \001(\t\022\020\n\010refundNo\030\005 \001(\t\022\024\n\014refundStatus\030" +
+      "\006 \001(\005\022\016\n\006custom\030\007 \001(\t\"3\n\026RefundCallbackR" +
+      "esponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\" \n\017Re" +
+      "gisterRequest\022\r\n\005regId\030\001 \001(\005\"-\n\020Register" +
+      "Response\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"B\n\013T" +
+      "akeRequest\022\017\n\007orderId\030\001 \001(\005\022\016\n\006userId\030\002 " +
+      "\001(\005\022\022\n\nhospitalId\030\003 \001(\005\"@\n\014TakeResponse\022" +
+      "\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\022\025\n\rhisClinicC" +
+      "ode\030\003 \001(\t\"9\n\023GetQueueListRequest\022\016\n\006user" +
+      "Id\030\001 \001(\005\022\022\n\nhospitalId\030\002 \001(\005\"\316\005\n\017Registe" +
+      "redOrder\022\017\n\007orderId\030\001 \001(\005\022\024\n\014registeredI" +
+      "d\030\002 \001(\005\022\016\n\006userId\030\003 \001(\005\022\022\n\nhospitalId\030\004 " +
+      "\001(\005\022\024\n\014hospitalName\030\005 \001(\t\022\026\n\016registeredD" +
+      "ate\030\006 \001(\003\022\030\n\020registeredPeriod\030\007 \001(\005\022\021\n\ts" +
+      "tartTime\030\010 \001(\t\022\017\n\007endTime\030\t \001(\t\022\025\n\rmedic" +
+      "alCardId\030\n \001(\005\022\023\n\013patientName\030\013 \001(\t\022\026\n\016p" +
+      "aymentChannel\030\014 \001(\005\022\022\n\nupdateTime\030\r \001(\003\022" +
+      "\022\n\ncreateTime\030\016 \001(\003\022\022\n\ndoctorCode\030\017 \001(\t\022" +
+      "\020\n\010deptCode\030\020 \001(\t\022\020\n\010deptName\030\021 \001(\t\022\025\n\rr" +
+      "egisteredFee\030\022 \001(\005\022\022\n\nmedicalFee\030\023 \001(\005\022\025" +
+      "\n\rpaymentStatus\030\024 \001(\005\022\030\n\020registeredStatu" +
+      "s\030\025 \001(\005\022\016\n\006remark\030\026 \001(\t\022\017\n\007orderNo\030\027 \001(\t" +
+      "\022\023\n\013orderRemark\030\030 \001(\t\022\021\n\torderType\030\031 \001(\005" +
+      "\022\r\n\005total\030\032 \001(\005\022\022\n\ndoctorName\030\033 \001(\t\022\013\n\003s" +
+      "ex\030\034 \001(\005\022\025\n\rhisClinicCode\030\035 \001(\t\022\017\n\007addre" +
+      "ss\030\036 \001(\t\022\022\n\nstatusName\030\037 \001(\t\022\016\n\006status\030 " +
+      " \001(\005\022\023\n\013paymentDate\030! \001(\003\022\026\n\016registeredT" +
+      "ype\030\" \001(\005\022\022\n\nhisSeqCode\030# \001(\t\"n\n\024GetQueu" +
+      "eListResponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t" +
+      "\022;\n\005order\030\003 \003(\0132,.com.ywt.gapi.taihe.reg" +
+      "ister.RegisteredOrder\"\323\003\n\013CommonOrder\022\017\n" +
+      "\007orderId\030\001 \001(\005\022\017\n\007orderNo\030\002 \001(\t\022\022\n\nhospi" +
+      "talId\030\003 \001(\005\022\024\n\014hospitalName\030\004 \001(\t\022\020\n\010dep" +
+      "tName\030\005 \001(\t\022\016\n\006amount\030\006 \001(\005\022\022\n\ndoctorNam" +
+      "e\030\007 \001(\t\022\023\n\013patientName\030\010 \001(\t\022\023\n\013doctorTi" +
+      "tle\030\t \001(\t\022\022\n\nstatusName\030\n \001(\t\022\022\n\npatient" +
+      "Sex\030\013 \001(\t\022\026\n\016registeredDate\030\014 \001(\t\022\021\n\tsta" +
+      "rtTime\030\r \001(\t\022\017\n\007endTime\030\016 \001(\t\022\021\n\torderTy" +
+      "pe\030\017 \001(\005\022\022\n\norderTitle\030\020 \001(\t\022\022\n\ncreateTi" +
+      "me\030\021 \001(\003\022\016\n\006cancel\030\022 \001(\005\022\020\n\010deptCode\030\023 \001" +
+      "(\t\022\026\n\016registeredType\030\024 \001(\005\022\022\n\nhisAdmAddr" +
+      "\030\025 \001(\t\022\024\n\014hisPatientId\030\026 \001(\t\022\025\n\rsubHospi" +
+      "talId\030\027 \001(\005\"t\n\031GetCommonOrderListRequest" +
+      "\022\016\n\006userId\030\001 \001(\005\022\017\n\007endDate\030\002 \001(\003\022\021\n\tpag" +
+      "eIndex\030\003 \001(\005\022\020\n\010pageSize\030\004 \001(\005\022\021\n\tstartD" +
+      "ate\030\005 \001(\003\"\222\001\n\032GetCommonOrderListResponse" +
+      "\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\0227\n\005order\030\003 \003" +
+      "(\0132(.com.ywt.gapi.taihe.register.CommonO" +
+      "rder\022\021\n\ttotalPage\030\004 \001(\005\022\r\n\005count\030\005 \001(\005\"{" +
+      "\n\030GetRegisteredListRequest\022\016\n\006userId\030\001 \001" +
+      "(\005\022\026\n\016registeredType\030\002 \001(\005\022\022\n\nhospitalId" +
+      "\030\003 \001(\005\022\021\n\tpageIndex\030\004 \001(\005\022\020\n\010pageSize\030\005 " +
+      "\001(\005\"\225\001\n\031GetRegisteredListResponse\022\014\n\004cod" +
+      "e\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\022;\n\005order\030\003 \003(\0132,.co" +
+      "m.ywt.gapi.taihe.register.RegisteredOrde" +
+      "r\022\021\n\ttotalPage\030\004 \001(\005\022\r\n\005count\030\005 \001(\005\"\263\003\n!" +
+      "RegisterWithoutMedicalCardRequest\022\016\n\006dep" +
+      "tId\030\001 \001(\005\022\020\n\010deptCode\030\002 \001(\t\022\020\n\010deptName\030" +
+      "\003 \001(\t\022\022\n\ndoctorCode\030\004 \001(\t\022\022\n\ndoctorName\030" +
+      "\005 \001(\t\022\r\n\005total\030\006 \001(\005\022\025\n\rregisteredFee\030\007 " +
+      "\001(\005\022\022\n\nmedicalFee\030\010 \001(\005\022\026\n\016registeredDat" +
+      "e\030\t \001(\003\022\016\n\006period\030\n \001(\005\022\021\n\tstartTime\030\013 \001" +
+      "(\t\022\017\n\007endTime\030\014 \001(\t\022\016\n\006userId\030\r \001(\005\022\030\n\020s" +
+      "cheduleItemCode\030\016 \001(\t\022\016\n\006idType\030\017 \001(\t\022\014\n" +
+      "\004idNo\030\020 \001(\t\022\023\n\013patientName\030\021 \001(\t\022\025\n\rpati" +
+      "entMobile\030\022 \001(\t\022\022\n\npatientSex\030\023 \001(\005\022\020\n\010b" +
+      "irthday\030\024 \001(\003\022\022\n\nhospitalId\030\025 \001(\005\"?\n\"Reg" +
+      "isterWithoutMedicalCardResponse\022\014\n\004code\030" +
+      "\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"N\n&GetOfflineConsultI" +
+      "nfoByDoctorIdRequest\022\020\n\010doctorId\030\001 \001(\005\022\022" +
+      "\n\nhospitalId\030\002 \001(\005\"\270\001\n\'GetOfflineConsult" +
+      "InfoByDoctorIdResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004" +
+      "info\030\002 \001(\t\022\020\n\010deptCode\030\003 \001(\t\022\022\n\ndoctorNa" +
+      "me\030\004 \001(\t\022\025\n\rdoctorHisCode\030\005 \001(\t\022\016\n\006deptI" +
+      "d\030\006 \001(\005\022\020\n\010deptName\030\007 \001(\t\022\022\n\nconsultFee\030" +
+      "\010 \001(\005\"P\n\030GetLatestRegOrderRequest\022\020\n\010doc" +
+      "torId\030\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalI" +
+      "d\030\003 \001(\005\"M\n\031GetLatestRegOrderResponse\022\014\n\004" +
+      "code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\024\n\014registerDate" +
+      "\030\003 \001(\003\"k\n\027CalAdditionalFeeRequest\022\025\n\rmed" +
+      "icalCardId\030\001 \001(\005\022\022\n\nmedicalFee\030\002 \001(\005\022\025\n\r" +
+      "registeredFee\030\003 \001(\005\022\016\n\006userId\030\004 \001(\005\"_\n\030C" +
+      "alAdditionalFeeResponse\022\025\n\rpayMedicalFee" +
+      "\030\001 \001(\005\022\020\n\010payTotal\030\002 \001(\005\022\014\n\004code\030\003 \001(\005\022\014" +
+      "\n\004info\030\004 \001(\t\"\237\001\n\'GetHisPatientIdByUserId" +
+      "AndMobileRequest\022\016\n\006userId\030\001 \001(\005\022\016\n\006mobi" +
+      "le\030\002 \001(\t\022\016\n\006cardNo\030\003 \001(\t\022\017\n\007address\030\004 \001(" +
+      "\t\022\021\n\tpatientNo\030\005 \001(\t\022\014\n\004name\030\006 \001(\t\022\022\n\nho" +
+      "spitalId\030\007 \001(\005\"\\\n(GetHisPatientIdByUserI" +
+      "dAndMobileResponse\022\024\n\014hisPatientId\030\001 \001(\t" +
+      "\022\014\n\004code\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\"\267\001\n\030CreateM" +
+      "edicalCardRequest\022\017\n\007phoneNo\030\001 \001(\t\022\014\n\004id" +
+      "No\030\002 \001(\t\022\023\n\013patientName\030\003 \001(\t\022\014\n\004city\030\004 " +
+      "\001(\t\022\017\n\007address\030\005 \001(\t\022\016\n\006isInsu\030\006 \001(\t\022\022\n\n" +
+      "hospitalId\030\007 \001(\005\022\016\n\006userId\030\010 \001(\005\022\024\n\014rela" +
+      "tionship\030\t \001(\005\"e\n\031CreateMedicalCardRespo" +
+      "nse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\025\n\rmedic" +
+      "alCardId\030\003 \001(\005\022\025\n\rmedicalCardNo\030\004 \001(\t\"\350\001" +
+      "\n\035RegisterCheckInMessageRequest\022\016\n\006cardN" +
+      "o\030\001 \001(\t\022\020\n\010areaCode\030\002 \001(\t\022\017\n\007patName\030\003 \001" +
+      "(\t\022\017\n\007queueNo\030\004 \001(\t\022\025\n\radmArriveDate\030\005 \001" +
+      "(\t\022\016\n\006userId\030\006 \001(\005\022\022\n\nhospitalId\030\007 \001(\005\022\026" +
+      "\n\016admBoroughDesc\030\010 \001(\t\022\016\n\006admLoc\030\t \001(\t\022\016" +
+      "\n\006admDoc\030\n \001(\t\022\020\n\010rangTime\030\013 \001(\t\"<\n\036Regi" +
       "sterCheckInMessageResponse\022\014\n\004code\030\001 \001(\005" +
       "\022\014\n\004info\030\002 \001(\t2\355\020\n\024TaiheRegisterService\022" +
       "\177\n\020createRegistered\0224.com.ywt.gapi.taihe" +
@@ -403,7 +405,7 @@ public final class TaiheRegister {
     internal_static_com_ywt_gapi_taihe_register_CreateRegisteredRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_taihe_register_CreateRegisteredRequest_descriptor,
-        new java.lang.String[] { "DoctorTitle", "DeptCode", "DeptName", "DoctorCode", "DoctorName", "Total", "RegisteredFee", "MedicalFee", "RegisteredDate", "Period", "StartTime", "EndTime", "UserId", "MedicalCardId", "ScheduleItemCode", "PaymentChannel", "Source", "DeptId", "LockQueueNo", "AvailableNumStr", "HospitalId", });
+        new java.lang.String[] { "DoctorTitle", "DeptCode", "DeptName", "DoctorCode", "DoctorName", "Total", "RegisteredFee", "MedicalFee", "RegisteredDate", "Period", "StartTime", "EndTime", "UserId", "MedicalCardId", "ScheduleItemCode", "PaymentChannel", "Source", "DeptId", "LockQueueNo", "AvailableNumStr", "HospitalId", "SubHospitalId", });
     internal_static_com_ywt_gapi_taihe_register_CreateRegisteredResponse_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_com_ywt_gapi_taihe_register_CreateRegisteredResponse_fieldAccessorTable = new
@@ -493,7 +495,7 @@ public final class TaiheRegister {
     internal_static_com_ywt_gapi_taihe_register_CommonOrder_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_taihe_register_CommonOrder_descriptor,
-        new java.lang.String[] { "OrderId", "OrderNo", "HospitalId", "HospitalName", "DeptName", "Amount", "DoctorName", "PatientName", "DoctorTitle", "StatusName", "PatientSex", "RegisteredDate", "StartTime", "EndTime", "OrderType", "OrderTitle", "CreateTime", "Cancel", "DeptCode", "RegisteredType", "HisAdmAddr", "HisPatientId", });
+        new java.lang.String[] { "OrderId", "OrderNo", "HospitalId", "HospitalName", "DeptName", "Amount", "DoctorName", "PatientName", "DoctorTitle", "StatusName", "PatientSex", "RegisteredDate", "StartTime", "EndTime", "OrderType", "OrderTitle", "CreateTime", "Cancel", "DeptCode", "RegisteredType", "HisAdmAddr", "HisPatientId", "SubHospitalId", });
     internal_static_com_ywt_gapi_taihe_register_GetCommonOrderListRequest_descriptor =
       getDescriptor().getMessageTypes().get(16);
     internal_static_com_ywt_gapi_taihe_register_GetCommonOrderListRequest_fieldAccessorTable = new
@@ -595,7 +597,7 @@ public final class TaiheRegister {
     internal_static_com_ywt_gapi_taihe_register_RegisterCheckInMessageRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_taihe_register_RegisterCheckInMessageRequest_descriptor,
-        new java.lang.String[] { "CardNo", "AreaCode", "PatName", "QueueNo", "AdmArriveDate", "UserId", "HospitalId", "AdmBoroughDesc", "AdmLoc", });
+        new java.lang.String[] { "CardNo", "AreaCode", "PatName", "QueueNo", "AdmArriveDate", "UserId", "HospitalId", "AdmBoroughDesc", "AdmLoc", "AdmDoc", "RangTime", });
     internal_static_com_ywt_gapi_taihe_register_RegisterCheckInMessageResponse_descriptor =
       getDescriptor().getMessageTypes().get(33);
     internal_static_com_ywt_gapi_taihe_register_RegisterCheckInMessageResponse_fieldAccessorTable = new

+ 1 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/register/QueryOrderListResponseData.java

@@ -33,4 +33,5 @@ public class QueryOrderListResponseData implements IsvResponseData {
     private String systemTime;//系统时间
     private String deptCode;
     private String registeredDate;//预约时间
+    private String subHospital; // 院区信息
 }