fix 修改挂号详情接口

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

@@ -520,7 +520,9 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 data.setDistrictName(item.getHospitalName());
                 String amountStr = String.format("%.2f", amount);
                 data.setAmount(amountStr);
-
+                data.setTimeRange(item.getStartTime()+" ~ "+item.getEndTime());
+                data.setQrCode("");
+                // 预约单状态 (0-待支付, 1-预约成功, 2-叫号中,7-已就诊,8-预期未就诊,9-取消预约)
                 int orderStatus = item.getRegisteredStatus();
                 String statusName = "";
                 if ((item.getRegisteredStatus() & RegisteredStatusEnum.Cancel.getValue()) == RegisteredStatusEnum.Cancel.getValue() ||
@@ -538,9 +540,13 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 data.setStatusStr(statusName);
                 data.setSystemTime(DateUtil.convertTimestampToDateString(item.getCreateTime()));
                 data.setCreateTime(DateUtil.convertTimestampToDateString(item.getCreateTime()));
+                data.setCancelTime("");
+                data.setLevel("");
                 data.setSex(SexEnum.getSexDisplayName(Checker.getIntegerValue(item.getSex())));
                 data.setStartTime(Checker.getStringValue(item.getStartTime()));
                 data.setEndTime(Checker.getStringValue(item.getEndTime()));
+                data.setRegisteredDate(DateUtil.convertTimestampToDateString(item.getRegisteredDate()));
+                data.setCardNum(Checker.getStringValue(item.getMedicalCardNo()));
                 return data;
             }
         }

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

@@ -48,6 +48,7 @@ public  final class RegisteredOrder extends
     doctorName_ = "";
     sex_ = 0;
     hisClinicCode_ = "";
+    medicalCardNo_ = "";
   }
 
   @java.lang.Override
@@ -232,6 +233,12 @@ public  final class RegisteredOrder extends
             hisClinicCode_ = s;
             break;
           }
+          case 242: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            medicalCardNo_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -816,6 +823,40 @@ public  final class RegisteredOrder extends
     }
   }
 
+  public static final int MEDICALCARDNO_FIELD_NUMBER = 30;
+  private volatile java.lang.Object medicalCardNo_;
+  /**
+   * <code>string medicalCardNo = 30;</code>
+   */
+  public java.lang.String getMedicalCardNo() {
+    java.lang.Object ref = medicalCardNo_;
+    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();
+      medicalCardNo_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string medicalCardNo = 30;</code>
+   */
+  public com.google.protobuf.ByteString
+      getMedicalCardNoBytes() {
+    java.lang.Object ref = medicalCardNo_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      medicalCardNo_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -915,6 +956,9 @@ public  final class RegisteredOrder extends
     if (!getHisClinicCodeBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 29, hisClinicCode_);
     }
+    if (!getMedicalCardNoBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 30, medicalCardNo_);
+    }
   }
 
   public int getSerializedSize() {
@@ -1026,6 +1070,9 @@ public  final class RegisteredOrder extends
     if (!getHisClinicCodeBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(29, hisClinicCode_);
     }
+    if (!getMedicalCardNoBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(30, medicalCardNo_);
+    }
     memoizedSize = size;
     return size;
   }
@@ -1100,6 +1147,8 @@ public  final class RegisteredOrder extends
         == other.getSex());
     result = result && getHisClinicCode()
         .equals(other.getHisClinicCode());
+    result = result && getMedicalCardNo()
+        .equals(other.getMedicalCardNo());
     return result;
   }
 
@@ -1171,6 +1220,8 @@ public  final class RegisteredOrder extends
     hash = (53 * hash) + getSex();
     hash = (37 * hash) + HISCLINICCODE_FIELD_NUMBER;
     hash = (53 * hash) + getHisClinicCode().hashCode();
+    hash = (37 * hash) + MEDICALCARDNO_FIELD_NUMBER;
+    hash = (53 * hash) + getMedicalCardNo().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1362,6 +1413,8 @@ public  final class RegisteredOrder extends
 
       hisClinicCode_ = "";
 
