DYH2020 пре 2 година
родитељ
комит
f764043b06

+ 3 - 3
grpc_def/drug.proto

@@ -114,9 +114,9 @@ message SaveHisOpenApiPrescriptionRequest {
 
 message SaveHisOpenApiPrescriptionResponse {
 	int32 code = 1;
-	string errorCode = 2;
-	string info = 3;
-	string bizNo = 4;
+	string info = 2;
+	string bizNo = 3;
+	string data = 4;
 }
 
 //药品相关服务

+ 8 - 8
src/main/java/com/ywt/gapi/drug/Drug.java

@@ -95,14 +95,14 @@ public final class Drug {
       "viceId\030  \001(\t\022\022\n\nadviceFlag\030! \001(\005\"q\n!Save",
       "HisOpenApiPrescriptionRequest\022>\n\021prescri" +
       "ptionInfos\030\001 \003(\0132#.com.ywt.gapi.drug.Pre" +
-      "scriptionInfo\022\014\n\004flag\030\002 \001(\005\"b\n\"SaveHisOp" +
+      "scriptionInfo\022\014\n\004flag\030\002 \001(\005\"]\n\"SaveHisOp" +
       "enApiPrescriptionResponse\022\014\n\004code\030\001 \001(\005\022" +
-      "\021\n\terrorCode\030\002 \001(\t\022\014\n\004info\030\003 \001(\t\022\r\n\005bizN" +
-      "o\030\004 \001(\t2\231\001\n\013DrugService\022\211\001\n\032saveHisOpenA" +
-      "piPrescription\0224.com.ywt.gapi.drug.SaveH" +
-      "isOpenApiPrescriptionRequest\0325.com.ywt.g" +
-      "api.drug.SaveHisOpenApiPrescriptionRespo" +
-      "nseB\030\n\021com.ywt.gapi.drugP\001\210\001\001b\006proto3"
+      "\014\n\004info\030\002 \001(\t\022\r\n\005bizNo\030\003 \001(\t\022\014\n\004data\030\004 \001" +
+      "(\t2\231\001\n\013DrugService\022\211\001\n\032saveHisOpenApiPre" +
+      "scription\0224.com.ywt.gapi.drug.SaveHisOpe" +
+      "nApiPrescriptionRequest\0325.com.ywt.gapi.d" +
+      "rug.SaveHisOpenApiPrescriptionResponseB\030" +
+      "\n\021com.ywt.gapi.drugP\001\210\001\001b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -139,7 +139,7 @@ public final class Drug {
     internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_drug_SaveHisOpenApiPrescriptionResponse_descriptor,
-        new java.lang.String[] { "Code", "ErrorCode", "Info", "BizNo", });
+        new java.lang.String[] { "Code", "Info", "BizNo", "Data", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

+ 109 - 109
src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionResponse.java

@@ -16,9 +16,9 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
   }
   private SaveHisOpenApiPrescriptionResponse() {
     code_ = 0;
-    errorCode_ = "";
     info_ = "";
     bizNo_ = "";
+    data_ = "";
   }
 
   @java.lang.Override
@@ -54,19 +54,19 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
-            errorCode_ = s;
+            info_ = s;
             break;
           }
           case 26: {
             java.lang.String s = input.readStringRequireUtf8();
 
-            info_ = s;
+            bizNo_ = s;
             break;
           }
           case 34: {
             java.lang.String s = input.readStringRequireUtf8();
 
-            bizNo_ = s;
+            data_ = s;
             break;
           }
         }
@@ -101,102 +101,102 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     return code_;
   }
 
-  public static final int ERRORCODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object errorCode_;
+  public static final int INFO_FIELD_NUMBER = 2;
+  private volatile java.lang.Object info_;
   /**
-   * <code>string errorCode = 2;</code>
+   * <code>string info = 2;</code>
    */
