Переглянути джерело

fix: 建档支持保存关系

Walker 2 роки тому
батько
коміт
ac14e614d8
36 змінених файлів з 796 додано та 360 видалено
  1. 3 2
      onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvMedicCardServiceImpl.java
  2. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CalAdditionalFeeRequest.java
  3. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CalAdditionalFeeResponse.java
  4. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CancelRegisteredRequest.java
  5. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CancelRegisteredResponse.java
  6. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CommonOrder.java
  7. 94 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateMedicalCardRequest.java
  8. 9 0
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateMedicalCardRequestOrBuilder.java
  9. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateMedicalCardResponse.java
  10. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateRegisteredRequest.java
  11. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/CreateRegisteredResponse.java
  12. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetCommonOrderListRequest.java
  13. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetCommonOrderListResponse.java
  14. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetHisPatientIdByUserIdAndMobileRequest.java
  15. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetHisPatientIdByUserIdAndMobileResponse.java
  16. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetLatestRegOrderRequest.java
  17. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetLatestRegOrderResponse.java
  18. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetOfflineConsultInfoByDoctorIdRequest.java
  19. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetOfflineConsultInfoByDoctorIdResponse.java
  20. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetQueueListRequest.java
  21. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetQueueListResponse.java
  22. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetRegisteredListRequest.java
  23. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/GetRegisteredListResponse.java
  24. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/PayCallbackRequest.java
  25. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/PayCallbackResponse.java
  26. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RefundCallbackRequest.java
  27. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RefundCallbackResponse.java
  28. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisterRequest.java
  29. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisterResponse.java
  30. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisterWithoutMedicalCardRequest.java
  31. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisterWithoutMedicalCardResponse.java
  32. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/RegisteredOrder.java
  33. 69 69
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/TaiheRegister.java
  34. 1 1
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/TaiheRegisterServiceGrpc.java
  35. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/TakeRequest.java
  36. 20 9
      onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/TakeResponse.java

+ 3 - 2
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvMedicCardServiceImpl.java

@@ -446,6 +446,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
                 .setAddress(address)
                 .setHospitalId(hospitalId)
                 .setUserId(userId)
+                .setRelationship(RelationshipEnum.getByName(relationShip).getValue())
                 .build());
         System.out.println(TextFormat.printToUnicodeString(response));
         if (response.getCode() != ResultCode.SUCCEED_VALUE) throw new AppMessageException(response.getInfo());
@@ -463,14 +464,14 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
         String mobile = Checker.getStringValue(request.getPhoneNumber());
         String relationship = Checker.getStringValue(request.getRelationShip());
         int relInt = 1;