+      medicalCardNo_ = "";
+
       return this;
     }
 
@@ -1413,6 +1466,7 @@ public  final class RegisteredOrder extends
       result.doctorName_ = doctorName_;
       result.sex_ = sex_;
       result.hisClinicCode_ = hisClinicCode_;
+      result.medicalCardNo_ = medicalCardNo_;
       onBuilt();
       return result;
     }
@@ -1553,6 +1607,10 @@ public  final class RegisteredOrder extends
         hisClinicCode_ = other.hisClinicCode_;
         onChanged();
       }
+      if (!other.getMedicalCardNo().isEmpty()) {
+        medicalCardNo_ = other.medicalCardNo_;
+        onChanged();
+      }
       onChanged();
       return this;
     }
@@ -2848,6 +2906,75 @@ public  final class RegisteredOrder extends
       onChanged();
       return this;
     }
+
+    private java.lang.Object medicalCardNo_ = "";
+    /**
+     * <code>string medicalCardNo = 30;</code>
+     */
+    public java.lang.String getMedicalCardNo() {
+      java.lang.Object ref = medicalCardNo_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        medicalCardNo_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string medicalCardNo = 30;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMedicalCardNoBytes() {
+      java.lang.Object ref = medicalCardNo_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        medicalCardNo_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string medicalCardNo = 30;</code>
+     */
+    public Builder setMedicalCardNo(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      medicalCardNo_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string medicalCardNo = 30;</code>
+     */
+    public Builder clearMedicalCardNo() {
+      
+      medicalCardNo_ = getDefaultInstance().getMedicalCardNo();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string medicalCardNo = 30;</code>
+     */
+    public Builder setMedicalCardNoBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      medicalCardNo_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return this;

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

@@ -211,4 +211,14 @@ public interface RegisteredOrderOrBuilder extends
    */
   com.google.protobuf.ByteString
       getHisClinicCodeBytes();
+
+  /**
+   * <code>string medicalCardNo = 30;</code>
+   */
+  java.lang.String getMedicalCardNo();
+  /**
+   * <code>string medicalCardNo = 30;</code>
+   */
+  com.google.protobuf.ByteString
+      getMedicalCardNoBytes();
 }

onemini-hospital-empty/src/main/java/com/ywt/gapi/third/taihe/PayCashRequest.java

@@ -24,6 +24,7 @@ public  final class PayCashRequest extends
     agtOrdNum_ = "";
     psOrdNum_ = "";
     hospitalId_ = 0;
+    payMode_ = "";
   }
 
   @java.lang.Override
@@ -104,6 +105,12 @@ public  final class PayCashRequest extends
             hospitalId_ = input.readInt32();
             break;
           }
+          case 82: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            payMode_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -408,6 +415,48 @@ public  final class PayCashRequest extends
     return hospitalId_;
   }
 
+  public static final int PAYMODE_FIELD_NUMBER = 10;
+  private volatile java.lang.Object payMode_;
+  /**
+   * <pre>
+   * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+   * </pre>
+   *
+   * <code>string payMode = 10;</code>
+   */
+  public java.lang.String getPayMode() {
+    java.lang.Object ref = payMode_;
+    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();
+      payMode_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+   * </pre>
+   *
+   * <code>string payMode = 10;</code>
+   */
+  public com.google.protobuf.ByteString
+      getPayModeBytes() {
+    java.lang.Object ref = payMode_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      payMode_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -447,6 +496,9 @@ public  final class PayCashRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(9, hospitalId_);
     }
+    if (!getPayModeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 10, payMode_);
+    }
   }
 
   public int getSerializedSize() {
@@ -482,6 +534,9 @@ public  final class PayCashRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(9, hospitalId_);
     }
+    if (!getPayModeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, payMode_);
+    }
     memoizedSize = size;
     return size;
   }
@@ -516,6 +571,8 @@ public  final class PayCashRequest extends
         .equals(other.getPsOrdNum());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && getPayMode()