-  public java.lang.String getErrorCode() {
-    java.lang.Object ref = errorCode_;
+  public java.lang.String getInfo() {
+    java.lang.Object ref = info_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      errorCode_ = s;
+      info_ = s;
       return s;
     }
   }
   /**
-   * <code>string errorCode = 2;</code>
+   * <code>string info = 2;</code>
    */
   public com.google.protobuf.ByteString
-      getErrorCodeBytes() {
-    java.lang.Object ref = errorCode_;
+      getInfoBytes() {
+    java.lang.Object ref = info_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      errorCode_ = b;
+      info_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
     }
   }
 
-  public static final int INFO_FIELD_NUMBER = 3;
-  private volatile java.lang.Object info_;
+  public static final int BIZNO_FIELD_NUMBER = 3;
+  private volatile java.lang.Object bizNo_;
   /**
-   * <code>string info = 3;</code>
+   * <code>string bizNo = 3;</code>
    */
-  public java.lang.String getInfo() {
-    java.lang.Object ref = info_;
+  public java.lang.String getBizNo() {
+    java.lang.Object ref = bizNo_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      info_ = s;
+      bizNo_ = s;
       return s;
     }
   }
   /**
-   * <code>string info = 3;</code>
+   * <code>string bizNo = 3;</code>
    */
   public com.google.protobuf.ByteString
-      getInfoBytes() {
-    java.lang.Object ref = info_;
+      getBizNoBytes() {
+    java.lang.Object ref = bizNo_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      info_ = b;
+      bizNo_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
     }
   }
 
-  public static final int BIZNO_FIELD_NUMBER = 4;
-  private volatile java.lang.Object bizNo_;
+  public static final int DATA_FIELD_NUMBER = 4;
+  private volatile java.lang.Object data_;
   /**
-   * <code>string bizNo = 4;</code>
+   * <code>string data = 4;</code>
    */
-  public java.lang.String getBizNo() {
-    java.lang.Object ref = bizNo_;
+  public java.lang.String getData() {
+    java.lang.Object ref = data_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      bizNo_ = s;
+      data_ = s;
       return s;
     }
   }
   /**
-   * <code>string bizNo = 4;</code>
+   * <code>string data = 4;</code>
    */
   public com.google.protobuf.ByteString
-      getBizNoBytes() {
-    java.lang.Object ref = bizNo_;
+      getDataBytes() {
+    java.lang.Object ref = data_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      bizNo_ = b;
+      data_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
@@ -218,14 +218,14 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     if (code_ != 0) {
       output.writeInt32(1, code_);
     }
-    if (!getErrorCodeBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, errorCode_);
-    }
     if (!getInfoBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, info_);
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, info_);
     }
     if (!getBizNoBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, bizNo_);
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, bizNo_);
+    }
+    if (!getDataBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, data_);
     }
   }
 
@@ -238,14 +238,14 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(1, code_);
     }
-    if (!getErrorCodeBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, errorCode_);
-    }
     if (!getInfoBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, info_);
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, info_);
     }
     if (!getBizNoBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, bizNo_);
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, bizNo_);
+    }
+    if (!getDataBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, data_);
     }
     memoizedSize = size;
     return size;
@@ -265,12 +265,12 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     boolean result = true;
     result = result && (getCode()
         == other.getCode());
-    result = result && getErrorCode()
-        .equals(other.getErrorCode());
     result = result && getInfo()
         .equals(other.getInfo());
     result = result && getBizNo()
         .equals(other.getBizNo());
+    result = result && getData()
+        .equals(other.getData());
     return result;
   }
 
@@ -283,12 +283,12 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     hash = (19 * hash) + getDescriptor().hashCode();
     hash = (37 * hash) + CODE_FIELD_NUMBER;
     hash = (53 * hash) + getCode();
