Merge branch 'feat_yibao2.0' into test

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/models/outpatient/PrePayConfirmReq.java

@@ -27,4 +27,5 @@ public class PrePayConfirmReq {
     private String authNo;
     private String medicalCardInstId;
     private String medicalCardId;
+    private Integer consumeType;// 医保部分扣费类型。默认为 0：统筹+个账 1：个账 2：统筹
 }

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/web/controller/OutpatientController.java

@@ -68,6 +68,7 @@ public class OutpatientController {
             if (StringHelper.isNullOrEmpty(alipayUid)) {
                 alipayUid = Checker.getStringValue(reqData.getAlipayUid());
             }
+            int consumeType = Checker.getIntegerValue(reqData.getConsumeType());
             CheckUtil.ensureNotEmpty(alipayUid, "无法获取支付宝用户信息");
             CheckUtil.ensureNotEmpty(patientId, "HIS 患者 id 不能为空");
             CheckUtil.ensureNotEmpty(clinicCode, "就诊流水号不能为空");
@@ -140,6 +141,7 @@ public class OutpatientController {
                                     .setPsnName(name)
                                     .setMpType(MpTypeEnum.ALIPAY.getValue())
                                     .setAliPayAuthNo(payAuthNo)
+                                    .setAcctUsedFlag(consumeType > 0 ? 0 : 1)
                                     .build());
                             if (preSettleResponse.getCode() != ResultCode.SUCCEED_VALUE) {
                                 return baseResponse.failedWithAppError(String.format("新版医保上传费用：%s", preSettleResponse.getInfo()));

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

@@ -21,6 +21,7 @@ private static final long serialVersionUID = 0L;
     ownPayPMDr_ = "";
     ownPayAmt_ = "";
     payAuthNo_ = "";
+    mpType_ = 0;
   }
 
   @java.lang.Override
@@ -83,6 +84,11 @@ private static final long serialVersionUID = 0L;
             payAuthNo_ = s;
             break;
           }