+        .equals(other.getPayMode());
     return result;
   }
 
@@ -544,6 +601,8 @@ public  final class PayCashRequest extends
     hash = (53 * hash) + getPsOrdNum().hashCode();
     hash = (37 * hash) + HOSPITALID_FIELD_NUMBER;
     hash = (53 * hash) + getHospitalId();
+    hash = (37 * hash) + PAYMODE_FIELD_NUMBER;
+    hash = (53 * hash) + getPayMode().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -691,6 +750,8 @@ public  final class PayCashRequest extends
 
       hospitalId_ = 0;
 
+      payMode_ = "";
+
       return this;
     }
 
@@ -722,6 +783,7 @@ public  final class PayCashRequest extends
       result.agtOrdNum_ = agtOrdNum_;
       result.psOrdNum_ = psOrdNum_;
       result.hospitalId_ = hospitalId_;
+      result.payMode_ = payMode_;
       onBuilt();
       return result;
     }
@@ -798,6 +860,10 @@ public  final class PayCashRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      if (!other.getPayMode().isEmpty()) {
+        payMode_ = other.payMode_;
+        onChanged();
+      }
       onChanged();
       return this;
     }
@@ -1401,6 +1467,95 @@ public  final class PayCashRequest extends
       onChanged();
       return this;
     }
+
+    private java.lang.Object payMode_ = "";
+    /**
+     * <pre>
+     * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+     * </pre>
+     *
+     * <code>string payMode = 10;</code>
+     */
+    public java.lang.String getPayMode() {
+      java.lang.Object ref = payMode_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        payMode_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+     * </pre>
+     *
+     * <code>string payMode = 10;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPayModeBytes() {
+      java.lang.Object ref = payMode_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        payMode_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+     * </pre>
+     *
+     * <code>string payMode = 10;</code>
+     */
+    public Builder setPayMode(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      payMode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+     * </pre>
+     *
+     * <code>string payMode = 10;</code>
+     */
+    public Builder clearPayMode() {
+      
+      payMode_ = getDefaultInstance().getPayMode();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+     * </pre>
+     *
+     * <code>string payMode = 10;</code>
+     */
+    public Builder setPayModeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      payMode_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return this;

onemini-hospital-empty/src/main/java/com/ywt/gapi/third/taihe/PayCashRequestOrBuilder.java

@@ -91,4 +91,22 @@ public interface PayCashRequestOrBuilder extends
    * <code>int32 hospitalId = 9;</code>
    */
   int getHospitalId();
+
+  /**
+   * <pre>
+   * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+   * </pre>
+   *
+   * <code>string payMode = 10;</code>
+   */
+  java.lang.String getPayMode();
+  /**
+   * <pre>
+   * 支付方式，微信-WECHATPAY;支付宝-ALIPAY。不传默认 WECHATPAY
+   * </pre>
+   *
+   * <code>string payMode = 10;</code>
+   */
+  com.google.protobuf.ByteString
+      getPayModeBytes();
 }

onemini-hospital-empty/src/main/java/com/ywt/gapi/third/taihe/Schedule.java

@@ -41,6 +41,9 @@ public  final class Schedule extends
     availableLeftNum_ = 0;
     serviceCode_ = "";
     serviceName_ = "";
+    startTime_ = "";
+    endTime_ = "";
+    availableNumStr_ = "";
   }
 
   @java.lang.Override
@@ -191,6 +194,24 @@ public  final class Schedule extends
             serviceName_ = s;
             break;
           }
+          case 186: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            startTime_ = s;
+            break;
+          }
+          case 194: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            endTime_ = s;
+            break;
+          }
+          case 202: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            availableNumStr_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -861,6 +882,108 @@ public  final class Schedule extends
     }
   }
 