-    hash = (37 * hash) + ERRORCODE_FIELD_NUMBER;
-    hash = (53 * hash) + getErrorCode().hashCode();
     hash = (37 * hash) + INFO_FIELD_NUMBER;
     hash = (53 * hash) + getInfo().hashCode();
     hash = (37 * hash) + BIZNO_FIELD_NUMBER;
     hash = (53 * hash) + getBizNo().hashCode();
+    hash = (37 * hash) + DATA_FIELD_NUMBER;
+    hash = (53 * hash) + getData().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -420,12 +420,12 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       super.clear();
       code_ = 0;
 
-      errorCode_ = "";
-
       info_ = "";
 
       bizNo_ = "";
 
+      data_ = "";
+
       return this;
     }
 
@@ -449,9 +449,9 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
     public com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse buildPartial() {
       com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse result = new com.ywt.gapi.drug.SaveHisOpenApiPrescriptionResponse(this);
       result.code_ = code_;
-      result.errorCode_ = errorCode_;
       result.info_ = info_;
       result.bizNo_ = bizNo_;
+      result.data_ = data_;
       onBuilt();
       return result;
     }
@@ -496,10 +496,6 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       if (other.getCode() != 0) {
         setCode(other.getCode());
       }
-      if (!other.getErrorCode().isEmpty()) {
-        errorCode_ = other.errorCode_;
-        onChanged();
-      }
       if (!other.getInfo().isEmpty()) {
         info_ = other.info_;
         onChanged();
@@ -508,6 +504,10 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
         bizNo_ = other.bizNo_;
         onChanged();
       }
+      if (!other.getData().isEmpty()) {
+        data_ = other.data_;
+        onChanged();
+      }
       onChanged();
       return this;
     }
@@ -560,209 +560,209 @@ public  final class SaveHisOpenApiPrescriptionResponse extends
       return this;
     }
 
-    private java.lang.Object errorCode_ = "";
+    private java.lang.Object info_ = "";
     /**
-     * <code>string errorCode = 2;</code>
+     * <code>string info = 2;</code>
      */
-    public java.lang.String getErrorCode() {
-      java.lang.Object ref = errorCode_;
+    public java.lang.String getInfo() {
+      java.lang.Object ref = info_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        errorCode_ = s;
+        info_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
       }
     }
     /**
-     * <code>string errorCode = 2;</code>
+     * <code>string info = 2;</code>
      */
     public com.google.protobuf.ByteString