+          case 48: {
+
+            mpType_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -284,6 +290,15 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int MPTYPE_FIELD_NUMBER = 6;
+  private int mpType_;
+  /**
+   * <code>int32 mpType = 6;</code>
+   */
+  public int getMpType() {
+    return mpType_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -311,6 +326,9 @@ private static final long serialVersionUID = 0L;
     if (!getPayAuthNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, payAuthNo_);
     }
+    if (mpType_ != 0) {
+      output.writeInt32(6, mpType_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -335,6 +353,10 @@ private static final long serialVersionUID = 0L;
     if (!getPayAuthNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, payAuthNo_);
     }
+    if (mpType_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(6, mpType_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -361,6 +383,8 @@ private static final long serialVersionUID = 0L;
         .equals(other.getOwnPayAmt());
     result = result && getPayAuthNo()
         .equals(other.getPayAuthNo());
+    result = result && (getMpType()
+        == other.getMpType());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -382,6 +406,8 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getOwnPayAmt().hashCode();
     hash = (37 * hash) + PAYAUTHNO_FIELD_NUMBER;
     hash = (53 * hash) + getPayAuthNo().hashCode();
+    hash = (37 * hash) + MPTYPE_FIELD_NUMBER;
+    hash = (53 * hash) + getMpType();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -521,6 +547,8 @@ private static final long serialVersionUID = 0L;
 
       payAuthNo_ = "";
 
+      mpType_ = 0;
+
       return this;
     }
 
@@ -548,6 +576,7 @@ private static final long serialVersionUID = 0L;
       result.ownPayPMDr_ = ownPayPMDr_;
       result.ownPayAmt_ = ownPayAmt_;
       result.payAuthNo_ = payAuthNo_;
+      result.mpType_ = mpType_;
       onBuilt();
       return result;
     }
@@ -608,6 +637,9 @@ private static final long serialVersionUID = 0L;
         payAuthNo_ = other.payAuthNo_;
         onChanged();
       }
+      if (other.getMpType() != 0) {
+        setMpType(other.getMpType());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1016,6 +1048,32 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private int mpType_ ;
+    /**
+     * <code>int32 mpType = 6;</code>
+     */
+    public int getMpType() {
+      return mpType_;
+    }
+    /**
+     * <code>int32 mpType = 6;</code>
+     */
+    public Builder setMpType(int value) {
+      
+      mpType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 mpType = 6;</code>
+     */
+    public Builder clearMpType() {
+      
+      mpType_ = 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/third/taihe/PayConfirmRequestOrBuilder.java

@@ -83,4 +83,9 @@ public interface PayConfirmRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getPayAuthNoBytes();
+
+  /**
+   * <code>int32 mpType = 6;</code>
+   */
+  int getMpType();
 }

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

@@ -0,0 +1,701 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+/**
+ * Protobuf type {@code com.ywt.gapi.third.taihe.PrePayCancelRequest}
+ */
+public  final class PrePayCancelRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:com.ywt.gapi.third.taihe.PrePayCancelRequest)
+    PrePayCancelRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use PrePayCancelRequest.newBuilder() to construct.
+  private PrePayCancelRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private PrePayCancelRequest() {
+    hospitalId_ = 0;
+    hisOrderNo_ = "";
+    hisPatientId_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private PrePayCancelRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+
+            hospitalId_ = input.readInt32();
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            hisOrderNo_ = s;
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            hisPatientId_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.ywt.gapi.third.taihe.PrePayCancelRequest.class, com.ywt.gapi.third.taihe.PrePayCancelRequest.Builder.class);
+  }
+
+  public static final int HOSPITALID_FIELD_NUMBER = 1;
+  private int hospitalId_;
+  /**
+   * <code>int32 hospitalId = 1;</code>
+   */
+  public int getHospitalId() {
+    return hospitalId_;
+  }
+
+  public static final int HISORDERNO_FIELD_NUMBER = 2;
+  private volatile java.lang.Object hisOrderNo_;
+  /**
+   * <code>string hisOrderNo = 2;</code>
+   */
+  public java.lang.String getHisOrderNo() {
+    java.lang.Object ref = hisOrderNo_;
+    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();
+      hisOrderNo_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string hisOrderNo = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getHisOrderNoBytes() {
+    java.lang.Object ref = hisOrderNo_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      hisOrderNo_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int HISPATIENTID_FIELD_NUMBER = 3;
+  private volatile java.lang.Object hisPatientId_;
+  /**
+   * <code>string hisPatientId = 3;</code>
+   */
+  public java.lang.String getHisPatientId() {
+    java.lang.Object ref = hisPatientId_;
+    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();
+      hisPatientId_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string hisPatientId = 3;</code>
+   */
+  public com.google.protobuf.ByteString
+      getHisPatientIdBytes() {
+    java.lang.Object ref = hisPatientId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      hisPatientId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (hospitalId_ != 0) {
+      output.writeInt32(1, hospitalId_);
+    }
+    if (!getHisOrderNoBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, hisOrderNo_);
+    }
+    if (!getHisPatientIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, hisPatientId_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (hospitalId_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(1, hospitalId_);
+    }
+    if (!getHisOrderNoBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, hisOrderNo_);
+    }
+    if (!getHisPatientIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, hisPatientId_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.ywt.gapi.third.taihe.PrePayCancelRequest)) {
+      return super.equals(obj);
+    }
+    com.ywt.gapi.third.taihe.PrePayCancelRequest other = (com.ywt.gapi.third.taihe.PrePayCancelRequest) obj;
+
+    boolean result = true;
+    result = result && (getHospitalId()
+        == other.getHospitalId());
+    result = result && getHisOrderNo()
+        .equals(other.getHisOrderNo());
+    result = result && getHisPatientId()
+        .equals(other.getHisPatientId());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + HOSPITALID_FIELD_NUMBER;
+    hash = (53 * hash) + getHospitalId();
+    hash = (37 * hash) + HISORDERNO_FIELD_NUMBER;
+    hash = (53 * hash) + getHisOrderNo().hashCode();
+    hash = (37 * hash) + HISPATIENTID_FIELD_NUMBER;
+    hash = (53 * hash) + getHisPatientId().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.ywt.gapi.third.taihe.PrePayCancelRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code com.ywt.gapi.third.taihe.PrePayCancelRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:com.ywt.gapi.third.taihe.PrePayCancelRequest)
+      com.ywt.gapi.third.taihe.PrePayCancelRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.ywt.gapi.third.taihe.PrePayCancelRequest.class, com.ywt.gapi.third.taihe.PrePayCancelRequest.Builder.class);
+    }
+
+    // Construct using com.ywt.gapi.third.taihe.PrePayCancelRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      hospitalId_ = 0;
+
+      hisOrderNo_ = "";
+
+      hisPatientId_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_descriptor;
+    }
+
+    public com.ywt.gapi.third.taihe.PrePayCancelRequest getDefaultInstanceForType() {
+      return com.ywt.gapi.third.taihe.PrePayCancelRequest.getDefaultInstance();
+    }
+
+    public com.ywt.gapi.third.taihe.PrePayCancelRequest build() {
+      com.ywt.gapi.third.taihe.PrePayCancelRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.ywt.gapi.third.taihe.PrePayCancelRequest buildPartial() {
+      com.ywt.gapi.third.taihe.PrePayCancelRequest result = new com.ywt.gapi.third.taihe.PrePayCancelRequest(this);
+      result.hospitalId_ = hospitalId_;
+      result.hisOrderNo_ = hisOrderNo_;
+      result.hisPatientId_ = hisPatientId_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.ywt.gapi.third.taihe.PrePayCancelRequest) {
+        return mergeFrom((com.ywt.gapi.third.taihe.PrePayCancelRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.ywt.gapi.third.taihe.PrePayCancelRequest other) {
+      if (other == com.ywt.gapi.third.taihe.PrePayCancelRequest.getDefaultInstance()) return this;
+      if (other.getHospitalId() != 0) {
+        setHospitalId(other.getHospitalId());
+      }
+      if (!other.getHisOrderNo().isEmpty()) {
+        hisOrderNo_ = other.hisOrderNo_;
+        onChanged();
+      }
+      if (!other.getHisPatientId().isEmpty()) {
+        hisPatientId_ = other.hisPatientId_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.ywt.gapi.third.taihe.PrePayCancelRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.ywt.gapi.third.taihe.PrePayCancelRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int hospitalId_ ;
+    /**
+     * <code>int32 hospitalId = 1;</code>
+     */
+    public int getHospitalId() {
+      return hospitalId_;
+    }
+    /**
+     * <code>int32 hospitalId = 1;</code>
+     */
+    public Builder setHospitalId(int value) {
+      
+      hospitalId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 hospitalId = 1;</code>
+     */
+    public Builder clearHospitalId() {
+      
+      hospitalId_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object hisOrderNo_ = "";
+    /**
+     * <code>string hisOrderNo = 2;</code>
+     */
+    public java.lang.String getHisOrderNo() {
+      java.lang.Object ref = hisOrderNo_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        hisOrderNo_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string hisOrderNo = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getHisOrderNoBytes() {
+      java.lang.Object ref = hisOrderNo_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        hisOrderNo_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string hisOrderNo = 2;</code>
+     */
+    public Builder setHisOrderNo(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      hisOrderNo_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string hisOrderNo = 2;</code>
+     */
+    public Builder clearHisOrderNo() {
+      
+      hisOrderNo_ = getDefaultInstance().getHisOrderNo();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string hisOrderNo = 2;</code>
+     */
+    public Builder setHisOrderNoBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      hisOrderNo_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object hisPatientId_ = "";
+    /**
+     * <code>string hisPatientId = 3;</code>
+     */
+    public java.lang.String getHisPatientId() {
+      java.lang.Object ref = hisPatientId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        hisPatientId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string hisPatientId = 3;</code>
+     */
+    public com.google.protobuf.ByteString
+        getHisPatientIdBytes() {
+      java.lang.Object ref = hisPatientId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        hisPatientId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string hisPatientId = 3;</code>
+     */
+    public Builder setHisPatientId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      hisPatientId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string hisPatientId = 3;</code>
+     */
+    public Builder clearHisPatientId() {
+      
+      hisPatientId_ = getDefaultInstance().getHisPatientId();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string hisPatientId = 3;</code>
+     */
+    public Builder setHisPatientIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      hisPatientId_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:com.ywt.gapi.third.taihe.PrePayCancelRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:com.ywt.gapi.third.taihe.PrePayCancelRequest)
+  private static final com.ywt.gapi.third.taihe.PrePayCancelRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.ywt.gapi.third.taihe.PrePayCancelRequest();
+  }
+
+  public static com.ywt.gapi.third.taihe.PrePayCancelRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<PrePayCancelRequest>
+      PARSER = new com.google.protobuf.AbstractParser<PrePayCancelRequest>() {
+    public PrePayCancelRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PrePayCancelRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<PrePayCancelRequest> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<PrePayCancelRequest> getParserForType() {
+    return PARSER;
+  }
+
+  public com.ywt.gapi.third.taihe.PrePayCancelRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+

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

@@ -0,0 +1,34 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+public interface PrePayCancelRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:com.ywt.gapi.third.taihe.PrePayCancelRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>int32 hospitalId = 1;</code>
+   */
+  int getHospitalId();
+
+  /**
+   * <code>string hisOrderNo = 2;</code>
+   */
+  java.lang.String getHisOrderNo();
+  /**
+   * <code>string hisOrderNo = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getHisOrderNoBytes();
+
+  /**
+   * <code>string hisPatientId = 3;</code>
+   */
+  java.lang.String getHisPatientId();
+  /**
+   * <code>string hisPatientId = 3;</code>
+   */
+  com.google.protobuf.ByteString
+      getHisPatientIdBytes();
+}

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

@@ -0,0 +1,574 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+/**
+ * Protobuf type {@code com.ywt.gapi.third.taihe.PrePayCancelResponse}
+ */
+public  final class PrePayCancelResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:com.ywt.gapi.third.taihe.PrePayCancelResponse)
+    PrePayCancelResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use PrePayCancelResponse.newBuilder() to construct.
+  private PrePayCancelResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private PrePayCancelResponse() {
+    code_ = 0;
+    info_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private PrePayCancelResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+
+            code_ = input.readInt32();
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            info_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.ywt.gapi.third.taihe.PrePayCancelResponse.class, com.ywt.gapi.third.taihe.PrePayCancelResponse.Builder.class);
+  }
+
+  public static final int CODE_FIELD_NUMBER = 1;
+  private int code_;
+  /**
+   * <code>int32 code = 1;</code>
+   */
+  public int getCode() {
+    return code_;
+  }
+
+  public static final int INFO_FIELD_NUMBER = 2;
+  private volatile java.lang.Object info_;
+  /**
+   * <code>string info = 2;</code>
+   */
+  public java.lang.String getInfo() {
+    java.lang.Object ref = info_;
+    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();
+      info_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string info = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getInfoBytes() {
+    java.lang.Object ref = info_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      info_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (code_ != 0) {
+      output.writeInt32(1, code_);
+    }
+    if (!getInfoBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (code_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(1, code_);
+    }
+    if (!getInfoBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.ywt.gapi.third.taihe.PrePayCancelResponse)) {
+      return super.equals(obj);
+    }
+    com.ywt.gapi.third.taihe.PrePayCancelResponse other = (com.ywt.gapi.third.taihe.PrePayCancelResponse) obj;
+
+    boolean result = true;
+    result = result && (getCode()
+        == other.getCode());
+    result = result && getInfo()
+        .equals(other.getInfo());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getCode();
+    hash = (37 * hash) + INFO_FIELD_NUMBER;
+    hash = (53 * hash) + getInfo().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.ywt.gapi.third.taihe.PrePayCancelResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code com.ywt.gapi.third.taihe.PrePayCancelResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:com.ywt.gapi.third.taihe.PrePayCancelResponse)
+      com.ywt.gapi.third.taihe.PrePayCancelResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.ywt.gapi.third.taihe.PrePayCancelResponse.class, com.ywt.gapi.third.taihe.PrePayCancelResponse.Builder.class);
+    }
+
+    // Construct using com.ywt.gapi.third.taihe.PrePayCancelResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      code_ = 0;
+
+      info_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_descriptor;
+    }
+
+    public com.ywt.gapi.third.taihe.PrePayCancelResponse getDefaultInstanceForType() {
+      return com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance();
+    }
+
+    public com.ywt.gapi.third.taihe.PrePayCancelResponse build() {
+      com.ywt.gapi.third.taihe.PrePayCancelResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.ywt.gapi.third.taihe.PrePayCancelResponse buildPartial() {
+      com.ywt.gapi.third.taihe.PrePayCancelResponse result = new com.ywt.gapi.third.taihe.PrePayCancelResponse(this);
+      result.code_ = code_;
+      result.info_ = info_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.ywt.gapi.third.taihe.PrePayCancelResponse) {
+        return mergeFrom((com.ywt.gapi.third.taihe.PrePayCancelResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.ywt.gapi.third.taihe.PrePayCancelResponse other) {
+      if (other == com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance()) return this;
+      if (other.getCode() != 0) {
+        setCode(other.getCode());
+      }
+      if (!other.getInfo().isEmpty()) {
+        info_ = other.info_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.ywt.gapi.third.taihe.PrePayCancelResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.ywt.gapi.third.taihe.PrePayCancelResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int code_ ;
+    /**
+     * <code>int32 code = 1;</code>
+     */
+    public int getCode() {
+      return code_;
+    }
+    /**
+     * <code>int32 code = 1;</code>
+     */
+    public Builder setCode(int value) {
+      
+      code_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 code = 1;</code>
+     */
+    public Builder clearCode() {
+      
+      code_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object info_ = "";
+    /**
+     * <code>string info = 2;</code>
+     */
+    public java.lang.String getInfo() {
+      java.lang.Object ref = info_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        info_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getInfoBytes() {
+      java.lang.Object ref = info_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        info_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public Builder setInfo(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      info_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public Builder clearInfo() {
+      
+      info_ = getDefaultInstance().getInfo();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public Builder setInfoBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      info_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:com.ywt.gapi.third.taihe.PrePayCancelResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:com.ywt.gapi.third.taihe.PrePayCancelResponse)
+  private static final com.ywt.gapi.third.taihe.PrePayCancelResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.ywt.gapi.third.taihe.PrePayCancelResponse();
+  }
+
+  public static com.ywt.gapi.third.taihe.PrePayCancelResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<PrePayCancelResponse>
+      PARSER = new com.google.protobuf.AbstractParser<PrePayCancelResponse>() {
+    public PrePayCancelResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PrePayCancelResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<PrePayCancelResponse> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<PrePayCancelResponse> getParserForType() {
+    return PARSER;
+  }
+
+  public com.ywt.gapi.third.taihe.PrePayCancelResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+

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

@@ -0,0 +1,24 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+public interface PrePayCancelResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:com.ywt.gapi.third.taihe.PrePayCancelResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>int32 code = 1;</code>
+   */
+  int getCode();
+
+  /**
+   * <code>string info = 2;</code>
+   */
+  java.lang.String getInfo();
+  /**
+   * <code>string info = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getInfoBytes();
+}

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

@@ -24,6 +24,8 @@ private static final long serialVersionUID = 0L;
     hospitalId_ = 0;
     mpType_ = 0;
     aliPayAuthNo_ = "";
+    wxPayAuthNo_ = "";
+    acctUsedFlag_ = 0;
   }
 
   @java.lang.Override
@@ -103,6 +105,17 @@ private static final long serialVersionUID = 0L;
             aliPayAuthNo_ = s;
             break;
           }
+          case 74: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            wxPayAuthNo_ = s;
+            break;
+          }
+          case 80: {
+
+            acctUsedFlag_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -349,6 +362,53 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int WXPAYAUTHNO_FIELD_NUMBER = 9;
+  private volatile java.lang.Object wxPayAuthNo_;
+  /**
+   * <code>string wxPayAuthNo = 9;</code>
+   */
+  public java.lang.String getWxPayAuthNo() {
+    java.lang.Object ref = wxPayAuthNo_;
+    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();
+      wxPayAuthNo_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string wxPayAuthNo = 9;</code>
+   */
+  public com.google.protobuf.ByteString
+      getWxPayAuthNoBytes() {
+    java.lang.Object ref = wxPayAuthNo_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      wxPayAuthNo_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int ACCTUSEDFLAG_FIELD_NUMBER = 10;
+  private int acctUsedFlag_;
+  /**
+   * <pre>
+   * 个人账户使用标志。1 使用； 0 不使用个账
+   * </pre>
+   *
+   * <code>int32 acctUsedFlag = 10;</code>
+   */
+  public int getAcctUsedFlag() {
+    return acctUsedFlag_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -385,6 +445,12 @@ private static final long serialVersionUID = 0L;
     if (!getAliPayAuthNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, aliPayAuthNo_);
     }
+    if (!getWxPayAuthNoBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 9, wxPayAuthNo_);
+    }
+    if (acctUsedFlag_ != 0) {
+      output.writeInt32(10, acctUsedFlag_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -419,6 +485,13 @@ private static final long serialVersionUID = 0L;
     if (!getAliPayAuthNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, aliPayAuthNo_);
     }
+    if (!getWxPayAuthNoBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, wxPayAuthNo_);
+    }
+    if (acctUsedFlag_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(10, acctUsedFlag_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -451,6 +524,10 @@ private static final long serialVersionUID = 0L;
         == other.getMpType());
     result = result && getAliPayAuthNo()
         .equals(other.getAliPayAuthNo());
+    result = result && getWxPayAuthNo()
+        .equals(other.getWxPayAuthNo());
+    result = result && (getAcctUsedFlag()
+        == other.getAcctUsedFlag());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -478,6 +555,10 @@ private static final long serialVersionUID = 0L;
     hash = (53 * hash) + getMpType();
     hash = (37 * hash) + ALIPAYAUTHNO_FIELD_NUMBER;
     hash = (53 * hash) + getAliPayAuthNo().hashCode();
+    hash = (37 * hash) + WXPAYAUTHNO_FIELD_NUMBER;
+    hash = (53 * hash) + getWxPayAuthNo().hashCode();
+    hash = (37 * hash) + ACCTUSEDFLAG_FIELD_NUMBER;
+    hash = (53 * hash) + getAcctUsedFlag();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -623,6 +704,10 @@ private static final long serialVersionUID = 0L;
 
       aliPayAuthNo_ = "";
 
+      wxPayAuthNo_ = "";
+
+      acctUsedFlag_ = 0;
+
       return this;
     }
 
@@ -653,6 +738,8 @@ private static final long serialVersionUID = 0L;
       result.hospitalId_ = hospitalId_;
       result.mpType_ = mpType_;
       result.aliPayAuthNo_ = aliPayAuthNo_;
+      result.wxPayAuthNo_ = wxPayAuthNo_;
+      result.acctUsedFlag_ = acctUsedFlag_;
       onBuilt();
       return result;
     }
@@ -724,6 +811,13 @@ private static final long serialVersionUID = 0L;
         aliPayAuthNo_ = other.aliPayAuthNo_;
         onChanged();
       }
+      if (!other.getWxPayAuthNo().isEmpty()) {
+        wxPayAuthNo_ = other.wxPayAuthNo_;
+        onChanged();
+      }
+      if (other.getAcctUsedFlag() != 0) {
+        setAcctUsedFlag(other.getAcctUsedFlag());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1216,6 +1310,113 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private java.lang.Object wxPayAuthNo_ = "";
+    /**
+     * <code>string wxPayAuthNo = 9;</code>
+     */
+    public java.lang.String getWxPayAuthNo() {
+      java.lang.Object ref = wxPayAuthNo_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        wxPayAuthNo_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string wxPayAuthNo = 9;</code>
+     */
+    public com.google.protobuf.ByteString
+        getWxPayAuthNoBytes() {
+      java.lang.Object ref = wxPayAuthNo_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        wxPayAuthNo_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string wxPayAuthNo = 9;</code>
+     */
+    public Builder setWxPayAuthNo(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      wxPayAuthNo_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string wxPayAuthNo = 9;</code>
+     */
+    public Builder clearWxPayAuthNo() {
+      
+      wxPayAuthNo_ = getDefaultInstance().getWxPayAuthNo();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string wxPayAuthNo = 9;</code>
+     */
+    public Builder setWxPayAuthNoBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      wxPayAuthNo_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int acctUsedFlag_ ;
+    /**
+     * <pre>
+     * 个人账户使用标志。1 使用； 0 不使用个账
+     * </pre>
+     *
+     * <code>int32 acctUsedFlag = 10;</code>
+     */
+    public int getAcctUsedFlag() {
+      return acctUsedFlag_;
+    }
+    /**
+     * <pre>
+     * 个人账户使用标志。1 使用； 0 不使用个账
+     * </pre>
+     *
+     * <code>int32 acctUsedFlag = 10;</code>
+     */
+    public Builder setAcctUsedFlag(int value) {
+      
+      acctUsedFlag_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 个人账户使用标志。1 使用； 0 不使用个账
+     * </pre>
+     *
+     * <code>int32 acctUsedFlag = 10;</code>
+     */
+    public Builder clearAcctUsedFlag() {
+      
+      acctUsedFlag_ = 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/third/taihe/PreSettleRequestOrBuilder.java

@@ -76,4 +76,23 @@ public interface PreSettleRequestOrBuilder extends
    */
   com.google.protobuf.ByteString
       getAliPayAuthNoBytes();
+
+  /**
+   * <code>string wxPayAuthNo = 9;</code>
+   */
+  java.lang.String getWxPayAuthNo();
+  /**
+   * <code>string wxPayAuthNo = 9;</code>
+   */
+  com.google.protobuf.ByteString
+      getWxPayAuthNoBytes();
+
+  /**
+   * <pre>
+   * 个人账户使用标志。1 使用； 0 不使用个账
+   * </pre>
+   *
+   * <code>int32 acctUsedFlag = 10;</code>
+   */
+  int getAcctUsedFlag();
 }

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

@@ -0,0 +1,574 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+/**
+ * Protobuf type {@code com.ywt.gapi.third.taihe.RevokeSettleRequest}
+ */
+public  final class RevokeSettleRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:com.ywt.gapi.third.taihe.RevokeSettleRequest)
+    RevokeSettleRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use RevokeSettleRequest.newBuilder() to construct.
+  private RevokeSettleRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private RevokeSettleRequest() {
+    hospitalId_ = 0;
+    insuDivId_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private RevokeSettleRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+
+            hospitalId_ = input.readInt32();
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            insuDivId_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.ywt.gapi.third.taihe.RevokeSettleRequest.class, com.ywt.gapi.third.taihe.RevokeSettleRequest.Builder.class);
+  }
+
+  public static final int HOSPITALID_FIELD_NUMBER = 1;
+  private int hospitalId_;
+  /**
+   * <code>int32 hospitalId = 1;</code>
+   */
+  public int getHospitalId() {
+    return hospitalId_;
+  }
+
+  public static final int INSUDIVID_FIELD_NUMBER = 2;
+  private volatile java.lang.Object insuDivId_;
+  /**
+   * <code>string insuDivId = 2;</code>
+   */
+  public java.lang.String getInsuDivId() {
+    java.lang.Object ref = insuDivId_;
+    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();
+      insuDivId_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string insuDivId = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getInsuDivIdBytes() {
+    java.lang.Object ref = insuDivId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      insuDivId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (hospitalId_ != 0) {
+      output.writeInt32(1, hospitalId_);
+    }
+    if (!getInsuDivIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, insuDivId_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (hospitalId_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(1, hospitalId_);
+    }
+    if (!getInsuDivIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, insuDivId_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.ywt.gapi.third.taihe.RevokeSettleRequest)) {
+      return super.equals(obj);
+    }
+    com.ywt.gapi.third.taihe.RevokeSettleRequest other = (com.ywt.gapi.third.taihe.RevokeSettleRequest) obj;
+
+    boolean result = true;
+    result = result && (getHospitalId()
+        == other.getHospitalId());
+    result = result && getInsuDivId()
+        .equals(other.getInsuDivId());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + HOSPITALID_FIELD_NUMBER;
+    hash = (53 * hash) + getHospitalId();
+    hash = (37 * hash) + INSUDIVID_FIELD_NUMBER;
+    hash = (53 * hash) + getInsuDivId().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.ywt.gapi.third.taihe.RevokeSettleRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code com.ywt.gapi.third.taihe.RevokeSettleRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:com.ywt.gapi.third.taihe.RevokeSettleRequest)
+      com.ywt.gapi.third.taihe.RevokeSettleRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.ywt.gapi.third.taihe.RevokeSettleRequest.class, com.ywt.gapi.third.taihe.RevokeSettleRequest.Builder.class);
+    }
+
+    // Construct using com.ywt.gapi.third.taihe.RevokeSettleRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      hospitalId_ = 0;
+
+      insuDivId_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_descriptor;
+    }
+
+    public com.ywt.gapi.third.taihe.RevokeSettleRequest getDefaultInstanceForType() {
+      return com.ywt.gapi.third.taihe.RevokeSettleRequest.getDefaultInstance();
+    }
+
+    public com.ywt.gapi.third.taihe.RevokeSettleRequest build() {
+      com.ywt.gapi.third.taihe.RevokeSettleRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.ywt.gapi.third.taihe.RevokeSettleRequest buildPartial() {
+      com.ywt.gapi.third.taihe.RevokeSettleRequest result = new com.ywt.gapi.third.taihe.RevokeSettleRequest(this);
+      result.hospitalId_ = hospitalId_;
+      result.insuDivId_ = insuDivId_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.ywt.gapi.third.taihe.RevokeSettleRequest) {
+        return mergeFrom((com.ywt.gapi.third.taihe.RevokeSettleRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.ywt.gapi.third.taihe.RevokeSettleRequest other) {
+      if (other == com.ywt.gapi.third.taihe.RevokeSettleRequest.getDefaultInstance()) return this;
+      if (other.getHospitalId() != 0) {
+        setHospitalId(other.getHospitalId());
+      }
+      if (!other.getInsuDivId().isEmpty()) {
+        insuDivId_ = other.insuDivId_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.ywt.gapi.third.taihe.RevokeSettleRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.ywt.gapi.third.taihe.RevokeSettleRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int hospitalId_ ;
+    /**
+     * <code>int32 hospitalId = 1;</code>
+     */
+    public int getHospitalId() {
+      return hospitalId_;
+    }
+    /**
+     * <code>int32 hospitalId = 1;</code>
+     */
+    public Builder setHospitalId(int value) {
+      
+      hospitalId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 hospitalId = 1;</code>
+     */
+    public Builder clearHospitalId() {
+      
+      hospitalId_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object insuDivId_ = "";
+    /**
+     * <code>string insuDivId = 2;</code>
+     */
+    public java.lang.String getInsuDivId() {
+      java.lang.Object ref = insuDivId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        insuDivId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string insuDivId = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getInsuDivIdBytes() {
+      java.lang.Object ref = insuDivId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        insuDivId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string insuDivId = 2;</code>
+     */
+    public Builder setInsuDivId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      insuDivId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string insuDivId = 2;</code>
+     */
+    public Builder clearInsuDivId() {
+      
+      insuDivId_ = getDefaultInstance().getInsuDivId();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string insuDivId = 2;</code>
+     */
+    public Builder setInsuDivIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      insuDivId_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:com.ywt.gapi.third.taihe.RevokeSettleRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:com.ywt.gapi.third.taihe.RevokeSettleRequest)
+  private static final com.ywt.gapi.third.taihe.RevokeSettleRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.ywt.gapi.third.taihe.RevokeSettleRequest();
+  }
+
+  public static com.ywt.gapi.third.taihe.RevokeSettleRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<RevokeSettleRequest>
+      PARSER = new com.google.protobuf.AbstractParser<RevokeSettleRequest>() {
+    public RevokeSettleRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RevokeSettleRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<RevokeSettleRequest> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<RevokeSettleRequest> getParserForType() {
+    return PARSER;
+  }
+
+  public com.ywt.gapi.third.taihe.RevokeSettleRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+

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

@@ -0,0 +1,24 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+public interface RevokeSettleRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:com.ywt.gapi.third.taihe.RevokeSettleRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>int32 hospitalId = 1;</code>
+   */
+  int getHospitalId();
+
+  /**
+   * <code>string insuDivId = 2;</code>
+   */
+  java.lang.String getInsuDivId();
+  /**
+   * <code>string insuDivId = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getInsuDivIdBytes();
+}

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

@@ -0,0 +1,574 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+/**
+ * Protobuf type {@code com.ywt.gapi.third.taihe.RevokeSettleResponse}
+ */
+public  final class RevokeSettleResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:com.ywt.gapi.third.taihe.RevokeSettleResponse)
+    RevokeSettleResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use RevokeSettleResponse.newBuilder() to construct.
+  private RevokeSettleResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private RevokeSettleResponse() {
+    code_ = 0;
+    info_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private RevokeSettleResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+
+            code_ = input.readInt32();
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            info_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.ywt.gapi.third.taihe.RevokeSettleResponse.class, com.ywt.gapi.third.taihe.RevokeSettleResponse.Builder.class);
+  }
+
+  public static final int CODE_FIELD_NUMBER = 1;
+  private int code_;
+  /**
+   * <code>int32 code = 1;</code>
+   */
+  public int getCode() {
+    return code_;
+  }
+
+  public static final int INFO_FIELD_NUMBER = 2;
+  private volatile java.lang.Object info_;
+  /**
+   * <code>string info = 2;</code>
+   */
+  public java.lang.String getInfo() {
+    java.lang.Object ref = info_;
+    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();
+      info_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string info = 2;</code>
+   */
+  public com.google.protobuf.ByteString
+      getInfoBytes() {
+    java.lang.Object ref = info_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      info_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (code_ != 0) {
+      output.writeInt32(1, code_);
+    }
+    if (!getInfoBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (code_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(1, code_);
+    }
+    if (!getInfoBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.ywt.gapi.third.taihe.RevokeSettleResponse)) {
+      return super.equals(obj);
+    }
+    com.ywt.gapi.third.taihe.RevokeSettleResponse other = (com.ywt.gapi.third.taihe.RevokeSettleResponse) obj;
+
+    boolean result = true;
+    result = result && (getCode()
+        == other.getCode());
+    result = result && getInfo()
+        .equals(other.getInfo());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getCode();
+    hash = (37 * hash) + INFO_FIELD_NUMBER;
+    hash = (53 * hash) + getInfo().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.ywt.gapi.third.taihe.RevokeSettleResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * Protobuf type {@code com.ywt.gapi.third.taihe.RevokeSettleResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:com.ywt.gapi.third.taihe.RevokeSettleResponse)
+      com.ywt.gapi.third.taihe.RevokeSettleResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.ywt.gapi.third.taihe.RevokeSettleResponse.class, com.ywt.gapi.third.taihe.RevokeSettleResponse.Builder.class);
+    }
+
+    // Construct using com.ywt.gapi.third.taihe.RevokeSettleResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      code_ = 0;
+
+      info_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.ywt.gapi.third.taihe.Taihe.internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_descriptor;
+    }
+
+    public com.ywt.gapi.third.taihe.RevokeSettleResponse getDefaultInstanceForType() {
+      return com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance();
+    }
+
+    public com.ywt.gapi.third.taihe.RevokeSettleResponse build() {
+      com.ywt.gapi.third.taihe.RevokeSettleResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.ywt.gapi.third.taihe.RevokeSettleResponse buildPartial() {
+      com.ywt.gapi.third.taihe.RevokeSettleResponse result = new com.ywt.gapi.third.taihe.RevokeSettleResponse(this);
+      result.code_ = code_;
+      result.info_ = info_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.ywt.gapi.third.taihe.RevokeSettleResponse) {
+        return mergeFrom((com.ywt.gapi.third.taihe.RevokeSettleResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.ywt.gapi.third.taihe.RevokeSettleResponse other) {
+      if (other == com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance()) return this;
+      if (other.getCode() != 0) {
+        setCode(other.getCode());
+      }
+      if (!other.getInfo().isEmpty()) {
+        info_ = other.info_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.ywt.gapi.third.taihe.RevokeSettleResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.ywt.gapi.third.taihe.RevokeSettleResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int code_ ;
+    /**
+     * <code>int32 code = 1;</code>
+     */
+    public int getCode() {
+      return code_;
+    }
+    /**
+     * <code>int32 code = 1;</code>
+     */
+    public Builder setCode(int value) {
+      
+      code_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 code = 1;</code>
+     */
+    public Builder clearCode() {
+      
+      code_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object info_ = "";
+    /**
+     * <code>string info = 2;</code>
+     */
+    public java.lang.String getInfo() {
+      java.lang.Object ref = info_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        info_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getInfoBytes() {
+      java.lang.Object ref = info_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        info_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public Builder setInfo(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      info_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public Builder clearInfo() {
+      
+      info_ = getDefaultInstance().getInfo();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string info = 2;</code>
+     */
+    public Builder setInfoBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      info_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:com.ywt.gapi.third.taihe.RevokeSettleResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:com.ywt.gapi.third.taihe.RevokeSettleResponse)
+  private static final com.ywt.gapi.third.taihe.RevokeSettleResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.ywt.gapi.third.taihe.RevokeSettleResponse();
+  }
+
+  public static com.ywt.gapi.third.taihe.RevokeSettleResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<RevokeSettleResponse>
+      PARSER = new com.google.protobuf.AbstractParser<RevokeSettleResponse>() {
+    public RevokeSettleResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RevokeSettleResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<RevokeSettleResponse> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<RevokeSettleResponse> getParserForType() {
+    return PARSER;
+  }
+
+  public com.ywt.gapi.third.taihe.RevokeSettleResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+

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

@@ -0,0 +1,24 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: taihe.proto
+
+package com.ywt.gapi.third.taihe;
+
+public interface RevokeSettleResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:com.ywt.gapi.third.taihe.RevokeSettleResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>int32 code = 1;</code>
+   */
+  int getCode();
+
+  /**
+   * <code>string info = 2;</code>
+   */
+  java.lang.String getInfo();
+  /**
+   * <code>string info = 2;</code>
+   */
+  com.google.protobuf.ByteString
+      getInfoBytes();
+}

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

@@ -779,6 +779,26 @@ public final class Taihe {
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_com_ywt_gapi_third_taihe_PayConfirmResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1340,192 +1360,205 @@ public final class Taihe {
       "tListItem\";\n\026PhyReportDetailRequest\022\r\n\005a" +
       "dmId\030\001 \001(\t\022\022\n\nhospitalId\030\002 \001(\005\"H\n\027PhyRep" +
       "ortDetailResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030" +
-      "\002 \001(\t\022\021\n\treportPdf\030\003 \001(\t\"\241\001\n\020PreSettleRe" +
+      "\002 \001(\t\022\021\n\treportPdf\030\003 \001(\t\"\314\001\n\020PreSettleRe" +
       "quest\022\020\n\010invPrtDr\030\001 \001(\t\022\016\n\006cardNo\030\002 \001(\t\022" +
       "\017\n\007psnName\030\003 \001(\t\022\020\n\010authCode\030\004 \001(\t\022\016\n\006op" +
       "enId\030\005 \001(\t\022\022\n\nhospitalId\030\006 \001(\005\022\016\n\006mpType" +
-      "\030\007 \001(\005\022\024\n\014aliPayAuthNo\030\010 \001(\t\"x\n\021PreSettl" +
-      "eResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\016\n" +
-      "\006output\030\003 \001(\t\022\020\n\010hiOutput\030\004 \001(\t\022\021\n\tpayAu" +
-      "thNo\030\005 \001(\t\022\022\n\nsetlLatlnt\030\006 \001(\t\"Q\n\"GetMed" +
-      "InsTypeByOrderInsTypeRequest\022\027\n\017orderIns" +
-      "TypeStr\030\001 \001(\t\022\022\n\nhospitalId\030\002 \001(\005\"W\n#Get" +
-      "MedInsTypeByOrderInsTypeResponse\022\014\n\004code" +
-      "\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\024\n\014orderInsType\030\003 \001" +
-      "(\005\"t\n\021PayConfirmRequest\022\022\n\nhospitalId\030\001 " +
-      "\001(\005\022\021\n\tinsuDivId\030\002 \001(\t\022\022\n\nownPayPMDr\030\003 \001" +
-      "(\t\022\021\n\townPayAmt\030\004 \001(\t\022\021\n\tpayAuthNo\030\005 \001(\t" +
-      "\">\n\022PayConfirmResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004" +
-      "info\030\002 \001(\t\022\014\n\004data\030\003 \001(\t2\2764\n\014TaiheServic" +
-      "e\022s\n\016getPatientInfo\022/.com.ywt.gapi.third" +
-      ".taihe.GetPatientInfoRequest\0320.com.ywt.g" +
-      "api.third.taihe.GetPatientInfoResponse\022j" +
-      "\n\013getDeptList\022,.com.ywt.gapi.third.taihe" +
-      ".GetDeptListRequest\032-.com.ywt.gapi.third" +
-      ".taihe.GetDeptListResponse\022p\n\rgetDoctorL" +
-      "ist\022..com.ywt.gapi.third.taihe.GetDoctor" +
-      "ListRequest\032/.com.ywt.gapi.third.taihe.G" +
-      "etDoctorListResponse\022y\n\020getMedicalRecord" +
-      "\0221.com.ywt.gapi.third.taihe.GetMedicalRe" +
-      "cordRequest\0322.com.ywt.gapi.third.taihe.G" +
-      "etMedicalRecordResponse\022|\n\021getLaboratory" +
-      "List\0222.com.ywt.gapi.third.taihe.GetLabor" +
-      "atoryListRequest\0323.com.ywt.gapi.third.ta" +
-      "ihe.GetLaboratoryListResponse\022\202\001\n\023getLab" +
-      "oratoryDetail\0224.com.ywt.gapi.third.taihe" +
-      ".GetLaboratoryDetailRequest\0325.com.ywt.ga" +
-      "pi.third.taihe.GetLaboratoryDetailRespon" +
-      "se\022v\n\017getScheduleList\0220.com.ywt.gapi.thi" +
-      "rd.taihe.GetScheduleListRequest\0321.com.yw" +
-      "t.gapi.third.taihe.GetScheduleListRespon" +
-      "se\022\202\001\n\023getScheduleTimeInfo\0224.com.ywt.gap" +
-      "i.third.taihe.GetScheduleTimeInfoRequest" +
-      "\0325.com.ywt.gapi.third.taihe.GetScheduleT" +
-      "imeInfoResponse\022|\n\021getInspectionList\0222.c" +
-      "om.ywt.gapi.third.taihe.GetInspectionLis" +
-      "tRequest\0323.com.ywt.gapi.third.taihe.GetI" +
-      "nspectionListResponse\022\202\001\n\023getInspectionD" +
-      "etail\0224.com.ywt.gapi.third.taihe.GetInsp" +
-      "ectionDetailRequest\0325.com.ywt.gapi.third" +
-      ".taihe.GetInspectionDetailResponse\022m\n\014ge" +
-      "tQueueInfo\022-.com.ywt.gapi.third.taihe.Ge" +
-      "tQueueInfoRequest\032..com.ywt.gapi.third.t" +
-      "aihe.GetQueueInfoResponse\022U\n\004take\022%.com." +
-      "ywt.gapi.third.taihe.TakeRequest\032&.com.y" +
-      "wt.gapi.third.taihe.TakeResponse\022[\n\006canc" +
-      "el\022\'.com.ywt.gapi.third.taihe.CancelRequ" +
-      "est\032(.com.ywt.gapi.third.taihe.CancelRes" +
-      "ponse\022\202\001\n\023getRegistrationList\0224.com.ywt." +
-      "gapi.third.taihe.GetRegistrationListRequ" +
-      "est\0325.com.ywt.gapi.third.taihe.GetRegist" +
-      "rationListResponse\022\210\001\n\025getRegistrationDe" +
-      "tail\0226.com.ywt.gapi.third.taihe.GetRegis" +
-      "trationDetailRequest\0327.com.ywt.gapi.thir" +
-      "d.taihe.GetRegistrationDetailResponse\022a\n" +
-      "\010register\022).com.ywt.gapi.third.taihe.Reg" +
-      "isterRequest\032*.com.ywt.gapi.third.taihe." +
-      "RegisterResponse\022R\n\003pay\022$.com.ywt.gapi.t" +
-      "hird.taihe.PayRequest\032%.com.ywt.gapi.thi" +
-      "rd.taihe.PayResponse\022^\n\007payFree\022(.com.yw" +
-      "t.gapi.third.taihe.PayFreeRequest\032).com." +
-      "ywt.gapi.third.taihe.PayFreeResponse\022|\n\021" +
-      "getOutpatientList\0222.com.ywt.gapi.third.t" +
-      "aihe.GetOutpatientListRequest\0323.com.ywt." +
-      "gapi.third.taihe.GetOutpatientListRespon" +
-      "se\022y\n\020getPaymentDetail\0221.com.ywt.gapi.th" +
-      "ird.taihe.GetPaymentDetailRequest\0322.com." +
-      "ywt.gapi.third.taihe.GetPaymentDetailRes" +
-      "ponse\022m\n\014calInsurance\022-.com.ywt.gapi.thi" +
-      "rd.taihe.CalInsuranceRequest\032..com.ywt.g" +
-      "api.third.taihe.CalInsuranceResponse\022a\n\010" +
-      "payOrder\022).com.ywt.gapi.third.taihe.PayO" +
-      "rderRequest\032*.com.ywt.gapi.third.taihe.P" +
-      "ayOrderResponse\022g\n\ngetAddInfo\022+.com.ywt." +
-      "gapi.third.taihe.GetAddInfoRequest\032,.com" +
-      ".ywt.gapi.third.taihe.GetAddInfoResponse" +
-      "\022|\n\021getTreatmentGuide\0222.com.ywt.gapi.thi" +
-      "rd.taihe.GetTreatmentGuideRequest\0323.com." +
-      "ywt.gapi.third.taihe.GetTreatmentGuideRe" +
-      "sponse\022\202\001\n\023getTreatmentGuideV2\0224.com.ywt" +
-      ".gapi.third.taihe.GetTreatmentGuideV2Req" +
-      "uest\0325.com.ywt.gapi.third.taihe.GetTreat" +
-      "mentGuideV2Response\022j\n\013getDrugList\022,.com" +
-      ".ywt.gapi.third.taihe.GetDrugListRequest" +
-      "\032-.com.ywt.gapi.third.taihe.GetDrugListR" +
-      "esponse\022c\n\014pushPresInfo\022-.com.ywt.gapi.t" +
-      "hird.taihe.PushPresInfoRequest\032$.com.ywt" +
-      ".gapi.third.taihe.BaseResult\022j\n\013getPresI" +
-      "nfo\022,.com.ywt.gapi.third.taihe.GetPresIn" +
-      "foRequest\032-.com.ywt.gapi.third.taihe.Get" +
-      "PresInfoResponse\022\224\001\n\031getPatInfoByHisClin" +
-      "icCode\022:.com.ywt.gapi.third.taihe.GetPat" +
-      "InfoByHisClinicCodeRequest\032;.com.ywt.gap" +
-      "i.third.taihe.GetPatInfoByHisClinicCodeR" +
-      "esponse\022d\n\tlockOrder\022*.com.ywt.gapi.thir" +
-      "d.taihe.LockOrderRequest\032+.com.ywt.gapi." +
-      "third.taihe.LockOrderResponse\022p\n\rgetClin" +
-      "icList\022..com.ywt.gapi.third.taihe.GetCli" +
-      "nicListRequest\032/.com.ywt.gapi.third.taih" +
-      "e.GetClinicListResponse\022\221\001\n\030getDoctorCur" +
-      "rentSchedule\0229.com.ywt.gapi.third.taihe." +
-      "GetDoctorCurrentScheduleRequest\032:.com.yw" +
-      "t.gapi.third.taihe.GetDoctorCurrentSched" +
-      "uleResponse\022p\n\rprePayConfirm\022..com.ywt.g" +
-      "api.third.taihe.PrePayConfirmRequest\032/.c" +
-      "om.ywt.gapi.third.taihe.PrePayConfirmRes" +
-      "ponse\022y\n\020getDrugInventory\0221.com.ywt.gapi" +
-      ".third.taihe.GetDrugInventoryRequest\0322.c" +
-      "om.ywt.gapi.third.taihe.GetDrugInventory" +
-      "Response\022m\n\014addDiagnosis\022-.com.ywt.gapi." +
-      "third.taihe.AddDiagnosisRequest\032..com.yw" +
-      "t.gapi.third.taihe.AddDiagnosisResponse\022" +
-      "m\n\014addOEORIInfo\022-.com.ywt.gapi.third.tai" +
-      "he.AddOEORIInfoRequest\032..com.ywt.gapi.th" +
-      "ird.taihe.AddOEORIInfoResponse\022v\n\017cancel" +
-      "OEORIInfo\0220.com.ywt.gapi.third.taihe.Can" +
-      "celOEORIInfoRequest\0321.com.ywt.gapi.third" +
-      ".taihe.CancelOEORIInfoResponse\022m\n\014getInP" +
-      "atInfo\022-.com.ywt.gapi.third.taihe.GetInP" +
-      "atInfoRequest\032..com.ywt.gapi.third.taihe" +
-      ".GetInPatInfoResponse\022p\n\rgetDayFeeList\022." +
-      ".com.ywt.gapi.third.taihe.GetDayFeeListR" +
-      "equest\032/.com.ywt.gapi.third.taihe.GetDay" +
-      "FeeListResponse\022^\n\007payCash\022(.com.ywt.gap" +
-      "i.third.taihe.PayCashRequest\032).com.ywt.g" +
-      "api.third.taihe.PayCashResponse\022j\n\013getCa" +
-      "shList\022,.com.ywt.gapi.third.taihe.GetCas" +
-      "hListRequest\032-.com.ywt.gapi.third.taihe." +
-      "GetCashListResponse\022g\n\ngetCheckIn\022+.com." +
-      "ywt.gapi.third.taihe.GetCheckInRequest\032," +
-      ".com.ywt.gapi.third.taihe.GetCheckInResp" +
-      "onse\022p\n\rcreatePatInfo\022..com.ywt.gapi.thi" +
-      "rd.taihe.CreatePatInfoRequest\032/.com.ywt." +
-      "gapi.third.taihe.CreatePatInfoResponse\022s" +
-      "\n\016oneKeyRegister\022/.com.ywt.gapi.third.ta" +
-      "ihe.OneKeyRegisterRequest\0320.com.ywt.gapi" +
-      ".third.taihe.OneKeyRegisterResponse\022|\n\021g" +
-      "etDiagnoseRecord\0222.com.ywt.gapi.third.ta" +
-      "ihe.GetDiagnoseRecordRequest\0323.com.ywt.g" +
-      "api.third.taihe.GetDiagnoseRecordRespons" +
-      "e\022g\n\nphyPayList\022+.com.ywt.gapi.third.tai" +
-      "he.PhyPayListRequest\032,.com.ywt.gapi.thir" +
-      "d.taihe.PhyPayListResponse\022m\n\014phyPayDeta" +
-      "il\022-.com.ywt.gapi.third.taihe.PhyPayDeta" +
-      "ilRequest\032..com.ywt.gapi.third.taihe.Phy" +
-      "PayDetailResponse\022j\n\013phyPayOrder\022,.com.y" +
-      "wt.gapi.third.taihe.PhyPayOrderRequest\032-" +
-      ".com.ywt.gapi.third.taihe.PhyPayOrderRes" +
-      "ponse\022j\n\013getEInvoice\022,.com.ywt.gapi.thir" +
-      "d.taihe.GetEInvoiceRequest\032-.com.ywt.gap" +
-      "i.third.taihe.GetEInvoiceResponse\022m\n\014get" +
-      "InPayList\022-.com.ywt.gapi.third.taihe.Get" +
-      "InPayListRequest\032..com.ywt.gapi.third.ta" +
-      "ihe.GetInPayListResponse\022\177\n\022getInsuOPDiv" +
-      "idePre\0223.com.ywt.gapi.third.taihe.GetIns" +
-      "uOPDividePreRequest\0324.com.ywt.gapi.third" +
-      ".taihe.GetInsuOPDividePreResponse\022s\n\016get" +
-      "InsuAdmInfo\022/.com.ywt.gapi.third.taihe.G" +
-      "etInsuAdmInfoRequest\0320.com.ywt.gapi.thir" +
-      "d.taihe.GetInsuAdmInfoResponse\022s\n\016saveIn" +
-      "suResult\022/.com.ywt.gapi.third.taihe.Save" +
-      "InsuResultRequest\0320.com.ywt.gapi.third.t" +
-      "aihe.SaveInsuResultResponse\022p\n\rphyReport" +
-      "List\022..com.ywt.gapi.third.taihe.PhyRepor" +
-      "tListRequest\032/.com.ywt.gapi.third.taihe." +
-      "PhyReportListResponse\022v\n\017phyReportDetail" +
-      "\0220.com.ywt.gapi.third.taihe.PhyReportDet" +
-      "ailRequest\0321.com.ywt.gapi.third.taihe.Ph" +
-      "yReportDetailResponse\022d\n\tpreSettle\022*.com" +
-      ".ywt.gapi.third.taihe.PreSettleRequest\032+" +
-      ".com.ywt.gapi.third.taihe.PreSettleRespo" +
-      "nse\022\232\001\n\033getMedInsTypeByOrderInsType\022<.co" +
-      "m.ywt.gapi.third.taihe.GetMedInsTypeByOr" +
-      "derInsTypeRequest\032=.com.ywt.gapi.third.t" +
-      "aihe.GetMedInsTypeByOrderInsTypeResponse" +
-      "\022g\n\npayConfirm\022+.com.ywt.gapi.third.taih" +
-      "e.PayConfirmRequest\032,.com.ywt.gapi.third" +
-      ".taihe.PayConfirmResponseB\037\n\030com.ywt.gap" +
-      "i.third.taiheP\001\210\001\001b\006proto3"
+      "\030\007 \001(\005\022\024\n\014aliPayAuthNo\030\010 \001(\t\022\023\n\013wxPayAut" +
+      "hNo\030\t \001(\t\022\024\n\014acctUsedFlag\030\n \001(\005\"x\n\021PreSe" +
+      "ttleResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t" +
+      "\022\016\n\006output\030\003 \001(\t\022\020\n\010hiOutput\030\004 \001(\t\022\021\n\tpa" +
+      "yAuthNo\030\005 \001(\t\022\022\n\nsetlLatlnt\030\006 \001(\t\"Q\n\"Get" +
+      "MedInsTypeByOrderInsTypeRequest\022\027\n\017order" +
+      "InsTypeStr\030\001 \001(\t\022\022\n\nhospitalId\030\002 \001(\005\"W\n#" +
+      "GetMedInsTypeByOrderInsTypeResponse\022\014\n\004c" +
+      "ode\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\024\n\014orderInsType\030" +
+      "\003 \001(\005\"\204\001\n\021PayConfirmRequest\022\022\n\nhospitalI" +
+      "d\030\001 \001(\005\022\021\n\tinsuDivId\030\002 \001(\t\022\022\n\nownPayPMDr" +
+      "\030\003 \001(\t\022\021\n\townPayAmt\030\004 \001(\t\022\021\n\tpayAuthNo\030\005" +
+      " \001(\t\022\016\n\006mpType\030\006 \001(\005\">\n\022PayConfirmRespon" +
+      "se\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\014\n\004data\030\003" +
+      " \001(\t\"<\n\023RevokeSettleRequest\022\022\n\nhospitalI" +
+      "d\030\001 \001(\005\022\021\n\tinsuDivId\030\002 \001(\t\"2\n\024RevokeSett" +
+      "leResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\"S" +
+      "\n\023PrePayCancelRequest\022\022\n\nhospitalId\030\001 \001(" +
+      "\005\022\022\n\nhisOrderNo\030\002 \001(\t\022\024\n\014hisPatientId\030\003 " +
+      "\001(\t\"2\n\024PrePayCancelResponse\022\014\n\004code\030\001 \001(" +
+      "\005\022\014\n\004info\030\002 \001(\t2\2346\n\014TaiheService\022s\n\016getP" +
+      "atientInfo\022/.com.ywt.gapi.third.taihe.Ge" +
+      "tPatientInfoRequest\0320.com.ywt.gapi.third" +
+      ".taihe.GetPatientInfoResponse\022j\n\013getDept" +
+      "List\022,.com.ywt.gapi.third.taihe.GetDeptL" +
+      "istRequest\032-.com.ywt.gapi.third.taihe.Ge" +
+      "tDeptListResponse\022p\n\rgetDoctorList\022..com" +
+      ".ywt.gapi.third.taihe.GetDoctorListReque" +
+      "st\032/.com.ywt.gapi.third.taihe.GetDoctorL" +
+      "istResponse\022y\n\020getMedicalRecord\0221.com.yw" +
+      "t.gapi.third.taihe.GetMedicalRecordReque" +
+      "st\0322.com.ywt.gapi.third.taihe.GetMedical" +
+      "RecordResponse\022|\n\021getLaboratoryList\0222.co" +
+      "m.ywt.gapi.third.taihe.GetLaboratoryList" +
+      "Request\0323.com.ywt.gapi.third.taihe.GetLa" +
+      "boratoryListResponse\022\202\001\n\023getLaboratoryDe" +
+      "tail\0224.com.ywt.gapi.third.taihe.GetLabor" +
+      "atoryDetailRequest\0325.com.ywt.gapi.third." +
+      "taihe.GetLaboratoryDetailResponse\022v\n\017get" +
+      "ScheduleList\0220.com.ywt.gapi.third.taihe." +
+      "GetScheduleListRequest\0321.com.ywt.gapi.th" +
+      "ird.taihe.GetScheduleListResponse\022\202\001\n\023ge" +
+      "tScheduleTimeInfo\0224.com.ywt.gapi.third.t" +
+      "aihe.GetScheduleTimeInfoRequest\0325.com.yw" +
+      "t.gapi.third.taihe.GetScheduleTimeInfoRe" +
+      "sponse\022|\n\021getInspectionList\0222.com.ywt.ga" +
+      "pi.third.taihe.GetInspectionListRequest\032" +
+      "3.com.ywt.gapi.third.taihe.GetInspection" +
+      "ListResponse\022\202\001\n\023getInspectionDetail\0224.c" +
+      "om.ywt.gapi.third.taihe.GetInspectionDet" +
+      "ailRequest\0325.com.ywt.gapi.third.taihe.Ge" +
+      "tInspectionDetailResponse\022m\n\014getQueueInf" +
+      "o\022-.com.ywt.gapi.third.taihe.GetQueueInf" +
+      "oRequest\032..com.ywt.gapi.third.taihe.GetQ" +
+      "ueueInfoResponse\022U\n\004take\022%.com.ywt.gapi." +
+      "third.taihe.TakeRequest\032&.com.ywt.gapi.t" +
+      "hird.taihe.TakeResponse\022[\n\006cancel\022\'.com." +
+      "ywt.gapi.third.taihe.CancelRequest\032(.com" +
+      ".ywt.gapi.third.taihe.CancelResponse\022\202\001\n" +
+      "\023getRegistrationList\0224.com.ywt.gapi.thir" +
+      "d.taihe.GetRegistrationListRequest\0325.com" +
+      ".ywt.gapi.third.taihe.GetRegistrationLis" +
+      "tResponse\022\210\001\n\025getRegistrationDetail\0226.co" +
+      "m.ywt.gapi.third.taihe.GetRegistrationDe" +
+      "tailRequest\0327.com.ywt.gapi.third.taihe.G" +
+      "etRegistrationDetailResponse\022a\n\010register" +
+      "\022).com.ywt.gapi.third.taihe.RegisterRequ" +
+      "est\032*.com.ywt.gapi.third.taihe.RegisterR" +
+      "esponse\022R\n\003pay\022$.com.ywt.gapi.third.taih" +
+      "e.PayRequest\032%.com.ywt.gapi.third.taihe." +
+      "PayResponse\022^\n\007payFree\022(.com.ywt.gapi.th" +
+      "ird.taihe.PayFreeRequest\032).com.ywt.gapi." +
+      "third.taihe.PayFreeResponse\022|\n\021getOutpat" +
+      "ientList\0222.com.ywt.gapi.third.taihe.GetO" +
+      "utpatientListRequest\0323.com.ywt.gapi.thir" +
+      "d.taihe.GetOutpatientListResponse\022y\n\020get" +
+      "PaymentDetail\0221.com.ywt.gapi.third.taihe" +
+      ".GetPaymentDetailRequest\0322.com.ywt.gapi." +
+      "third.taihe.GetPaymentDetailResponse\022m\n\014" +
+      "calInsurance\022-.com.ywt.gapi.third.taihe." +
+      "CalInsuranceRequest\032..com.ywt.gapi.third" +
+      ".taihe.CalInsuranceResponse\022a\n\010payOrder\022" +
+      ").com.ywt.gapi.third.taihe.PayOrderReque" +
+      "st\032*.com.ywt.gapi.third.taihe.PayOrderRe" +
+      "sponse\022g\n\ngetAddInfo\022+.com.ywt.gapi.thir" +
+      "d.taihe.GetAddInfoRequest\032,.com.ywt.gapi" +
+      ".third.taihe.GetAddInfoResponse\022|\n\021getTr" +
+      "eatmentGuide\0222.com.ywt.gapi.third.taihe." +
+      "GetTreatmentGuideRequest\0323.com.ywt.gapi." +
+      "third.taihe.GetTreatmentGuideResponse\022\202\001" +
+      "\n\023getTreatmentGuideV2\0224.com.ywt.gapi.thi" +
+      "rd.taihe.GetTreatmentGuideV2Request\0325.co" +
+      "m.ywt.gapi.third.taihe.GetTreatmentGuide" +
+      "V2Response\022j\n\013getDrugList\022,.com.ywt.gapi" +
+      ".third.taihe.GetDrugListRequest\032-.com.yw" +
+      "t.gapi.third.taihe.GetDrugListResponse\022c" +
+      "\n\014pushPresInfo\022-.com.ywt.gapi.third.taih" +
+      "e.PushPresInfoRequest\032$.com.ywt.gapi.thi" +
+      "rd.taihe.BaseResult\022j\n\013getPresInfo\022,.com" +
+      ".ywt.gapi.third.taihe.GetPresInfoRequest" +
+      "\032-.com.ywt.gapi.third.taihe.GetPresInfoR" +
+      "esponse\022\224\001\n\031getPatInfoByHisClinicCode\022:." +
+      "com.ywt.gapi.third.taihe.GetPatInfoByHis" +
+      "ClinicCodeRequest\032;.com.ywt.gapi.third.t" +
+      "aihe.GetPatInfoByHisClinicCodeResponse\022d" +
+      "\n\tlockOrder\022*.com.ywt.gapi.third.taihe.L" +
+      "ockOrderRequest\032+.com.ywt.gapi.third.tai" +
+      "he.LockOrderResponse\022p\n\rgetClinicList\022.." +
+      "com.ywt.gapi.third.taihe.GetClinicListRe" +
+      "quest\032/.com.ywt.gapi.third.taihe.GetClin" +
+      "icListResponse\022\221\001\n\030getDoctorCurrentSched" +
+      "ule\0229.com.ywt.gapi.third.taihe.GetDoctor" +
+      "CurrentScheduleRequest\032:.com.ywt.gapi.th" +
+      "ird.taihe.GetDoctorCurrentScheduleRespon" +
+      "se\022p\n\rprePayConfirm\022..com.ywt.gapi.third" +
+      ".taihe.PrePayConfirmRequest\032/.com.ywt.ga" +
+      "pi.third.taihe.PrePayConfirmResponse\022y\n\020" +
+      "getDrugInventory\0221.com.ywt.gapi.third.ta" +
+      "ihe.GetDrugInventoryRequest\0322.com.ywt.ga" +
+      "pi.third.taihe.GetDrugInventoryResponse\022" +
+      "m\n\014addDiagnosis\022-.com.ywt.gapi.third.tai" +
+      "he.AddDiagnosisRequest\032..com.ywt.gapi.th" +
+      "ird.taihe.AddDiagnosisResponse\022m\n\014addOEO" +
+      "RIInfo\022-.com.ywt.gapi.third.taihe.AddOEO" +
+      "RIInfoRequest\032..com.ywt.gapi.third.taihe" +
+      ".AddOEORIInfoResponse\022v\n\017cancelOEORIInfo" +
+      "\0220.com.ywt.gapi.third.taihe.CancelOEORII" +
+      "nfoRequest\0321.com.ywt.gapi.third.taihe.Ca" +
+      "ncelOEORIInfoResponse\022m\n\014getInPatInfo\022-." +
+      "com.ywt.gapi.third.taihe.GetInPatInfoReq" +
+      "uest\032..com.ywt.gapi.third.taihe.GetInPat" +
+      "InfoResponse\022p\n\rgetDayFeeList\022..com.ywt." +
+      "gapi.third.taihe.GetDayFeeListRequest\032/." +
+      "com.ywt.gapi.third.taihe.GetDayFeeListRe" +
+      "sponse\022^\n\007payCash\022(.com.ywt.gapi.third.t" +
+      "aihe.PayCashRequest\032).com.ywt.gapi.third" +
+      ".taihe.PayCashResponse\022j\n\013getCashList\022,." +
+      "com.ywt.gapi.third.taihe.GetCashListRequ" +
+      "est\032-.com.ywt.gapi.third.taihe.GetCashLi" +
+      "stResponse\022g\n\ngetCheckIn\022+.com.ywt.gapi." +
+      "third.taihe.GetCheckInRequest\032,.com.ywt." +
+      "gapi.third.taihe.GetCheckInResponse\022p\n\rc" +
+      "reatePatInfo\022..com.ywt.gapi.third.taihe." +
+      "CreatePatInfoRequest\032/.com.ywt.gapi.thir" +
+      "d.taihe.CreatePatInfoResponse\022s\n\016oneKeyR" +
+      "egister\022/.com.ywt.gapi.third.taihe.OneKe" +
+      "yRegisterRequest\0320.com.ywt.gapi.third.ta" +
+      "ihe.OneKeyRegisterResponse\022|\n\021getDiagnos" +
+      "eRecord\0222.com.ywt.gapi.third.taihe.GetDi" +
+      "agnoseRecordRequest\0323.com.ywt.gapi.third" +
+      ".taihe.GetDiagnoseRecordResponse\022g\n\nphyP" +
+      "ayList\022+.com.ywt.gapi.third.taihe.PhyPay" +
+      "ListRequest\032,.com.ywt.gapi.third.taihe.P" +
+      "hyPayListResponse\022m\n\014phyPayDetail\022-.com." +
+      "ywt.gapi.third.taihe.PhyPayDetailRequest" +
+      "\032..com.ywt.gapi.third.taihe.PhyPayDetail" +
+      "Response\022j\n\013phyPayOrder\022,.com.ywt.gapi.t" +
+      "hird.taihe.PhyPayOrderRequest\032-.com.ywt." +
+      "gapi.third.taihe.PhyPayOrderResponse\022j\n\013" +
+      "getEInvoice\022,.com.ywt.gapi.third.taihe.G" +
+      "etEInvoiceRequest\032-.com.ywt.gapi.third.t" +
+      "aihe.GetEInvoiceResponse\022m\n\014getInPayList" +
+      "\022-.com.ywt.gapi.third.taihe.GetInPayList" +
+      "Request\032..com.ywt.gapi.third.taihe.GetIn" +
+      "PayListResponse\022\177\n\022getInsuOPDividePre\0223." +
+      "com.ywt.gapi.third.taihe.GetInsuOPDivide" +
+      "PreRequest\0324.com.ywt.gapi.third.taihe.Ge" +
+      "tInsuOPDividePreResponse\022s\n\016getInsuAdmIn" +
+      "fo\022/.com.ywt.gapi.third.taihe.GetInsuAdm" +
+      "InfoRequest\0320.com.ywt.gapi.third.taihe.G" +
+      "etInsuAdmInfoResponse\022s\n\016saveInsuResult\022" +
+      "/.com.ywt.gapi.third.taihe.SaveInsuResul" +
+      "tRequest\0320.com.ywt.gapi.third.taihe.Save" +
+      "InsuResultResponse\022p\n\rphyReportList\022..co" +
+      "m.ywt.gapi.third.taihe.PhyReportListRequ" +
+      "est\032/.com.ywt.gapi.third.taihe.PhyReport" +
+      "ListResponse\022v\n\017phyReportDetail\0220.com.yw" +
+      "t.gapi.third.taihe.PhyReportDetailReques" +
+      "t\0321.com.ywt.gapi.third.taihe.PhyReportDe" +
+      "tailResponse\022d\n\tpreSettle\022*.com.ywt.gapi" +
+      ".third.taihe.PreSettleRequest\032+.com.ywt." +
+      "gapi.third.taihe.PreSettleResponse\022\232\001\n\033g" +
+      "etMedInsTypeByOrderInsType\022<.com.ywt.gap" +
+      "i.third.taihe.GetMedInsTypeByOrderInsTyp" +
+      "eRequest\032=.com.ywt.gapi.third.taihe.GetM" +
+      "edInsTypeByOrderInsTypeResponse\022g\n\npayCo" +
+      "nfirm\022+.com.ywt.gapi.third.taihe.PayConf" +
+      "irmRequest\032,.com.ywt.gapi.third.taihe.Pa" +
+      "yConfirmResponse\022m\n\014prePayCancel\022-.com.y" +
+      "wt.gapi.third.taihe.PrePayCancelRequest\032" +
+      "..com.ywt.gapi.third.taihe.PrePayCancelR" +
+      "esponse\022m\n\014revokeSettle\022-.com.ywt.gapi.t" +
+      "hird.taihe.RevokeSettleRequest\032..com.ywt" +
+      ".gapi.third.taihe.RevokeSettleResponseB\037" +
+      "\n\030com.ywt.gapi.third.taiheP\001\210\001\001b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -2426,7 +2459,7 @@ public final class Taihe {
     internal_static_com_ywt_gapi_third_taihe_PreSettleRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_third_taihe_PreSettleRequest_descriptor,
-        new java.lang.String[] { "InvPrtDr", "CardNo", "PsnName", "AuthCode", "OpenId", "HospitalId", "MpType", "AliPayAuthNo", });
+        new java.lang.String[] { "InvPrtDr", "CardNo", "PsnName", "AuthCode", "OpenId", "HospitalId", "MpType", "AliPayAuthNo", "WxPayAuthNo", "AcctUsedFlag", });
     internal_static_com_ywt_gapi_third_taihe_PreSettleResponse_descriptor =
       getDescriptor().getMessageTypes().get(143);
     internal_static_com_ywt_gapi_third_taihe_PreSettleResponse_fieldAccessorTable = new
@@ -2450,13 +2483,37 @@ public final class Taihe {
     internal_static_com_ywt_gapi_third_taihe_PayConfirmRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_third_taihe_PayConfirmRequest_descriptor,
-        new java.lang.String[] { "HospitalId", "InsuDivId", "OwnPayPMDr", "OwnPayAmt", "PayAuthNo", });
+        new java.lang.String[] { "HospitalId", "InsuDivId", "OwnPayPMDr", "OwnPayAmt", "PayAuthNo", "MpType", });
     internal_static_com_ywt_gapi_third_taihe_PayConfirmResponse_descriptor =
       getDescriptor().getMessageTypes().get(147);
     internal_static_com_ywt_gapi_third_taihe_PayConfirmResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_third_taihe_PayConfirmResponse_descriptor,
         new java.lang.String[] { "Code", "Info", "Data", });
+    internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_descriptor =
+      getDescriptor().getMessageTypes().get(148);
+    internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_com_ywt_gapi_third_taihe_RevokeSettleRequest_descriptor,
+        new java.lang.String[] { "HospitalId", "InsuDivId", });
+    internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_descriptor =
+      getDescriptor().getMessageTypes().get(149);
+    internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_com_ywt_gapi_third_taihe_RevokeSettleResponse_descriptor,
+        new java.lang.String[] { "Code", "Info", });
+    internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_descriptor =
+      getDescriptor().getMessageTypes().get(150);
+    internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_com_ywt_gapi_third_taihe_PrePayCancelRequest_descriptor,
+        new java.lang.String[] { "HospitalId", "HisOrderNo", "HisPatientId", });
+    internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_descriptor =
+      getDescriptor().getMessageTypes().get(151);
+    internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_com_ywt_gapi_third_taihe_PrePayCancelResponse_descriptor,
+        new java.lang.String[] { "Code", "Info", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -711,6 +711,30 @@ public  abstract class TaiheService
         com.ywt.gapi.third.taihe.PayConfirmRequest request,
         com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.PayConfirmResponse> done);
 
+    /**
+     * <pre>
+     * 预结算撤销
+     * </pre>
+     *
+     * <code>rpc prePayCancel(.com.ywt.gapi.third.taihe.PrePayCancelRequest) returns (.com.ywt.gapi.third.taihe.PrePayCancelResponse);</code>
+     */
+    public abstract void prePayCancel(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.PrePayCancelRequest request,
+        com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.PrePayCancelResponse> done);
+
+    /**
+     * <pre>
+     * 医保预结算撤销
+     * </pre>
+     *
+     * <code>rpc revokeSettle(.com.ywt.gapi.third.taihe.RevokeSettleRequest) returns (.com.ywt.gapi.third.taihe.RevokeSettleResponse);</code>
+     */
+    public abstract void revokeSettle(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.RevokeSettleRequest request,
+        com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.RevokeSettleResponse> done);
+
   }
 
   public static com.google.protobuf.Service newReflectiveService(
@@ -1180,6 +1204,22 @@ public  abstract class TaiheService
         impl.payConfirm(controller, request, done);
       }
 
+      @java.lang.Override
+      public  void prePayCancel(
+          com.google.protobuf.RpcController controller,
+          com.ywt.gapi.third.taihe.PrePayCancelRequest request,
+          com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.PrePayCancelResponse> done) {
+        impl.prePayCancel(controller, request, done);
+      }
+
+      @java.lang.Override
+      public  void revokeSettle(
+          com.google.protobuf.RpcController controller,
+          com.ywt.gapi.third.taihe.RevokeSettleRequest request,
+          com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.RevokeSettleResponse> done) {
+        impl.revokeSettle(controller, request, done);
+      }
+
     };
   }
 
@@ -1318,6 +1358,10 @@ public  abstract class TaiheService
             return impl.getMedInsTypeByOrderInsType(controller, (com.ywt.gapi.third.taihe.GetMedInsTypeByOrderInsTypeRequest)request);
           case 57:
             return impl.payConfirm(controller, (com.ywt.gapi.third.taihe.PayConfirmRequest)request);
+          case 58:
+            return impl.prePayCancel(controller, (com.ywt.gapi.third.taihe.PrePayCancelRequest)request);
+          case 59:
+            return impl.revokeSettle(controller, (com.ywt.gapi.third.taihe.RevokeSettleRequest)request);
           default:
             throw new java.lang.AssertionError("Can't get here.");
         }
@@ -1448,6 +1492,10 @@ public  abstract class TaiheService
             return com.ywt.gapi.third.taihe.GetMedInsTypeByOrderInsTypeRequest.getDefaultInstance();
           case 57:
             return com.ywt.gapi.third.taihe.PayConfirmRequest.getDefaultInstance();
+          case 58:
+            return com.ywt.gapi.third.taihe.PrePayCancelRequest.getDefaultInstance();
+          case 59:
+            return com.ywt.gapi.third.taihe.RevokeSettleRequest.getDefaultInstance();
           default:
             throw new java.lang.AssertionError("Can't get here.");
         }
@@ -1578,6 +1626,10 @@ public  abstract class TaiheService
             return com.ywt.gapi.third.taihe.GetMedInsTypeByOrderInsTypeResponse.getDefaultInstance();
           case 57:
             return com.ywt.gapi.third.taihe.PayConfirmResponse.getDefaultInstance();
+          case 58:
+            return com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance();
+          case 59:
+            return com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance();
           default:
             throw new java.lang.AssertionError("Can't get here.");
         }
@@ -2282,6 +2334,30 @@ public  abstract class TaiheService
       com.ywt.gapi.third.taihe.PayConfirmRequest request,
       com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.PayConfirmResponse> done);
 
+  /**
+   * <pre>
+   * 预结算撤销
+   * </pre>
+   *
+   * <code>rpc prePayCancel(.com.ywt.gapi.third.taihe.PrePayCancelRequest) returns (.com.ywt.gapi.third.taihe.PrePayCancelResponse);</code>
+   */
+  public abstract void prePayCancel(
+      com.google.protobuf.RpcController controller,
+      com.ywt.gapi.third.taihe.PrePayCancelRequest request,
+      com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.PrePayCancelResponse> done);
+
+  /**
+   * <pre>
+   * 医保预结算撤销
+   * </pre>
+   *
+   * <code>rpc revokeSettle(.com.ywt.gapi.third.taihe.RevokeSettleRequest) returns (.com.ywt.gapi.third.taihe.RevokeSettleResponse);</code>
+   */
+  public abstract void revokeSettle(
+      com.google.protobuf.RpcController controller,
+      com.ywt.gapi.third.taihe.RevokeSettleRequest request,
+      com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.RevokeSettleResponse> done);
+
   public static final
       com.google.protobuf.Descriptors.ServiceDescriptor
       getDescriptor() {
@@ -2594,6 +2670,16 @@ public  abstract class TaiheService
           com.google.protobuf.RpcUtil.<com.ywt.gapi.third.taihe.PayConfirmResponse>specializeCallback(
             done));
         return;
+      case 58:
+        this.prePayCancel(controller, (com.ywt.gapi.third.taihe.PrePayCancelRequest)request,
+          com.google.protobuf.RpcUtil.<com.ywt.gapi.third.taihe.PrePayCancelResponse>specializeCallback(
+            done));
+        return;
+      case 59:
+        this.revokeSettle(controller, (com.ywt.gapi.third.taihe.RevokeSettleRequest)request,
+          com.google.protobuf.RpcUtil.<com.ywt.gapi.third.taihe.RevokeSettleResponse>specializeCallback(
+            done));
+        return;
       default:
         throw new java.lang.AssertionError("Can't get here.");
     }
@@ -2724,6 +2810,10 @@ public  abstract class TaiheService
         return com.ywt.gapi.third.taihe.GetMedInsTypeByOrderInsTypeRequest.getDefaultInstance();
       case 57:
         return com.ywt.gapi.third.taihe.PayConfirmRequest.getDefaultInstance();
+      case 58:
+        return com.ywt.gapi.third.taihe.PrePayCancelRequest.getDefaultInstance();
+      case 59:
+        return com.ywt.gapi.third.taihe.RevokeSettleRequest.getDefaultInstance();
       default:
         throw new java.lang.AssertionError("Can't get here.");
     }
@@ -2854,6 +2944,10 @@ public  abstract class TaiheService
         return com.ywt.gapi.third.taihe.GetMedInsTypeByOrderInsTypeResponse.getDefaultInstance();
       case 57:
         return com.ywt.gapi.third.taihe.PayConfirmResponse.getDefaultInstance();
+      case 58:
+        return com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance();
+      case 59:
+        return com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance();
       default:
         throw new java.lang.AssertionError("Can't get here.");
     }
@@ -3744,6 +3838,36 @@ public  abstract class TaiheService
           com.ywt.gapi.third.taihe.PayConfirmResponse.class,
           com.ywt.gapi.third.taihe.PayConfirmResponse.getDefaultInstance()));
     }
+
+    public  void prePayCancel(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.PrePayCancelRequest request,
+        com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.PrePayCancelResponse> done) {
+      channel.callMethod(
+        getDescriptor().getMethods().get(58),
+        controller,
+        request,
+        com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance(),
+        com.google.protobuf.RpcUtil.generalizeCallback(
+          done,
+          com.ywt.gapi.third.taihe.PrePayCancelResponse.class,
+          com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance()));
+    }
+
+    public  void revokeSettle(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.RevokeSettleRequest request,
+        com.google.protobuf.RpcCallback<com.ywt.gapi.third.taihe.RevokeSettleResponse> done) {
+      channel.callMethod(
+        getDescriptor().getMethods().get(59),
+        controller,
+        request,
+        com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance(),
+        com.google.protobuf.RpcUtil.generalizeCallback(
+          done,
+          com.ywt.gapi.third.taihe.RevokeSettleResponse.class,
+          com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance()));
+    }
   }
 
   public static BlockingInterface newBlockingStub(
@@ -4041,6 +4165,16 @@ public  abstract class TaiheService
         com.google.protobuf.RpcController controller,
         com.ywt.gapi.third.taihe.PayConfirmRequest request)
         throws com.google.protobuf.ServiceException;
+
+    public com.ywt.gapi.third.taihe.PrePayCancelResponse prePayCancel(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.PrePayCancelRequest request)
+        throws com.google.protobuf.ServiceException;
+
+    public com.ywt.gapi.third.taihe.RevokeSettleResponse revokeSettle(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.RevokeSettleRequest request)
+        throws com.google.protobuf.ServiceException;
   }
 
   private static final class BlockingStub implements BlockingInterface {
@@ -4745,6 +4879,30 @@ public  abstract class TaiheService
         com.ywt.gapi.third.taihe.PayConfirmResponse.getDefaultInstance());
     }
 
+
+    public com.ywt.gapi.third.taihe.PrePayCancelResponse prePayCancel(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.PrePayCancelRequest request)
+        throws com.google.protobuf.ServiceException {
+      return (com.ywt.gapi.third.taihe.PrePayCancelResponse) channel.callBlockingMethod(
+        getDescriptor().getMethods().get(58),
+        controller,
+        request,
+        com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance());
+    }
+
+
+    public com.ywt.gapi.third.taihe.RevokeSettleResponse revokeSettle(
+        com.google.protobuf.RpcController controller,
+        com.ywt.gapi.third.taihe.RevokeSettleRequest request)
+        throws com.google.protobuf.ServiceException {
+      return (com.ywt.gapi.third.taihe.RevokeSettleResponse) channel.callBlockingMethod(
+        getDescriptor().getMethods().get(59),
+        controller,
+        request,
+        com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance());
+    }
+
   }
 
   // @@protoc_insertion_point(class_scope:com.ywt.gapi.third.taihe.TaiheService)

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

@@ -784,6 +784,32 @@ public final class TaiheServiceGrpc {
               com.ywt.gapi.third.taihe.PayConfirmResponse.getDefaultInstance()))
           .setSchemaDescriptor(new TaiheServiceMethodDescriptorSupplier("payConfirm"))
           .build();
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static final io.grpc.MethodDescriptor<com.ywt.gapi.third.taihe.PrePayCancelRequest,
+      com.ywt.gapi.third.taihe.PrePayCancelResponse> METHOD_PRE_PAY_CANCEL =
+      io.grpc.MethodDescriptor.<com.ywt.gapi.third.taihe.PrePayCancelRequest, com.ywt.gapi.third.taihe.PrePayCancelResponse>newBuilder()
+          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(generateFullMethodName(
+              "com.ywt.gapi.third.taihe.TaiheService", "prePayCancel"))
+          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+              com.ywt.gapi.third.taihe.PrePayCancelRequest.getDefaultInstance()))
+          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+              com.ywt.gapi.third.taihe.PrePayCancelResponse.getDefaultInstance()))
+          .setSchemaDescriptor(new TaiheServiceMethodDescriptorSupplier("prePayCancel"))
+          .build();
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static final io.grpc.MethodDescriptor<com.ywt.gapi.third.taihe.RevokeSettleRequest,
+      com.ywt.gapi.third.taihe.RevokeSettleResponse> METHOD_REVOKE_SETTLE =
+      io.grpc.MethodDescriptor.<com.ywt.gapi.third.taihe.RevokeSettleRequest, com.ywt.gapi.third.taihe.RevokeSettleResponse>newBuilder()
+          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(generateFullMethodName(
+              "com.ywt.gapi.third.taihe.TaiheService", "revokeSettle"))
+          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+              com.ywt.gapi.third.taihe.RevokeSettleRequest.getDefaultInstance()))
+          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+              com.ywt.gapi.third.taihe.RevokeSettleResponse.getDefaultInstance()))
+          .setSchemaDescriptor(new TaiheServiceMethodDescriptorSupplier("revokeSettle"))
+          .build();
 
   /**
    * Creates a new async stub that supports all call types for the service
@@ -1395,6 +1421,26 @@ public final class TaiheServiceGrpc {
       asyncUnimplementedUnaryCall(METHOD_PAY_CONFIRM, responseObserver);
     }
 
+    /**
+     * <pre>
+     * 预结算撤销
+     * </pre>
+     */
+    public void prePayCancel(com.ywt.gapi.third.taihe.PrePayCancelRequest request,
+        io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.PrePayCancelResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(METHOD_PRE_PAY_CANCEL, responseObserver);
+    }
+
+    /**
+     * <pre>
+     * 医保预结算撤销
+     * </pre>
+     */
+    public void revokeSettle(com.ywt.gapi.third.taihe.RevokeSettleRequest request,
+        io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.RevokeSettleResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(METHOD_REVOKE_SETTLE, responseObserver);
+    }
+
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
@@ -1803,6 +1849,20 @@ public final class TaiheServiceGrpc {
                 com.ywt.gapi.third.taihe.PayConfirmRequest,
                 com.ywt.gapi.third.taihe.PayConfirmResponse>(
                   this, METHODID_PAY_CONFIRM)))
+          .addMethod(
+            METHOD_PRE_PAY_CANCEL,
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.ywt.gapi.third.taihe.PrePayCancelRequest,
+                com.ywt.gapi.third.taihe.PrePayCancelResponse>(
+                  this, METHODID_PRE_PAY_CANCEL)))
+          .addMethod(
+            METHOD_REVOKE_SETTLE,
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.ywt.gapi.third.taihe.RevokeSettleRequest,
+                com.ywt.gapi.third.taihe.RevokeSettleResponse>(
+                  this, METHODID_REVOKE_SETTLE)))
           .build();
     }
   }