+  public static final int STARTTIME_FIELD_NUMBER = 23;
+  private volatile java.lang.Object startTime_;
+  /**
+   * <code>string startTime = 23;</code>
+   */
+  public java.lang.String getStartTime() {
+    java.lang.Object ref = startTime_;
+    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();
+      startTime_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string startTime = 23;</code>
+   */
+  public com.google.protobuf.ByteString
+      getStartTimeBytes() {
+    java.lang.Object ref = startTime_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      startTime_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int ENDTIME_FIELD_NUMBER = 24;
+  private volatile java.lang.Object endTime_;
+  /**
+   * <code>string endTime = 24;</code>
+   */
+  public java.lang.String getEndTime() {
+    java.lang.Object ref = endTime_;
+    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();
+      endTime_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string endTime = 24;</code>
+   */
+  public com.google.protobuf.ByteString
+      getEndTimeBytes() {
+    java.lang.Object ref = endTime_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      endTime_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int AVAILABLENUMSTR_FIELD_NUMBER = 25;
+  private volatile java.lang.Object availableNumStr_;
+  /**
+   * <code>string availableNumStr = 25;</code>
+   */
+  public java.lang.String getAvailableNumStr() {
+    java.lang.Object ref = availableNumStr_;
+    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();
+      availableNumStr_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string availableNumStr = 25;</code>
+   */
+  public com.google.protobuf.ByteString
+      getAvailableNumStrBytes() {
+    java.lang.Object ref = availableNumStr_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      availableNumStr_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -939,6 +1062,15 @@ public  final class Schedule extends
     if (!getServiceNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 22, serviceName_);
     }
+    if (!getStartTimeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 23, startTime_);
+    }
+    if (!getEndTimeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 24, endTime_);
+    }
+    if (!getAvailableNumStrBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 25, availableNumStr_);
+    }
   }
 
   public int getSerializedSize() {
@@ -1021,6 +1153,15 @@ public  final class Schedule extends
     if (!getServiceNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, serviceName_);
     }
+    if (!getStartTimeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(23, startTime_);
+    }
+    if (!getEndTimeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(24, endTime_);
+    }
+    if (!getAvailableNumStrBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(25, availableNumStr_);
+    }
     memoizedSize = size;
     return size;
   }
@@ -1081,6 +1222,12 @@ public  final class Schedule extends
         .equals(other.getServiceCode());
     result = result && getServiceName()
         .equals(other.getServiceName());
+    result = result && getStartTime()
+        .equals(other.getStartTime());
+    result = result && getEndTime()
+        .equals(other.getEndTime());
+    result = result && getAvailableNumStr()
+        .equals(other.getAvailableNumStr());
     return result;
   }
 
@@ -1135,6 +1282,12 @@ public  final class Schedule extends
     hash = (53 * hash) + getServiceCode().hashCode();
     hash = (37 * hash) + SERVICENAME_FIELD_NUMBER;
     hash = (53 * hash) + getServiceName().hashCode();
+    hash = (37 * hash) + STARTTIME_FIELD_NUMBER;
+    hash = (53 * hash) + getStartTime().hashCode();
+    hash = (37 * hash) + ENDTIME_FIELD_NUMBER;
+    hash = (53 * hash) + getEndTime().hashCode();
+    hash = (37 * hash) + AVAILABLENUMSTR_FIELD_NUMBER;
+    hash = (53 * hash) + getAvailableNumStr().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1312,6 +1465,12 @@ public  final class Schedule extends
 
       serviceName_ = "";
 
+      startTime_ = "";
+
+      endTime_ = "";
+
+      availableNumStr_ = "";
+
       return this;
     }
 
@@ -1356,6 +1515,9 @@ public  final class Schedule extends
       result.availableLeftNum_ = availableLeftNum_;
       result.serviceCode_ = serviceCode_;
       result.serviceName_ = serviceName_;
+      result.startTime_ = startTime_;
+      result.endTime_ = endTime_;
+      result.availableNumStr_ = availableNumStr_;
       onBuilt();
       return result;
     }
@@ -1476,6 +1638,18 @@ public  final class Schedule extends
         serviceName_ = other.serviceName_;
         onChanged();
       }