-        if (Checker.isNone(request.getRelationShip())){
+        if (Checker.isNone(request.getRelationShip())) {
             relInt = 0;
         }
         Result result = userServiceBlockingStub.updateMedicalCardRequest(UpdateMedicalCardRequest.newBuilder()
                 .setCardId(cardId)
                 .setUserId(ContextHelper.getCurrentUserIdWrapped())
                 .setMobile(mobile)
-                .setRelationship(relInt == 0 ? 0:RelationshipEnum.getByName(relationship).getValue())
+                .setRelationship(relInt == 0 ? 0 : RelationshipEnum.getByName(relationship).getValue())
                 .build());
         if (result.getCode() != ResultCode.SUCCEED) throw new AppMessageException(result.getInfo());
         UpdatePatientResponse response = new UpdatePatientResponse();

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

@@ -10,6 +10,7 @@ public  final class CalAdditionalFeeRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CalAdditionalFeeRequest)
     CalAdditionalFeeRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CalAdditionalFeeRequest.newBuilder() to construct.
   private CalAdditionalFeeRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,14 +25,19 @@ public  final class CalAdditionalFeeRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CalAdditionalFeeRequest(
       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) {
@@ -41,7 +47,8 @@ public  final class CalAdditionalFeeRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -74,6 +81,7 @@ public  final class CalAdditionalFeeRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -149,6 +157,7 @@ public  final class CalAdditionalFeeRequest extends
     if (userId_ != 0) {
       output.writeInt32(4, userId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -172,11 +181,11 @@ public  final class CalAdditionalFeeRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(4, userId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -196,6 +205,7 @@ public  final class CalAdditionalFeeRequest extends
         == other.getRegisteredFee());
     result = result && (getUserId()
         == other.getUserId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -386,7 +396,7 @@ public  final class CalAdditionalFeeRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -399,12 +409,12 @@ public  final class CalAdditionalFeeRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -430,6 +440,7 @@ public  final class CalAdditionalFeeRequest extends
       if (other.getUserId() != 0) {
         setUserId(other.getUserId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -561,12 +572,12 @@ public  final class CalAdditionalFeeRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -589,7 +600,7 @@ public  final class CalAdditionalFeeRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CalAdditionalFeeRequest(input, extensionRegistry);
+      return new CalAdditionalFeeRequest(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class CalAdditionalFeeResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CalAdditionalFeeResponse)
     CalAdditionalFeeResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CalAdditionalFeeResponse.newBuilder() to construct.
   private CalAdditionalFeeResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,14 +25,19 @@ public  final class CalAdditionalFeeResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CalAdditionalFeeResponse(
       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) {
@@ -41,7 +47,8 @@ public  final class CalAdditionalFeeResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -75,6 +82,7 @@ public  final class CalAdditionalFeeResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -175,6 +183,7 @@ public  final class CalAdditionalFeeResponse extends
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, info_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -197,11 +206,11 @@ public  final class CalAdditionalFeeResponse extends
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, info_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -221,6 +230,7 @@ public  final class CalAdditionalFeeResponse extends
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -411,7 +421,7 @@ public  final class CalAdditionalFeeResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -424,12 +434,12 @@ public  final class CalAdditionalFeeResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -456,6 +466,7 @@ public  final class CalAdditionalFeeResponse extends
         info_ = other.info_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -630,12 +641,12 @@ public  final class CalAdditionalFeeResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -658,7 +669,7 @@ public  final class CalAdditionalFeeResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CalAdditionalFeeResponse(input, extensionRegistry);
+      return new CalAdditionalFeeResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class CancelRegisteredRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CancelRegisteredRequest)
     CancelRegisteredRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CancelRegisteredRequest.newBuilder() to construct.
   private CancelRegisteredRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,14 +28,19 @@ public  final class CancelRegisteredRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CancelRegisteredRequest(
       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) {
@@ -44,7 +50,8 @@ public  final class CancelRegisteredRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -72,6 +79,7 @@ public  final class CancelRegisteredRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -135,6 +143,7 @@ public  final class CancelRegisteredRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(3, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -154,11 +163,11 @@ public  final class CancelRegisteredRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(3, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -176,6 +185,7 @@ public  final class CancelRegisteredRequest extends
         == other.getUserId());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -365,7 +375,7 @@ public  final class CancelRegisteredRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +388,12 @@ public  final class CancelRegisteredRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -406,6 +416,7 @@ public  final class CancelRegisteredRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -511,12 +522,12 @@ public  final class CancelRegisteredRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -539,7 +550,7 @@ public  final class CancelRegisteredRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CancelRegisteredRequest(input, extensionRegistry);
+      return new CancelRegisteredRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class CancelRegisteredResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CancelRegisteredResponse)
     CancelRegisteredResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CancelRegisteredResponse.newBuilder() to construct.
   private CancelRegisteredResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,14 +28,19 @@ public  final class CancelRegisteredResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CancelRegisteredResponse(
       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) {
@@ -44,7 +50,8 @@ public  final class CancelRegisteredResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -73,6 +80,7 @@ public  final class CancelRegisteredResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -165,6 +173,7 @@ public  final class CancelRegisteredResponse extends
     if (status_ != 0) {
       output.writeInt32(3, status_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -183,11 +192,11 @@ public  final class CancelRegisteredResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(3, status_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -205,6 +214,7 @@ public  final class CancelRegisteredResponse extends
         .equals(other.getMsg());
     result = result && (getStatus()
         == other.getStatus());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -394,7 +404,7 @@ public  final class CancelRegisteredResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -407,12 +417,12 @@ public  final class CancelRegisteredResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -436,6 +446,7 @@ public  final class CancelRegisteredResponse extends
       if (other.getStatus() != 0) {
         setStatus(other.getStatus());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -596,12 +607,12 @@ public  final class CancelRegisteredResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -624,7 +635,7 @@ public  final class CancelRegisteredResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CancelRegisteredResponse(input, extensionRegistry);
+      return new CancelRegisteredResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class CommonOrder extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CommonOrder)
     CommonOrderOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CommonOrder.newBuilder() to construct.
   private CommonOrder(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -45,14 +46,19 @@ public  final class CommonOrder extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CommonOrder(
       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) {
@@ -62,7 +68,8 @@ public  final class CommonOrder extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -194,6 +201,7 @@ public  final class CommonOrder extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -839,6 +847,7 @@ public  final class CommonOrder extends
     if (!getHisAdmAddrBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 21, hisAdmAddr_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -916,11 +925,11 @@ public  final class CommonOrder extends
     if (!getHisAdmAddrBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(21, hisAdmAddr_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -974,6 +983,7 @@ public  final class CommonOrder extends
         == other.getRegisteredType());
     result = result && getHisAdmAddr()
         .equals(other.getHisAdmAddr());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1254,7 +1264,7 @@ public  final class CommonOrder extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1267,12 +1277,12 @@ public  final class CommonOrder extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1363,6 +1373,7 @@ public  final class CommonOrder extends
         hisAdmAddr_ = other.hisAdmAddr_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2582,12 +2593,12 @@ public  final class CommonOrder extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -2610,7 +2621,7 @@ public  final class CommonOrder extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CommonOrder(input, extensionRegistry);
+      return new CommonOrder(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class CreateMedicalCardRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CreateMedicalCardRequest)
     CreateMedicalCardRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CreateMedicalCardRequest.newBuilder() to construct.
   private CreateMedicalCardRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -23,19 +24,25 @@ public  final class CreateMedicalCardRequest extends
     isInsu_ = "";
     hospitalId_ = 0;
     userId_ = 0;
+    relationship_ = 0;
   }
 
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CreateMedicalCardRequest(
       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) {
@@ -45,7 +52,8 @@ public  final class CreateMedicalCardRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -96,6 +104,11 @@ public  final class CreateMedicalCardRequest extends
             userId_ = input.readInt32();
             break;
           }
+          case 72: {
+
+            relationship_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,6 +117,7 @@ public  final class CreateMedicalCardRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -389,6 +403,19 @@ public  final class CreateMedicalCardRequest extends
     return userId_;
   }
 
+  public static final int RELATIONSHIP_FIELD_NUMBER = 9;
+  private int relationship_;
+  /**
+   * <pre>
+   * 关系:1-本人,6-父母,7-子女,5-其他
+   * </pre>
+   *
+   * <code>int32 relationship = 9;</code>
+   */
+  public int getRelationship() {
+    return relationship_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -425,6 +452,10 @@ public  final class CreateMedicalCardRequest extends
     if (userId_ != 0) {
       output.writeInt32(8, userId_);
     }
+    if (relationship_ != 0) {
+      output.writeInt32(9, relationship_);
+    }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -458,11 +489,15 @@ public  final class CreateMedicalCardRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(8, userId_);
     }
+    if (relationship_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(9, relationship_);
+    }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -490,6 +525,9 @@ public  final class CreateMedicalCardRequest extends
         == other.getHospitalId());
     result = result && (getUserId()
         == other.getUserId());
+    result = result && (getRelationship()
+        == other.getRelationship());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -516,6 +554,8 @@ public  final class CreateMedicalCardRequest extends
     hash = (53 * hash) + getHospitalId();
     hash = (37 * hash) + USERID_FIELD_NUMBER;
     hash = (53 * hash) + getUserId();
+    hash = (37 * hash) + RELATIONSHIP_FIELD_NUMBER;
+    hash = (53 * hash) + getRelationship();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -661,6 +701,8 @@ public  final class CreateMedicalCardRequest extends
 
       userId_ = 0;
 
+      relationship_ = 0;
+
       return this;
     }
 
@@ -691,6 +733,7 @@ public  final class CreateMedicalCardRequest extends
       result.isInsu_ = isInsu_;
       result.hospitalId_ = hospitalId_;
       result.userId_ = userId_;
+      result.relationship_ = relationship_;
       onBuilt();
       return result;
     }
@@ -700,7 +743,7 @@ public  final class CreateMedicalCardRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -713,12 +756,12 @@ public  final class CreateMedicalCardRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -762,6 +805,10 @@ public  final class CreateMedicalCardRequest extends
       if (other.getUserId() != 0) {
         setUserId(other.getUserId());
       }
+      if (other.getRelationship() != 0) {
+        setRelationship(other.getRelationship());
+      }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1373,14 +1420,52 @@ public  final class CreateMedicalCardRequest extends
       onChanged();
       return this;
     }
+
+    private int relationship_ ;
+    /**
+     * <pre>
+     * 关系:1-本人,6-父母,7-子女,5-其他
+     * </pre>
+     *
+     * <code>int32 relationship = 9;</code>
+     */
+    public int getRelationship() {
+      return relationship_;
+    }
+    /**
+     * <pre>
+     * 关系:1-本人,6-父母,7-子女,5-其他
+     * </pre>
+     *
+     * <code>int32 relationship = 9;</code>
+     */
+    public Builder setRelationship(int value) {
+      
+      relationship_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 关系:1-本人,6-父母,7-子女,5-其他
+     * </pre>
+     *
+     * <code>int32 relationship = 9;</code>
+     */
+    public Builder clearRelationship() {
+      
+      relationship_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1403,7 +1488,7 @@ public  final class CreateMedicalCardRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CreateMedicalCardRequest(input, extensionRegistry);
+      return new CreateMedicalCardRequest(input, extensionRegistry);
     }
   };
 

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

@@ -124,4 +124,13 @@ public interface CreateMedicalCardRequestOrBuilder extends
    * <code>int32 userId = 8;</code>
    */
   int getUserId();
+
+  /**
+   * <pre>
+   * 关系:1-本人,6-父母,7-子女,5-其他
+   * </pre>
+   *
+   * <code>int32 relationship = 9;</code>
+   */
+  int getRelationship();
 }

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

@@ -10,6 +10,7 @@ public  final class CreateMedicalCardResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CreateMedicalCardResponse)
     CreateMedicalCardResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CreateMedicalCardResponse.newBuilder() to construct.
   private CreateMedicalCardResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,14 +25,19 @@ public  final class CreateMedicalCardResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CreateMedicalCardResponse(
       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) {
@@ -41,7 +47,8 @@ public  final class CreateMedicalCardResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -76,6 +83,7 @@ public  final class CreateMedicalCardResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -209,6 +217,7 @@ public  final class CreateMedicalCardResponse extends
     if (!getMedicalCardNoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, medicalCardNo_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -230,11 +239,11 @@ public  final class CreateMedicalCardResponse extends
     if (!getMedicalCardNoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, medicalCardNo_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -254,6 +263,7 @@ public  final class CreateMedicalCardResponse extends
         == other.getMedicalCardId());
     result = result && getMedicalCardNo()
         .equals(other.getMedicalCardNo());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -444,7 +454,7 @@ public  final class CreateMedicalCardResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -457,12 +467,12 @@ public  final class CreateMedicalCardResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -490,6 +500,7 @@ public  final class CreateMedicalCardResponse extends
         medicalCardNo_ = other.medicalCardNo_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -727,12 +738,12 @@ public  final class CreateMedicalCardResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -755,7 +766,7 @@ public  final class CreateMedicalCardResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CreateMedicalCardResponse(input, extensionRegistry);
+      return new CreateMedicalCardResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class CreateRegisteredRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CreateRegisteredRequest)
     CreateRegisteredRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CreateRegisteredRequest.newBuilder() to construct.
   private CreateRegisteredRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -45,14 +46,19 @@ public  final class CreateRegisteredRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CreateRegisteredRequest(
       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) {
@@ -62,7 +68,8 @@ public  final class CreateRegisteredRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -190,6 +197,7 @@ public  final class CreateRegisteredRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -823,6 +831,7 @@ public  final class CreateRegisteredRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(21, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -904,11 +913,11 @@ public  final class CreateRegisteredRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(21, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -962,6 +971,7 @@ public  final class CreateRegisteredRequest extends
         .equals(other.getAvailableNumStr());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1242,7 +1252,7 @@ public  final class CreateRegisteredRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1255,12 +1265,12 @@ public  final class CreateRegisteredRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1347,6 +1357,7 @@ public  final class CreateRegisteredRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2630,12 +2641,12 @@ public  final class CreateRegisteredRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -2658,7 +2669,7 @@ public  final class CreateRegisteredRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CreateRegisteredRequest(input, extensionRegistry);
+      return new CreateRegisteredRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class CreateRegisteredResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.CreateRegisteredResponse)
     CreateRegisteredResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CreateRegisteredResponse.newBuilder() to construct.
   private CreateRegisteredResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -36,14 +37,19 @@ public  final class CreateRegisteredResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CreateRegisteredResponse(
       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) {
@@ -53,7 +59,8 @@ public  final class CreateRegisteredResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -131,6 +138,7 @@ public  final class CreateRegisteredResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -435,6 +443,7 @@ public  final class CreateRegisteredResponse extends
     if (regId_ != 0) {
       output.writeInt32(12, regId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -485,11 +494,11 @@ public  final class CreateRegisteredResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(12, regId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -525,6 +534,7 @@ public  final class CreateRegisteredResponse extends
         == other.getDoctorId());
     result = result && (getRegId()
         == other.getRegId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -759,7 +769,7 @@ public  final class CreateRegisteredResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -772,12 +782,12 @@ public  final class CreateRegisteredResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -832,6 +842,7 @@ public  final class CreateRegisteredResponse extends
       if (other.getRegId() != 0) {
         setRegId(other.getRegId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1410,12 +1421,12 @@ public  final class CreateRegisteredResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1438,7 +1449,7 @@ public  final class CreateRegisteredResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CreateRegisteredResponse(input, extensionRegistry);
+      return new CreateRegisteredResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class GetCommonOrderListRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetCommonOrderListRequest)
     GetCommonOrderListRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetCommonOrderListRequest.newBuilder() to construct.
   private GetCommonOrderListRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,14 +30,19 @@ public  final class GetCommonOrderListRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetCommonOrderListRequest(
       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) {
@@ -46,7 +52,8 @@ public  final class GetCommonOrderListRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -84,6 +91,7 @@ public  final class GetCommonOrderListRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -171,6 +179,7 @@ public  final class GetCommonOrderListRequest extends
     if (startDate_ != 0L) {
       output.writeInt64(5, startDate_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -198,11 +207,11 @@ public  final class GetCommonOrderListRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(5, startDate_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -224,6 +233,7 @@ public  final class GetCommonOrderListRequest extends
         == other.getPageSize());
     result = result && (getStartDate()
         == other.getStartDate());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -425,7 +435,7 @@ public  final class GetCommonOrderListRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -438,12 +448,12 @@ public  final class GetCommonOrderListRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -472,6 +482,7 @@ public  final class GetCommonOrderListRequest extends
       if (other.getStartDate() != 0L) {
         setStartDate(other.getStartDate());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -629,12 +640,12 @@ public  final class GetCommonOrderListRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -657,7 +668,7 @@ public  final class GetCommonOrderListRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetCommonOrderListRequest(input, extensionRegistry);
+      return new GetCommonOrderListRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class GetCommonOrderListResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetCommonOrderListResponse)
     GetCommonOrderListResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetCommonOrderListResponse.newBuilder() to construct.
   private GetCommonOrderListResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,14 +30,19 @@ public  final class GetCommonOrderListResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetCommonOrderListResponse(
       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) {
@@ -46,7 +52,8 @@ public  final class GetCommonOrderListResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -92,6 +99,7 @@ public  final class GetCommonOrderListResponse extends
       if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
         order_ = java.util.Collections.unmodifiableList(order_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -231,6 +239,7 @@ public  final class GetCommonOrderListResponse extends
     if (count_ != 0) {
       output.writeInt32(5, count_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -257,11 +266,11 @@ public  final class GetCommonOrderListResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(5, count_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -283,6 +292,7 @@ public  final class GetCommonOrderListResponse extends
         == other.getTotalPage());
     result = result && (getCount()
         == other.getCount());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -500,7 +510,7 @@ public  final class GetCommonOrderListResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -513,12 +523,12 @@ public  final class GetCommonOrderListResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -571,6 +581,7 @@ public  final class GetCommonOrderListResponse extends
       if (other.getCount() != 0) {
         setCount(other.getCount());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -986,12 +997,12 @@ public  final class GetCommonOrderListResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1014,7 +1025,7 @@ public  final class GetCommonOrderListResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetCommonOrderListResponse(input, extensionRegistry);
+      return new GetCommonOrderListResponse(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetHisPatientIdByUserIdAndMobileRequest)
     GetHisPatientIdByUserIdAndMobileRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetHisPatientIdByUserIdAndMobileRequest.newBuilder() to construct.
   private GetHisPatientIdByUserIdAndMobileRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,14 +28,19 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetHisPatientIdByUserIdAndMobileRequest(
       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) {
@@ -44,7 +50,8 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -97,6 +104,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -349,6 +357,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(7, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -379,11 +388,11 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(7, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -409,6 +418,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
         .equals(other.getName());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -614,7 +624,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -627,12 +637,12 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -672,6 +682,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1136,12 +1147,12 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1164,7 +1175,7 @@ public  final class GetHisPatientIdByUserIdAndMobileRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetHisPatientIdByUserIdAndMobileRequest(input, extensionRegistry);
+      return new GetHisPatientIdByUserIdAndMobileRequest(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetHisPatientIdByUserIdAndMobileResponse)
     GetHisPatientIdByUserIdAndMobileResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetHisPatientIdByUserIdAndMobileResponse.newBuilder() to construct.
   private GetHisPatientIdByUserIdAndMobileResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -23,14 +24,19 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetHisPatientIdByUserIdAndMobileResponse(
       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) {
@@ -40,7 +46,8 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -70,6 +77,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -183,6 +191,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, info_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -200,11 +209,11 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, info_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -222,6 +231,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -407,7 +417,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -420,12 +430,12 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -450,6 +460,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
         info_ = other.info_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -641,12 +652,12 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -669,7 +680,7 @@ public  final class GetHisPatientIdByUserIdAndMobileResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetHisPatientIdByUserIdAndMobileResponse(input, extensionRegistry);
+      return new GetHisPatientIdByUserIdAndMobileResponse(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class GetLatestRegOrderRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetLatestRegOrderRequest)
     GetLatestRegOrderRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetLatestRegOrderRequest.newBuilder() to construct.
   private GetLatestRegOrderRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -23,14 +24,19 @@ public  final class GetLatestRegOrderRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetLatestRegOrderRequest(
       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) {
@@ -40,7 +46,8 @@ public  final class GetLatestRegOrderRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -68,6 +75,7 @@ public  final class GetLatestRegOrderRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -131,6 +139,7 @@ public  final class GetLatestRegOrderRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(3, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -150,11 +159,11 @@ public  final class GetLatestRegOrderRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(3, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -172,6 +181,7 @@ public  final class GetLatestRegOrderRequest extends
         == other.getUserId());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -357,7 +367,7 @@ public  final class GetLatestRegOrderRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -370,12 +380,12 @@ public  final class GetLatestRegOrderRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -398,6 +408,7 @@ public  final class GetLatestRegOrderRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -503,12 +514,12 @@ public  final class GetLatestRegOrderRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -531,7 +542,7 @@ public  final class GetLatestRegOrderRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetLatestRegOrderRequest(input, extensionRegistry);
+      return new GetLatestRegOrderRequest(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class GetLatestRegOrderResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetLatestRegOrderResponse)
     GetLatestRegOrderResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetLatestRegOrderResponse.newBuilder() to construct.
   private GetLatestRegOrderResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -23,14 +24,19 @@ public  final class GetLatestRegOrderResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetLatestRegOrderResponse(
       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) {
@@ -40,7 +46,8 @@ public  final class GetLatestRegOrderResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -69,6 +76,7 @@ public  final class GetLatestRegOrderResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -157,6 +165,7 @@ public  final class GetLatestRegOrderResponse extends
     if (registerDate_ != 0L) {
       output.writeInt64(3, registerDate_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -175,11 +184,11 @@ public  final class GetLatestRegOrderResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(3, registerDate_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -197,6 +206,7 @@ public  final class GetLatestRegOrderResponse extends
         .equals(other.getInfo());
     result = result && (getRegisterDate()
         == other.getRegisterDate());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -383,7 +393,7 @@ public  final class GetLatestRegOrderResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -396,12 +406,12 @@ public  final class GetLatestRegOrderResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -425,6 +435,7 @@ public  final class GetLatestRegOrderResponse extends
       if (other.getRegisterDate() != 0L) {
         setRegisterDate(other.getRegisterDate());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -573,12 +584,12 @@ public  final class GetLatestRegOrderResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -601,7 +612,7 @@ public  final class GetLatestRegOrderResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetLatestRegOrderResponse(input, extensionRegistry);
+      return new GetLatestRegOrderResponse(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetOfflineConsultInfoByDoctorIdRequest)
     GetOfflineConsultInfoByDoctorIdRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetOfflineConsultInfoByDoctorIdRequest.newBuilder() to construct.
   private GetOfflineConsultInfoByDoctorIdRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -22,14 +23,19 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetOfflineConsultInfoByDoctorIdRequest(
       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) {
@@ -39,7 +45,8 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -62,6 +69,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -113,6 +121,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(2, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -128,11 +137,11 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(2, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -148,6 +157,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
         == other.getDoctorId());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -328,7 +338,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -341,12 +351,12 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -366,6 +376,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -445,12 +456,12 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -473,7 +484,7 @@ public  final class GetOfflineConsultInfoByDoctorIdRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOfflineConsultInfoByDoctorIdRequest(input, extensionRegistry);
+      return new GetOfflineConsultInfoByDoctorIdRequest(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetOfflineConsultInfoByDoctorIdResponse)
     GetOfflineConsultInfoByDoctorIdResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetOfflineConsultInfoByDoctorIdResponse.newBuilder() to construct.
   private GetOfflineConsultInfoByDoctorIdResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,14 +29,19 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetOfflineConsultInfoByDoctorIdResponse(
       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) {
@@ -45,7 +51,8 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -103,6 +110,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -351,6 +359,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
     if (consultFee_ != 0) {
       output.writeInt32(8, consultFee_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -385,11 +394,11 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(8, consultFee_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -417,6 +426,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
         .equals(other.getDeptName());
     result = result && (getConsultFee()
         == other.getConsultFee());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -627,7 +637,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -640,12 +650,12 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -688,6 +698,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
       if (other.getConsultFee() != 0) {
         setConsultFee(other.getConsultFee());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1138,12 +1149,12 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1166,7 +1177,7 @@ public  final class GetOfflineConsultInfoByDoctorIdResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetOfflineConsultInfoByDoctorIdResponse(input, extensionRegistry);
+      return new GetOfflineConsultInfoByDoctorIdResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class GetQueueListRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetQueueListRequest)
     GetQueueListRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetQueueListRequest.newBuilder() to construct.
   private GetQueueListRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,14 +27,19 @@ public  final class GetQueueListRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetQueueListRequest(
       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) {
@@ -43,7 +49,8 @@ public  final class GetQueueListRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -66,6 +73,7 @@ public  final class GetQueueListRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -117,6 +125,7 @@ public  final class GetQueueListRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(2, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -132,11 +141,11 @@ public  final class GetQueueListRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(2, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -152,6 +161,7 @@ public  final class GetQueueListRequest extends
         == other.getUserId());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -336,7 +346,7 @@ public  final class GetQueueListRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -349,12 +359,12 @@ public  final class GetQueueListRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -374,6 +384,7 @@ public  final class GetQueueListRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -453,12 +464,12 @@ public  final class GetQueueListRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -481,7 +492,7 @@ public  final class GetQueueListRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetQueueListRequest(input, extensionRegistry);
+      return new GetQueueListRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class GetQueueListResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetQueueListResponse)
     GetQueueListResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetQueueListResponse.newBuilder() to construct.
   private GetQueueListResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,14 +28,19 @@ public  final class GetQueueListResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetQueueListResponse(
       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) {
@@ -44,7 +50,8 @@ public  final class GetQueueListResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -80,6 +87,7 @@ public  final class GetQueueListResponse extends
       if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
         order_ = java.util.Collections.unmodifiableList(order_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -195,6 +203,7 @@ public  final class GetQueueListResponse extends
     for (int i = 0; i < order_.size(); i++) {
       output.writeMessage(3, order_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -213,11 +222,11 @@ public  final class GetQueueListResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(3, order_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -235,6 +244,7 @@ public  final class GetQueueListResponse extends
         .equals(other.getMsg());
     result = result && getOrderList()
         .equals(other.getOrderList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -442,7 +452,7 @@ public  final class GetQueueListResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -455,12 +465,12 @@ public  final class GetQueueListResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -507,6 +517,7 @@ public  final class GetQueueListResponse extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -870,12 +881,12 @@ public  final class GetQueueListResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -898,7 +909,7 @@ public  final class GetQueueListResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetQueueListResponse(input, extensionRegistry);
+      return new GetQueueListResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class GetRegisteredListRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetRegisteredListRequest)
     GetRegisteredListRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetRegisteredListRequest.newBuilder() to construct.
   private GetRegisteredListRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,14 +30,19 @@ public  final class GetRegisteredListRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetRegisteredListRequest(
       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) {
@@ -46,7 +52,8 @@ public  final class GetRegisteredListRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -84,6 +91,7 @@ public  final class GetRegisteredListRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -171,6 +179,7 @@ public  final class GetRegisteredListRequest extends
     if (pageSize_ != 0) {
       output.writeInt32(5, pageSize_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -198,11 +207,11 @@ public  final class GetRegisteredListRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(5, pageSize_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -224,6 +233,7 @@ public  final class GetRegisteredListRequest extends
         == other.getPageIndex());
     result = result && (getPageSize()
         == other.getPageSize());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -423,7 +433,7 @@ public  final class GetRegisteredListRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -436,12 +446,12 @@ public  final class GetRegisteredListRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -470,6 +480,7 @@ public  final class GetRegisteredListRequest extends
       if (other.getPageSize() != 0) {
         setPageSize(other.getPageSize());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -627,12 +638,12 @@ public  final class GetRegisteredListRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -655,7 +666,7 @@ public  final class GetRegisteredListRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetRegisteredListRequest(input, extensionRegistry);
+      return new GetRegisteredListRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class GetRegisteredListResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.GetRegisteredListResponse)
     GetRegisteredListResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use GetRegisteredListResponse.newBuilder() to construct.
   private GetRegisteredListResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,14 +30,19 @@ public  final class GetRegisteredListResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private GetRegisteredListResponse(
       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) {
@@ -46,7 +52,8 @@ public  final class GetRegisteredListResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -92,6 +99,7 @@ public  final class GetRegisteredListResponse extends
       if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
         order_ = java.util.Collections.unmodifiableList(order_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -231,6 +239,7 @@ public  final class GetRegisteredListResponse extends
     if (count_ != 0) {
       output.writeInt32(5, count_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -257,11 +266,11 @@ public  final class GetRegisteredListResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(5, count_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -283,6 +292,7 @@ public  final class GetRegisteredListResponse extends
         == other.getTotalPage());
     result = result && (getCount()
         == other.getCount());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -500,7 +510,7 @@ public  final class GetRegisteredListResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -513,12 +523,12 @@ public  final class GetRegisteredListResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -571,6 +581,7 @@ public  final class GetRegisteredListResponse extends
       if (other.getCount() != 0) {
         setCount(other.getCount());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -986,12 +997,12 @@ public  final class GetRegisteredListResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1014,7 +1025,7 @@ public  final class GetRegisteredListResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new GetRegisteredListResponse(input, extensionRegistry);
+      return new GetRegisteredListResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class PayCallbackRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.PayCallbackRequest)
     PayCallbackRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use PayCallbackRequest.newBuilder() to construct.
   private PayCallbackRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -38,14 +39,19 @@ public  final class PayCallbackRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private PayCallbackRequest(
       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) {
@@ -55,7 +61,8 @@ public  final class PayCallbackRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -145,6 +152,7 @@ public  final class PayCallbackRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -579,6 +587,7 @@ public  final class PayCallbackRequest extends
     if (payFinishDate_ != 0L) {
       output.writeInt64(14, payFinishDate_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -635,11 +644,11 @@ public  final class PayCallbackRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(14, payFinishDate_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -679,6 +688,7 @@ public  final class PayCallbackRequest extends
         .equals(other.getWxTransactionId());
     result = result && (getPayFinishDate()
         == other.getPayFinishDate());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -924,7 +934,7 @@ public  final class PayCallbackRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -937,12 +947,12 @@ public  final class PayCallbackRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1005,6 +1015,7 @@ public  final class PayCallbackRequest extends
       if (other.getPayFinishDate() != 0L) {
         setPayFinishDate(other.getPayFinishDate());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1865,12 +1876,12 @@ public  final class PayCallbackRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1893,7 +1904,7 @@ public  final class PayCallbackRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PayCallbackRequest(input, extensionRegistry);
+      return new PayCallbackRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class PayCallbackResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.PayCallbackResponse)
     PayCallbackResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use PayCallbackResponse.newBuilder() to construct.
   private PayCallbackResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,14 +27,19 @@ public  final class PayCallbackResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private PayCallbackResponse(
       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) {
@@ -43,7 +49,8 @@ public  final class PayCallbackResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +74,7 @@ public  final class PayCallbackResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -143,6 +151,7 @@ public  final class PayCallbackResponse extends
     if (!getInfoBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -157,11 +166,11 @@ public  final class PayCallbackResponse extends
     if (!getInfoBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -177,6 +186,7 @@ public  final class PayCallbackResponse extends
         == other.getCode());
     result = result && getInfo()
         .equals(other.getInfo());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -361,7 +371,7 @@ public  final class PayCallbackResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -374,12 +384,12 @@ public  final class PayCallbackResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -400,6 +410,7 @@ public  final class PayCallbackResponse extends
         info_ = other.info_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -522,12 +533,12 @@ public  final class PayCallbackResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -550,7 +561,7 @@ public  final class PayCallbackResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PayCallbackResponse(input, extensionRegistry);
+      return new PayCallbackResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class RefundCallbackRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RefundCallbackRequest)
     RefundCallbackRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RefundCallbackRequest.newBuilder() to construct.
   private RefundCallbackRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -31,14 +32,19 @@ public  final class RefundCallbackRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RefundCallbackRequest(
       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) {
@@ -48,7 +54,8 @@ public  final class RefundCallbackRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -99,6 +106,7 @@ public  final class RefundCallbackRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -309,6 +317,7 @@ public  final class RefundCallbackRequest extends
     if (!getCustomBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, custom_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -341,11 +350,11 @@ public  final class RefundCallbackRequest extends
     if (!getCustomBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, custom_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -371,6 +380,7 @@ public  final class RefundCallbackRequest extends
         == other.getRefundStatus());
     result = result && getCustom()
         .equals(other.getCustom());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -580,7 +590,7 @@ public  final class RefundCallbackRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -593,12 +603,12 @@ public  final class RefundCallbackRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -636,6 +646,7 @@ public  final class RefundCallbackRequest extends
         custom_ = other.custom_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1038,12 +1049,12 @@ public  final class RefundCallbackRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -1066,7 +1077,7 @@ public  final class RefundCallbackRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RefundCallbackRequest(input, extensionRegistry);
+      return new RefundCallbackRequest(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class RefundCallbackResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RefundCallbackResponse)
     RefundCallbackResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RefundCallbackResponse.newBuilder() to construct.
   private RefundCallbackResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -22,14 +23,19 @@ public  final class RefundCallbackResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RefundCallbackResponse(
       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) {
@@ -39,7 +45,8 @@ public  final class RefundCallbackResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -63,6 +70,7 @@ public  final class RefundCallbackResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -139,6 +147,7 @@ public  final class RefundCallbackResponse extends
     if (!getMsgBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, msg_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -153,11 +162,11 @@ public  final class RefundCallbackResponse extends
     if (!getMsgBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, msg_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -173,6 +182,7 @@ public  final class RefundCallbackResponse extends
         == other.getCode());
     result = result && getMsg()
         .equals(other.getMsg());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -353,7 +363,7 @@ public  final class RefundCallbackResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -366,12 +376,12 @@ public  final class RefundCallbackResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -392,6 +402,7 @@ public  final class RefundCallbackResponse extends
         msg_ = other.msg_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -514,12 +525,12 @@ public  final class RefundCallbackResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -542,7 +553,7 @@ public  final class RefundCallbackResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RefundCallbackResponse(input, extensionRegistry);
+      return new RefundCallbackResponse(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class RegisterRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RegisterRequest)
     RegisterRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RegisterRequest.newBuilder() to construct.
   private RegisterRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,14 +22,19 @@ public  final class RegisterRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RegisterRequest(
       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) {
@@ -38,7 +44,8 @@ public  final class RegisterRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -56,6 +63,7 @@ public  final class RegisterRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -99,6 +107,7 @@ public  final class RegisterRequest extends
     if (regId_ != 0) {
       output.writeInt32(1, regId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -110,11 +119,11 @@ public  final class RegisterRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, regId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -128,6 +137,7 @@ public  final class RegisterRequest extends
     boolean result = true;
     result = result && (getRegId()
         == other.getRegId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -303,7 +313,7 @@ public  final class RegisterRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -316,12 +326,12 @@ public  final class RegisterRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -338,6 +348,7 @@ public  final class RegisterRequest extends
       if (other.getRegId() != 0) {
         setRegId(other.getRegId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -403,12 +414,12 @@ public  final class RegisterRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -431,7 +442,7 @@ public  final class RegisterRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RegisterRequest(input, extensionRegistry);
+      return new RegisterRequest(input, extensionRegistry);
     }
   };
 

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

@@ -10,6 +10,7 @@ public  final class RegisterResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RegisterResponse)
     RegisterResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RegisterResponse.newBuilder() to construct.
   private RegisterResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -22,14 +23,19 @@ public  final class RegisterResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RegisterResponse(
       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) {
@@ -39,7 +45,8 @@ public  final class RegisterResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -63,6 +70,7 @@ public  final class RegisterResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -139,6 +147,7 @@ public  final class RegisterResponse extends
     if (!getMsgBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, msg_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -153,11 +162,11 @@ public  final class RegisterResponse extends
     if (!getMsgBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, msg_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -173,6 +182,7 @@ public  final class RegisterResponse extends
         == other.getCode());
     result = result && getMsg()
         .equals(other.getMsg());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -353,7 +363,7 @@ public  final class RegisterResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -366,12 +376,12 @@ public  final class RegisterResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -392,6 +402,7 @@ public  final class RegisterResponse extends
         msg_ = other.msg_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -514,12 +525,12 @@ public  final class RegisterResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -542,7 +553,7 @@ public  final class RegisterResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RegisterResponse(input, extensionRegistry);
+      return new RegisterResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RegisterWithoutMedicalCardRequest)
     RegisterWithoutMedicalCardRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RegisterWithoutMedicalCardRequest.newBuilder() to construct.
   private RegisterWithoutMedicalCardRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -45,14 +46,19 @@ public  final class RegisterWithoutMedicalCardRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RegisterWithoutMedicalCardRequest(
       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) {
@@ -62,7 +68,8 @@ public  final class RegisterWithoutMedicalCardRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -191,6 +198,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -869,6 +877,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(21, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -949,11 +958,11 @@ public  final class RegisterWithoutMedicalCardRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(21, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -1007,6 +1016,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
         == other.getBirthday());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1288,7 +1298,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1301,12 +1311,12 @@ public  final class RegisterWithoutMedicalCardRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1394,6 +1404,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -2768,12 +2779,12 @@ public  final class RegisterWithoutMedicalCardRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -2796,7 +2807,7 @@ public  final class RegisterWithoutMedicalCardRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RegisterWithoutMedicalCardRequest(input, extensionRegistry);
+      return new RegisterWithoutMedicalCardRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RegisterWithoutMedicalCardResponse)
     RegisterWithoutMedicalCardResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RegisterWithoutMedicalCardResponse.newBuilder() to construct.
   private RegisterWithoutMedicalCardResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,14 +27,19 @@ public  final class RegisterWithoutMedicalCardResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RegisterWithoutMedicalCardResponse(
       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) {
@@ -43,7 +49,8 @@ public  final class RegisterWithoutMedicalCardResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +74,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -143,6 +151,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
     if (!getMsgBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, msg_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -157,11 +166,11 @@ public  final class RegisterWithoutMedicalCardResponse extends
     if (!getMsgBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, msg_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -177,6 +186,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
         == other.getCode());
     result = result && getMsg()
         .equals(other.getMsg());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -361,7 +371,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -374,12 +384,12 @@ public  final class RegisterWithoutMedicalCardResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -400,6 +410,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
         msg_ = other.msg_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -522,12 +533,12 @@ public  final class RegisterWithoutMedicalCardResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -550,7 +561,7 @@ public  final class RegisterWithoutMedicalCardResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RegisterWithoutMedicalCardResponse(input, extensionRegistry);
+      return new RegisterWithoutMedicalCardResponse(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class RegisteredOrder extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.RegisteredOrder)
     RegisteredOrderOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use RegisteredOrder.newBuilder() to construct.
   private RegisteredOrder(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -59,15 +60,20 @@ public  final class RegisteredOrder extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private RegisteredOrder(
       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;
     int mutable_bitField1_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -77,7 +83,8 @@ public  final class RegisteredOrder extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -280,6 +287,7 @@ public  final class RegisteredOrder extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -1186,6 +1194,7 @@ public  final class RegisteredOrder extends
     if (!getHisSeqCodeBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 35, hisSeqCode_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -1318,11 +1327,11 @@ public  final class RegisteredOrder extends
     if (!getHisSeqCodeBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(35, hisSeqCode_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -1404,6 +1413,7 @@ public  final class RegisteredOrder extends
         == other.getRegisteredType());
     result = result && getHisSeqCode()
         .equals(other.getHisSeqCode());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1757,7 +1767,7 @@ public  final class RegisteredOrder extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1770,12 +1780,12 @@ public  final class RegisteredOrder extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1909,6 +1919,7 @@ public  final class RegisteredOrder extends
         hisSeqCode_ = other.hisSeqCode_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3711,12 +3722,12 @@ public  final class RegisteredOrder extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -3739,7 +3750,7 @@ public  final class RegisteredOrder extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RegisteredOrder(input, extensionRegistry);
+      return new RegisteredOrder(input, extensionRegistry);
     }
   };
 

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

@@ -192,7 +192,7 @@ public final class TaiheRegister {
       "gisteredDate\030\t \001(\003\022\016\n\006period\030\n \001(\005\022\021\n\tst" +
       "artTime\030\013 \001(\t\022\017\n\007endTime\030\014 \001(\t\022\016\n\006userId" +
       "\030\r \001(\005\022\025\n\rmedicalCardId\030\016 \001(\005\022\030\n\020schedul" +
-      "eItemCode\030\017 \001(\t\022\026\n\016paymentChannel\030\020 \001(\005\022",
+      "eItemCode\030\017 \001(\t\022\026\n\016paymentChannel\030\020 \001(\005\022" +
       "\016\n\006source\030\021 \001(\005\022\016\n\006deptId\030\022 \001(\005\022\023\n\013lockQ" +
       "ueueNo\030\023 \001(\t\022\027\n\017availableNumStr\030\024 \001(\t\022\022\n" +
       "\nhospitalId\030\025 \001(\005\"\336\001\n\030CreateRegisteredRe" +
@@ -202,7 +202,7 @@ public final class TaiheRegister {
       "\t\022\014\n\004idNo\030\010 \001(\t\022\017\n\007orderId\030\t \001(\005\022\017\n\007orde" +
       "rNo\030\n \001(\t\022\020\n\010doctorId\030\013 \001(\005\022\r\n\005regId\030\014 \001" +
       "(\005\"N\n\027CancelRegisteredRequest\022\017\n\007orderId" +
-      "\030\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001",
+      "\030\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001" +
       "(\005\"E\n\030CancelRegisteredResponse\022\014\n\004code\030\001" +
       " \001(\005\022\013\n\003msg\030\002 \001(\t\022\016\n\006status\030\003 \001(\005\"\234\002\n\022Pa" +
       "yCallbackRequest\022\017\n\007orderNo\030\001 \001(\t\022\017\n\007ord" +
@@ -212,7 +212,7 @@ public final class TaiheRegister {
       "nal\030\t \001(\005\022\016\n\006openid\030\n \001(\t\022\026\n\016paymentChan" +
       "nel\030\013 \001(\005\022\025\n\roneTimeCustom\030\014 \001(\t\022\027\n\017wxTr" +
       "ansactionId\030\r \001(\t\022\025\n\rpayFinishDate\030\016 \001(\003" +
-      "\"1\n\023PayCallbackResponse\022\014\n\004code\030\001 \001(\005\022\014\n",
+      "\"1\n\023PayCallbackResponse\022\014\n\004code\030\001 \001(\005\022\014\n" +
       "\004info\030\002 \001(\t\"\220\001\n\025RefundCallbackRequest\022\016\n" +
       "\006amount\030\001 \001(\005\022\r\n\005bizId\030\002 \001(\005\022\017\n\007orderId\030" +
       "\003 \001(\005\022\017\n\007orderNo\030\004 \001(\t\022\020\n\010refundNo\030\005 \001(\t" +
@@ -222,7 +222,7 @@ public final class TaiheRegister {
       "\001 \001(\005\"-\n\020RegisterResponse\022\014\n\004code\030\001 \001(\005\022" +
       "\013\n\003msg\030\002 \001(\t\"B\n\013TakeRequest\022\017\n\007orderId\030\001" +
       " \001(\005\022\016\n\006userId\030\002 \001(\005\022\022\n\nhospitalId\030\003 \001(\005" +
-      "\"@\n\014TakeResponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 ",
+      "\"@\n\014TakeResponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 " +
       "\001(\t\022\025\n\rhisClinicCode\030\003 \001(\t\"9\n\023GetQueueLi" +
       "stRequest\022\016\n\006userId\030\001 \001(\005\022\022\n\nhospitalId\030" +
       "\002 \001(\005\"\316\005\n\017RegisteredOrder\022\017\n\007orderId\030\001 \001" +
@@ -232,7 +232,7 @@ public final class TaiheRegister {
       "Period\030\007 \001(\005\022\021\n\tstartTime\030\010 \001(\t\022\017\n\007endTi" +
       "me\030\t \001(\t\022\025\n\rmedicalCardId\030\n \001(\005\022\023\n\013patie" +
       "ntName\030\013 \001(\t\022\026\n\016paymentChannel\030\014 \001(\005\022\022\n\n" +
-      "updateTime\030\r \001(\003\022\022\n\ncreateTime\030\016 \001(\003\022\022\n\n",
+      "updateTime\030\r \001(\003\022\022\n\ncreateTime\030\016 \001(\003\022\022\n\n" +
       "doctorCode\030\017 \001(\t\022\020\n\010deptCode\030\020 \001(\t\022\020\n\010de" +
       "ptName\030\021 \001(\t\022\025\n\rregisteredFee\030\022 \001(\005\022\022\n\nm" +
       "edicalFee\030\023 \001(\005\022\025\n\rpaymentStatus\030\024 \001(\005\022\030" +
@@ -242,7 +242,7 @@ public final class TaiheRegister {
       "orName\030\033 \001(\t\022\013\n\003sex\030\034 \001(\005\022\025\n\rhisClinicCo" +
       "de\030\035 \001(\t\022\017\n\007address\030\036 \001(\t\022\022\n\nstatusName\030" +
       "\037 \001(\t\022\016\n\006status\030  \001(\005\022\023\n\013paymentDate\030! \001" +
-      "(\003\022\026\n\016registeredType\030\" \001(\005\022\022\n\nhisSeqCode",
+      "(\003\022\026\n\016registeredType\030\" \001(\005\022\022\n\nhisSeqCode" +
       "\030# \001(\t\"n\n\024GetQueueListResponse\022\014\n\004code\030\001" +
       " \001(\005\022\013\n\003msg\030\002 \001(\t\022;\n\005order\030\003 \003(\0132,.com.y" +
       "wt.gapi.taihe.register.RegisteredOrder\"\246" +
@@ -252,7 +252,7 @@ public final class TaiheRegister {
       " \001(\005\022\022\n\ndoctorName\030\007 \001(\t\022\023\n\013patientName\030" +
       "\010 \001(\t\022\023\n\013doctorTitle\030\t \001(\t\022\022\n\nstatusName" +
       "\030\n \001(\t\022\022\n\npatientSex\030\013 \001(\t\022\026\n\016registered" +
-      "Date\030\014 \001(\t\022\021\n\tstartTime\030\r \001(\t\022\017\n\007endTime",
+      "Date\030\014 \001(\t\022\021\n\tstartTime\030\r \001(\t\022\017\n\007endTime" +
       "\030\016 \001(\t\022\021\n\torderType\030\017 \001(\005\022\022\n\norderTitle\030" +
       "\020 \001(\t\022\022\n\ncreateTime\030\021 \001(\003\022\016\n\006cancel\030\022 \001(" +
       "\005\022\020\n\010deptCode\030\023 \001(\t\022\026\n\016registeredType\030\024 " +
@@ -262,7 +262,7 @@ public final class TaiheRegister {
       "(\005\022\021\n\tstartDate\030\005 \001(\003\"\222\001\n\032GetCommonOrder" +
       "ListResponse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\022" +
       "7\n\005order\030\003 \003(\0132(.com.ywt.gapi.taihe.regi" +
-      "ster.CommonOrder\022\021\n\ttotalPage\030\004 \001(\005\022\r\n\005c",
+      "ster.CommonOrder\022\021\n\ttotalPage\030\004 \001(\005\022\r\n\005c" +
       "ount\030\005 \001(\005\"{\n\030GetRegisteredListRequest\022\016" +
       "\n\006userId\030\001 \001(\005\022\026\n\016registeredType\030\002 \001(\005\022\022" +
       "\n\nhospitalId\030\003 \001(\005\022\021\n\tpageIndex\030\004 \001(\005\022\020\n" +
@@ -272,7 +272,7 @@ public final class TaiheRegister {
       "gisteredOrder\022\021\n\ttotalPage\030\004 \001(\005\022\r\n\005coun" +
       "t\030\005 \001(\005\"\263\003\n!RegisterWithoutMedicalCardRe" +
       "quest\022\016\n\006deptId\030\001 \001(\005\022\020\n\010deptCode\030\002 \001(\t\022" +
-      "\020\n\010deptName\030\003 \001(\t\022\022\n\ndoctorCode\030\004 \001(\t\022\022\n",
+      "\020\n\010deptName\030\003 \001(\t\022\022\n\ndoctorCode\030\004 \001(\t\022\022\n" +
       "\ndoctorName\030\005 \001(\t\022\r\n\005total\030\006 \001(\005\022\025\n\rregi" +
       "steredFee\030\007 \001(\005\022\022\n\nmedicalFee\030\010 \001(\005\022\026\n\016r" +
       "egisteredDate\030\t \001(\003\022\016\n\006period\030\n \001(\005\022\021\n\ts" +
@@ -282,7 +282,7 @@ public final class TaiheRegister {
       " \001(\t\022\025\n\rpatientMobile\030\022 \001(\t\022\022\n\npatientSe" +
       "x\030\023 \001(\005\022\020\n\010birthday\030\024 \001(\003\022\022\n\nhospitalId\030" +
       "\025 \001(\005\"?\n\"RegisterWithoutMedicalCardRespo" +
-      "nse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"N\n&GetOff",
+      "nse\022\014\n\004code\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"N\n&GetOff" +
       "lineConsultInfoByDoctorIdRequest\022\020\n\010doct" +
       "orId\030\001 \001(\005\022\022\n\nhospitalId\030\002 \001(\005\"\270\001\n\'GetOf" +
       "flineConsultInfoByDoctorIdResponse\022\014\n\004co" +
@@ -292,7 +292,7 @@ public final class TaiheRegister {
       "\nconsultFee\030\010 \001(\005\"P\n\030GetLatestRegOrderRe" +
       "quest\022\020\n\010doctorId\030\001 \001(\005\022\016\n\006userId\030\002 \001(\005\022" +
       "\022\n\nhospitalId\030\003 \001(\005\"M\n\031GetLatestRegOrder" +
-      "Response\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\024\n\014",
+      "Response\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\024\n\014" +
       "registerDate\030\003 \001(\003\"k\n\027CalAdditionalFeeRe" +
       "quest\022\025\n\rmedicalCardId\030\001 \001(\005\022\022\n\nmedicalF" +
       "ee\030\002 \001(\005\022\025\n\rregisteredFee\030\003 \001(\005\022\016\n\006userI" +
@@ -302,68 +302,68 @@ public final class TaiheRegister {
       "ntIdByUserIdAndMobileRequest\022\016\n\006userId\030\001" +
       " \001(\005\022\016\n\006mobile\030\002 \001(\t\022\016\n\006cardNo\030\003 \001(\t\022\017\n\007" +
       "address\030\004 \001(\t\022\021\n\tpatientNo\030\005 \001(\t\022\014\n\004name" +
-      "\030\006 \001(\t\022\022\n\nhospitalId\030\007 \001(\005\"\\\n(GetHisPati",
+      "\030\006 \001(\t\022\022\n\nhospitalId\030\007 \001(\005\"\\\n(GetHisPati" +
       "entIdByUserIdAndMobileResponse\022\024\n\014hisPat" +
       "ientId\030\001 \001(\t\022\014\n\004code\030\002 \001(\005\022\014\n\004info\030\003 \001(\t" +
-      "\"\241\001\n\030CreateMedicalCardRequest\022\017\n\007phoneNo" +
+      "\"\267\001\n\030CreateMedicalCardRequest\022\017\n\007phoneNo" +
       "\030\001 \001(\t\022\014\n\004idNo\030\002 \001(\t\022\023\n\013patientName\030\003 \001(" +
       "\t\022\014\n\004city\030\004 \001(\t\022\017\n\007address\030\005 \001(\t\022\016\n\006isIn" +
       "su\030\006 \001(\t\022\022\n\nhospitalId\030\007 \001(\005\022\016\n\006userId\030\010" +
-      " \001(\005\"e\n\031CreateMedicalCardResponse\022\014\n\004cod" +
-      "e\030\001 \001(\005\022\014\n\004info\030\002 \001(\t\022\025\n\rmedicalCardId\030\003" +
-      " \001(\005\022\025\n\rmedicalCardNo\030\004 \001(\t2\331\017\n\024TaiheReg" +
-      "isterService\022\177\n\020createRegistered\0224.com.y",
-      "wt.gapi.taihe.register.CreateRegisteredR" +
-      "equest\0325.com.ywt.gapi.taihe.register.Cre" +
-      "ateRegisteredResponse\022\177\n\020cancelRegistere" +
-      "d\0224.com.ywt.gapi.taihe.register.CancelRe" +
-      "gisteredRequest\0325.com.ywt.gapi.taihe.reg" +
-      "ister.CancelRegisteredResponse\022p\n\013payCal" +
-      "lback\022/.com.ywt.gapi.taihe.register.PayC" +
-      "allbackRequest\0320.com.ywt.gapi.taihe.regi" +
-      "ster.PayCallbackResponse\022y\n\016refundCallba" +
-      "ck\0222.com.ywt.gapi.taihe.register.RefundC",
-      "allbackRequest\0323.com.ywt.gapi.taihe.regi" +
-      "ster.RefundCallbackResponse\022g\n\010register\022" +
-      ",.com.ywt.gapi.taihe.register.RegisterRe" +
-      "quest\032-.com.ywt.gapi.taihe.register.Regi" +
-      "sterResponse\022[\n\004take\022(.com.ywt.gapi.taih" +
-      "e.register.TakeRequest\032).com.ywt.gapi.ta" +
-      "ihe.register.TakeResponse\022s\n\014getQueueLis" +
-      "t\0220.com.ywt.gapi.taihe.register.GetQueue" +
-      "ListRequest\0321.com.ywt.gapi.taihe.registe" +
-      "r.GetQueueListResponse\022\205\001\n\022getCommonOrde",
-      "rList\0226.com.ywt.gapi.taihe.register.GetC" +
-      "ommonOrderListRequest\0327.com.ywt.gapi.tai" +
-      "he.register.GetCommonOrderListResponse\022\202" +
-      "\001\n\021getRegisteredList\0225.com.ywt.gapi.taih" +
-      "e.register.GetRegisteredListRequest\0326.co" +
-      "m.ywt.gapi.taihe.register.GetRegisteredL" +
-      "istResponse\022\235\001\n\032registerWithoutMedicalCa" +
-      "rd\022>.com.ywt.gapi.taihe.register.Registe" +
-      "rWithoutMedicalCardRequest\032?.com.ywt.gap" +
-      "i.taihe.register.RegisterWithoutMedicalC",
-      "ardResponse\022\254\001\n\037getOfflineConsultInfoByD" +
-      "octorId\022C.com.ywt.gapi.taihe.register.Ge" +
-      "tOfflineConsultInfoByDoctorIdRequest\032D.c" +
-      "om.ywt.gapi.taihe.register.GetOfflineCon" +
-      "sultInfoByDoctorIdResponse\022\202\001\n\021getLatest" +
-      "RegOrder\0225.com.ywt.gapi.taihe.register.G" +
-      "etLatestRegOrderRequest\0326.com.ywt.gapi.t" +
-      "aihe.register.GetLatestRegOrderResponse\022" +
-      "\177\n\020calAdditionalFee\0224.com.ywt.gapi.taihe" +
-      ".register.CalAdditionalFeeRequest\0325.com.",
-      "ywt.gapi.taihe.register.CalAdditionalFee" +
-      "Response\022\257\001\n getHisPatientIdByUserIdAndM" +
-      "obile\022D.com.ywt.gapi.taihe.register.GetH" +
-      "isPatientIdByUserIdAndMobileRequest\032E.co" +
-      "m.ywt.gapi.taihe.register.GetHisPatientI" +
-      "dByUserIdAndMobileResponse\022\202\001\n\021createMed" +
-      "icalCard\0225.com.ywt.gapi.taihe.register.C" +
-      "reateMedicalCardRequest\0326.com.ywt.gapi.t" +
-      "aihe.register.CreateMedicalCardResponseB" +
-      "\"\n\033com.ywt.gapi.taihe.registerP\001\210\001\001b\006pro",
-      "to3"
+      " \001(\005\022\024\n\014relationship\030\t \001(\005\"e\n\031CreateMedi" +
+      "calCardResponse\022\014\n\004code\030\001 \001(\005\022\014\n\004info\030\002 " +
+      "\001(\t\022\025\n\rmedicalCardId\030\003 \001(\005\022\025\n\rmedicalCar" +
+      "dNo\030\004 \001(\t2\331\017\n\024TaiheRegisterService\022\177\n\020cr" +
+      "eateRegistered\0224.com.ywt.gapi.taihe.regi" +
+      "ster.CreateRegisteredRequest\0325.com.ywt.g" +
+      "api.taihe.register.CreateRegisteredRespo" +
+      "nse\022\177\n\020cancelRegistered\0224.com.ywt.gapi.t" +
+      "aihe.register.CancelRegisteredRequest\0325." +
+      "com.ywt.gapi.taihe.register.CancelRegist" +
+      "eredResponse\022p\n\013payCallback\022/.com.ywt.ga" +
+      "pi.taihe.register.PayCallbackRequest\0320.c" +
+      "om.ywt.gapi.taihe.register.PayCallbackRe" +
+      "sponse\022y\n\016refundCallback\0222.com.ywt.gapi." +
+      "taihe.register.RefundCallbackRequest\0323.c" +
+      "om.ywt.gapi.taihe.register.RefundCallbac" +
+      "kResponse\022g\n\010register\022,.com.ywt.gapi.tai" +
+      "he.register.RegisterRequest\032-.com.ywt.ga" +
+      "pi.taihe.register.RegisterResponse\022[\n\004ta" +
+      "ke\022(.com.ywt.gapi.taihe.register.TakeReq" +
+      "uest\032).com.ywt.gapi.taihe.register.TakeR" +
+      "esponse\022s\n\014getQueueList\0220.com.ywt.gapi.t" +
+      "aihe.register.GetQueueListRequest\0321.com." +
+      "ywt.gapi.taihe.register.GetQueueListResp" +
+      "onse\022\205\001\n\022getCommonOrderList\0226.com.ywt.ga" +
+      "pi.taihe.register.GetCommonOrderListRequ" +
+      "est\0327.com.ywt.gapi.taihe.register.GetCom" +
+      "monOrderListResponse\022\202\001\n\021getRegisteredLi" +
+      "st\0225.com.ywt.gapi.taihe.register.GetRegi" +
+      "steredListRequest\0326.com.ywt.gapi.taihe.r" +
+      "egister.GetRegisteredListResponse\022\235\001\n\032re" +
+      "gisterWithoutMedicalCard\022>.com.ywt.gapi." +
+      "taihe.register.RegisterWithoutMedicalCar" +
+      "dRequest\032?.com.ywt.gapi.taihe.register.R" +
+      "egisterWithoutMedicalCardResponse\022\254\001\n\037ge" +
+      "tOfflineConsultInfoByDoctorId\022C.com.ywt." +
+      "gapi.taihe.register.GetOfflineConsultInf" +
+      "oByDoctorIdRequest\032D.com.ywt.gapi.taihe." +
+      "register.GetOfflineConsultInfoByDoctorId" +
+      "Response\022\202\001\n\021getLatestRegOrder\0225.com.ywt" +
+      ".gapi.taihe.register.GetLatestRegOrderRe" +
+      "quest\0326.com.ywt.gapi.taihe.register.GetL" +
+      "atestRegOrderResponse\022\177\n\020calAdditionalFe" +
+      "e\0224.com.ywt.gapi.taihe.register.CalAddit" +
+      "ionalFeeRequest\0325.com.ywt.gapi.taihe.reg" +
+      "ister.CalAdditionalFeeResponse\022\257\001\n getHi" +
+      "sPatientIdByUserIdAndMobile\022D.com.ywt.ga" +
+      "pi.taihe.register.GetHisPatientIdByUserI" +
+      "dAndMobileRequest\032E.com.ywt.gapi.taihe.r" +
+      "egister.GetHisPatientIdByUserIdAndMobile" +
+      "Response\022\202\001\n\021createMedicalCard\0225.com.ywt" +
+      ".gapi.taihe.register.CreateMedicalCardRe" +
+      "quest\0326.com.ywt.gapi.taihe.register.Crea" +
+      "teMedicalCardResponseB\"\n\033com.ywt.gapi.ta" +
+      "ihe.registerP\001\210\001\001b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -562,7 +562,7 @@ public final class TaiheRegister {
     internal_static_com_ywt_gapi_taihe_register_CreateMedicalCardRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_taihe_register_CreateMedicalCardRequest_descriptor,
-        new java.lang.String[] { "PhoneNo", "IdNo", "PatientName", "City", "Address", "IsInsu", "HospitalId", "UserId", });
+        new java.lang.String[] { "PhoneNo", "IdNo", "PatientName", "City", "Address", "IsInsu", "HospitalId", "UserId", "Relationship", });
     internal_static_com_ywt_gapi_taihe_register_CreateMedicalCardResponse_descriptor =
       getDescriptor().getMessageTypes().get(31);
     internal_static_com_ywt_gapi_taihe_register_CreateMedicalCardResponse_fieldAccessorTable = new

+ 1 - 1
onemini-hospital-empty/src/main/java/com/ywt/gapi/taihe/register/TaiheRegisterServiceGrpc.java

@@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.2-SNAPSHOT)",
+    value = "by gRPC proto compiler (version 1.7.0)",
     comments = "Source: taihe_register.proto")
 public final class TaiheRegisterServiceGrpc {
 

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

@@ -14,6 +14,7 @@ public  final class TakeRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.TakeRequest)
     TakeRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TakeRequest.newBuilder() to construct.
   private TakeRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,14 +28,19 @@ public  final class TakeRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private TakeRequest(
       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) {
@@ -44,7 +50,8 @@ public  final class TakeRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -72,6 +79,7 @@ public  final class TakeRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -139,6 +147,7 @@ public  final class TakeRequest extends
     if (hospitalId_ != 0) {
       output.writeInt32(3, hospitalId_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -158,11 +167,11 @@ public  final class TakeRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(3, hospitalId_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -180,6 +189,7 @@ public  final class TakeRequest extends
         == other.getUserId());
     result = result && (getHospitalId()
         == other.getHospitalId());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -369,7 +379,7 @@ public  final class TakeRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -382,12 +392,12 @@ public  final class TakeRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,6 +420,7 @@ public  final class TakeRequest extends
       if (other.getHospitalId() != 0) {
         setHospitalId(other.getHospitalId());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -527,12 +538,12 @@ public  final class TakeRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -555,7 +566,7 @@ public  final class TakeRequest extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TakeRequest(input, extensionRegistry);
+      return new TakeRequest(input, extensionRegistry);
     }
   };
 

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

@@ -14,6 +14,7 @@ public  final class TakeResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:com.ywt.gapi.taihe.register.TakeResponse)
     TakeResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TakeResponse.newBuilder() to construct.
   private TakeResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,14 +28,19 @@ public  final class TakeResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private TakeResponse(
       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) {
@@ -44,7 +50,8 @@ public  final class TakeResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -74,6 +81,7 @@ public  final class TakeResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -195,6 +203,7 @@ public  final class TakeResponse extends
     if (!getHisClinicCodeBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, hisClinicCode_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -212,11 +221,11 @@ public  final class TakeResponse extends
     if (!getHisClinicCodeBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, hisClinicCode_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -234,6 +243,7 @@ public  final class TakeResponse extends
         .equals(other.getMsg());
     result = result && getHisClinicCode()
         .equals(other.getHisClinicCode());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -423,7 +433,7 @@ public  final class TakeResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -436,12 +446,12 @@ public  final class TakeResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -466,6 +476,7 @@ public  final class TakeResponse extends
         hisClinicCode_ = other.hisClinicCode_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -677,12 +688,12 @@ public  final class TakeResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 
@@ -705,7 +716,7 @@ public  final class TakeResponse extends
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TakeResponse(input, extensionRegistry);
+      return new TakeResponse(input, extensionRegistry);
     }
   };