@@ -2465,6 +2525,28 @@ public final class TaiheServiceGrpc {
       asyncUnaryCall(
           getChannel().newCall(METHOD_PAY_CONFIRM, getCallOptions()), request, responseObserver);
     }
+
+    /**
+     * <pre>
+     * 预结算撤销
+     * </pre>
+     */
+    public void prePayCancel(com.ywt.gapi.third.taihe.PrePayCancelRequest request,
+        io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.PrePayCancelResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(METHOD_PRE_PAY_CANCEL, getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * <pre>
+     * 医保预结算撤销
+     * </pre>
+     */
+    public void revokeSettle(com.ywt.gapi.third.taihe.RevokeSettleRequest request,
+        io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.RevokeSettleResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(METHOD_REVOKE_SETTLE, getCallOptions()), request, responseObserver);
+    }
   }
 
   /**
@@ -3067,6 +3149,26 @@ public final class TaiheServiceGrpc {
       return blockingUnaryCall(
           getChannel(), METHOD_PAY_CONFIRM, getCallOptions(), request);
     }
+
+    /**
+     * <pre>
+     * 预结算撤销
+     * </pre>
+     */
+    public com.ywt.gapi.third.taihe.PrePayCancelResponse prePayCancel(com.ywt.gapi.third.taihe.PrePayCancelRequest request) {
+      return blockingUnaryCall(
+          getChannel(), METHOD_PRE_PAY_CANCEL, getCallOptions(), request);
+    }
+
+    /**
+     * <pre>
+     * 医保预结算撤销
+     * </pre>
+     */
+    public com.ywt.gapi.third.taihe.RevokeSettleResponse revokeSettle(com.ywt.gapi.third.taihe.RevokeSettleRequest request) {
+      return blockingUnaryCall(
+          getChannel(), METHOD_REVOKE_SETTLE, getCallOptions(), request);
+    }
   }
 
   /**
@@ -3727,6 +3829,28 @@ public final class TaiheServiceGrpc {
       return futureUnaryCall(
           getChannel().newCall(METHOD_PAY_CONFIRM, getCallOptions()), request);
     }
+
+    /**
+     * <pre>
+     * 预结算撤销
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.ywt.gapi.third.taihe.PrePayCancelResponse> prePayCancel(
+        com.ywt.gapi.third.taihe.PrePayCancelRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(METHOD_PRE_PAY_CANCEL, getCallOptions()), request);
+    }
+
+    /**
+     * <pre>
+     * 医保预结算撤销
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.ywt.gapi.third.taihe.RevokeSettleResponse> revokeSettle(
+        com.ywt.gapi.third.taihe.RevokeSettleRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(METHOD_REVOKE_SETTLE, getCallOptions()), request);
+    }
   }
 
   private static final int METHODID_GET_PATIENT_INFO = 0;
@@ -3787,6 +3911,8 @@ public final class TaiheServiceGrpc {
   private static final int METHODID_PRE_SETTLE = 55;
   private static final int METHODID_GET_MED_INS_TYPE_BY_ORDER_INS_TYPE = 56;
   private static final int METHODID_PAY_CONFIRM = 57;
+  private static final int METHODID_PRE_PAY_CANCEL = 58;
+  private static final int METHODID_REVOKE_SETTLE = 59;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -4037,6 +4163,14 @@ public final class TaiheServiceGrpc {
           serviceImpl.payConfirm((com.ywt.gapi.third.taihe.PayConfirmRequest) request,
               (io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.PayConfirmResponse>) responseObserver);
           break;
+        case METHODID_PRE_PAY_CANCEL:
+          serviceImpl.prePayCancel((com.ywt.gapi.third.taihe.PrePayCancelRequest) request,
+              (io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.PrePayCancelResponse>) responseObserver);
+          break;
+        case METHODID_REVOKE_SETTLE:
+          serviceImpl.revokeSettle((com.ywt.gapi.third.taihe.RevokeSettleRequest) request,
+              (io.grpc.stub.StreamObserver<com.ywt.gapi.third.taihe.RevokeSettleResponse>) responseObserver);
+          break;
         default:
           throw new AssertionError();
       }
@@ -4156,6 +4290,8 @@ public final class TaiheServiceGrpc {
               .addMethod(METHOD_PRE_SETTLE)
               .addMethod(METHOD_GET_MED_INS_TYPE_BY_ORDER_INS_TYPE)
               .addMethod(METHOD_PAY_CONFIRM)
+              .addMethod(METHOD_PRE_PAY_CANCEL)
+              .addMethod(METHOD_REVOKE_SETTLE)
               .build();
         }
       }