+      if (!other.getStartTime().isEmpty()) {
+        startTime_ = other.startTime_;
+        onChanged();
+      }
+      if (!other.getEndTime().isEmpty()) {
+        endTime_ = other.endTime_;
+        onChanged();
+      }
+      if (!other.getAvailableNumStr().isEmpty()) {
+        availableNumStr_ = other.availableNumStr_;
+        onChanged();
+      }
       onChanged();
       return this;
     }
@@ -2960,6 +3134,213 @@ public  final class Schedule extends
       onChanged();
       return this;
     }
+
+    private java.lang.Object startTime_ = "";
+    /**
+     * <code>string startTime = 23;</code>
+     */
+    public java.lang.String getStartTime() {
+      java.lang.Object ref = startTime_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        startTime_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string startTime = 23;</code>
+     */
+    public com.google.protobuf.ByteString
+        getStartTimeBytes() {
+      java.lang.Object ref = startTime_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        startTime_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string startTime = 23;</code>
+     */
+    public Builder setStartTime(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      startTime_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string startTime = 23;</code>
+     */
+    public Builder clearStartTime() {
+      
+      startTime_ = getDefaultInstance().getStartTime();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string startTime = 23;</code>
+     */
+    public Builder setStartTimeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      startTime_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object endTime_ = "";
+    /**
+     * <code>string endTime = 24;</code>
+     */
+    public java.lang.String getEndTime() {
+      java.lang.Object ref = endTime_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        endTime_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string endTime = 24;</code>
+     */
+    public com.google.protobuf.ByteString
+        getEndTimeBytes() {
+      java.lang.Object ref = endTime_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        endTime_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string endTime = 24;</code>
+     */
+    public Builder setEndTime(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      endTime_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string endTime = 24;</code>
+     */
+    public Builder clearEndTime() {
+      
+      endTime_ = getDefaultInstance().getEndTime();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string endTime = 24;</code>
+     */
+    public Builder setEndTimeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      endTime_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object availableNumStr_ = "";
+    /**
+     * <code>string availableNumStr = 25;</code>
+     */
+    public java.lang.String getAvailableNumStr() {
+      java.lang.Object ref = availableNumStr_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        availableNumStr_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string availableNumStr = 25;</code>
+     */
+    public com.google.protobuf.ByteString
+        getAvailableNumStrBytes() {
+      java.lang.Object ref = availableNumStr_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        availableNumStr_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string availableNumStr = 25;</code>
+     */
+    public Builder setAvailableNumStr(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      availableNumStr_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string availableNumStr = 25;</code>
+     */
+    public Builder clearAvailableNumStr() {
+      
+      availableNumStr_ = getDefaultInstance().getAvailableNumStr();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string availableNumStr = 25;</code>
+     */
+    public Builder setAvailableNumStrBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      availableNumStr_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return this;

onemini-hospital-empty/src/main/java/com/ywt/gapi/third/taihe/ScheduleOrBuilder.java

@@ -305,4 +305,34 @@ public interface ScheduleOrBuilder extends
    */
   com.google.protobuf.ByteString
       getServiceNameBytes();
+
+  /**
+   * <code>string startTime = 23;</code>
+   */
+  java.lang.String getStartTime();
+  /**
+   * <code>string startTime = 23;</code>
+   */
+  com.google.protobuf.ByteString
+      getStartTimeBytes();
+
+  /**
+   * <code>string endTime = 24;</code>
+   */
+  java.lang.String getEndTime();
+  /**
+   * <code>string endTime = 24;</code>
+   */
+  com.google.protobuf.ByteString
+      getEndTimeBytes();
+
+  /**
+   * <code>string availableNumStr = 25;</code>
+   */
+  java.lang.String getAvailableNumStr();
+  /**
+   * <code>string availableNumStr = 25;</code>
+   */
+  com.google.protobuf.ByteString
+      getAvailableNumStrBytes();
 }

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

@@ -32,4 +32,5 @@ public class QueryOrderDetailResponseData implements IsvResponseData {
     private String sex;//就诊人性别
     private String expireTime;//支付过期时间
     private String systemTime;//系统时间
+    private String registeredDate;//预约时间
 }