-        getErrorCodeBytes() {
-      java.lang.Object ref = errorCode_;
+        getInfoBytes() {
+      java.lang.Object ref = info_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        errorCode_ = b;
+        info_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
     /**
-     * <code>string errorCode = 2;</code>
+     * <code>string info = 2;</code>
      */
-    public Builder setErrorCode(
+    public Builder setInfo(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      errorCode_ = value;
+      info_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>string errorCode = 2;</code>
+     * <code>string info = 2;</code>
      */
-    public Builder clearErrorCode() {
+    public Builder clearInfo() {
       
-      errorCode_ = getDefaultInstance().getErrorCode();
+      info_ = getDefaultInstance().getInfo();
       onChanged();
       return this;
     }
     /**
-     * <code>string errorCode = 2;</code>
+     * <code>string info = 2;</code>
      */
-    public Builder setErrorCodeBytes(
+    public Builder setInfoBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      errorCode_ = value;
+      info_ = value;
       onChanged();
       return this;
     }
 
-    private java.lang.Object info_ = "";
+    private java.lang.Object bizNo_ = "";
     /**
-     * <code>string info = 3;</code>
+     * <code>string bizNo = 3;</code>
      */
-    public java.lang.String getInfo() {
-      java.lang.Object ref = info_;
+    public java.lang.String getBizNo() {
+      java.lang.Object ref = bizNo_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        info_ = s;
+        bizNo_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
       }
     }
     /**
-     * <code>string info = 3;</code>
+     * <code>string bizNo = 3;</code>
      */
     public com.google.protobuf.ByteString
-        getInfoBytes() {
-      java.lang.Object ref = info_;
+        getBizNoBytes() {
+      java.lang.Object ref = bizNo_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        info_ = b;
+        bizNo_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
     /**
-     * <code>string info = 3;</code>
+     * <code>string bizNo = 3;</code>
      */
-    public Builder setInfo(
+    public Builder setBizNo(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      info_ = value;
+      bizNo_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>string info = 3;</code>
+     * <code>string bizNo = 3;</code>
      */
-    public Builder clearInfo() {
+    public Builder clearBizNo() {
       
-      info_ = getDefaultInstance().getInfo();
+      bizNo_ = getDefaultInstance().getBizNo();
       onChanged();
       return this;
     }
     /**
-     * <code>string info = 3;</code>
+     * <code>string bizNo = 3;</code>
      */
-    public Builder setInfoBytes(
+    public Builder setBizNoBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      info_ = value;
+      bizNo_ = value;
       onChanged();
       return this;
     }
 
-    private java.lang.Object bizNo_ = "";
+    private java.lang.Object data_ = "";
     /**
-     * <code>string bizNo = 4;</code>
+     * <code>string data = 4;</code>
      */
-    public java.lang.String getBizNo() {
-      java.lang.Object ref = bizNo_;
+    public java.lang.String getData() {
+      java.lang.Object ref = data_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        bizNo_ = s;
+        data_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
       }
     }
     /**
-     * <code>string bizNo = 4;</code>
+     * <code>string data = 4;</code>
      */
     public com.google.protobuf.ByteString
-        getBizNoBytes() {
-      java.lang.Object ref = bizNo_;
+        getDataBytes() {
+      java.lang.Object ref = data_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        bizNo_ = b;
+        data_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
     /**
-     * <code>string bizNo = 4;</code>
+     * <code>string data = 4;</code>
      */
-    public Builder setBizNo(
+    public Builder setData(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      bizNo_ = value;
+      data_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>string bizNo = 4;</code>
+     * <code>string data = 4;</code>
      */
-    public Builder clearBizNo() {
+    public Builder clearData() {
       
-      bizNo_ = getDefaultInstance().getBizNo();
+      data_ = getDefaultInstance().getData();
       onChanged();
       return this;
     }
     /**
-     * <code>string bizNo = 4;</code>
+     * <code>string data = 4;</code>
      */
-    public Builder setBizNoBytes(
+    public Builder setDataBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      bizNo_ = value;
+      data_ = value;
       onChanged();
       return this;
     }

+ 12 - 12
src/main/java/com/ywt/gapi/drug/SaveHisOpenApiPrescriptionResponseOrBuilder.java

@@ -13,32 +13,32 @@ public interface SaveHisOpenApiPrescriptionResponseOrBuilder extends
   int getCode();
 
   /**
-   * <code>string errorCode = 2;</code>
+   * <code>string info = 2;</code>
    */
-  java.lang.String getErrorCode();
+  java.lang.String getInfo();
   /**
-   * <code>string errorCode = 2;</code>
+   * <code>string info = 2;</code>
    */
   com.google.protobuf.ByteString
-      getErrorCodeBytes();
+      getInfoBytes();
 
   /**
-   * <code>string info = 3;</code>
+   * <code>string bizNo = 3;</code>
    */
-  java.lang.String getInfo();
+  java.lang.String getBizNo();
   /**
-   * <code>string info = 3;</code>
+   * <code>string bizNo = 3;</code>
    */
   com.google.protobuf.ByteString
-      getInfoBytes();
+      getBizNoBytes();
 
   /**
-   * <code>string bizNo = 4;</code>
+   * <code>string data = 4;</code>
    */
-  java.lang.String getBizNo();
+  java.lang.String getData();
   /**
-   * <code>string bizNo = 4;</code>
+   * <code>string data = 4;</code>
    */
   com.google.protobuf.ByteString
-      getBizNoBytes();
+      getDataBytes();
 }