Browse Source

fix 修改接口,新增参数

DYH2020 1 year ago
parent
commit
5f7edbfcd5

+ 2 - 0
grpc_def/drug.proto

@@ -106,6 +106,8 @@ message PrescriptionInfo {
 	string patientAddress = 60;
 	string remarks = 61;
 	bool addressModified = 62;// 是否已修改过配送地址
+	string postSource = 63;         //邮寄服务
+	string presctype = 64;         //类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
 }
 message SaveHisOpenApiPrescriptionRequest {
 	repeated PrescriptionInfo prescriptionInfos = 1;

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

@@ -43,7 +43,7 @@ public final class Drug {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\ndrug.proto\022\021com.ywt.gapi.drug\"\246\017\n\020Pres" +
+      "\n\ndrug.proto\022\021com.ywt.gapi.drug\"\315\017\n\020Pres" +
       "criptionInfo\022\r\n\005no3th\030\001 \001(\t\022\022\n\ndoctorNam" +
       "e\030\002 \001(\t\022\023\n\013patientName\030\003 \001(\t\022\022\n\npatientA" +
       "ge\030\004 \001(\t\022\022\n\npatientSex\030\005 \001(\t\022\021\n\tpatientN" +
@@ -76,33 +76,34 @@ public final class Drug {
       "8 \001(\t\022\025\n\rpatientAgeInt\0309 \001(\005\022\025\n\rpatientS" +
       "exInt\030: \001(\005\022\020\n\010icdCodes\030; \001(\t\022\026\n\016patient" +
       "Address\030< \001(\t\022\017\n\007remarks\030= \001(\t\022\027\n\017addres" +
-      "sModified\030> \001(\010\032\216\005\n\024PrescriptionDrugInfo" +
-      "\022\020\n\010drugCode\030\001 \001(\t\022\023\n\013drugCode3th\030\002 \001(\t\022" +
-      "\021\n\toneDosage\030\003 \001(\001\022\025\n\roneDosageUnit\030\004 \001(" +
-      "\t\022\016\n\006amount\030\005 \001(\005\022\r\n\005units\030\006 \001(\t\022\025\n\rfreq" +
-      "uencyCode\030\007 \001(\t\022\021\n\tfrequency\030\010 \001(\t\022\024\n\014fr" +
-      "equencyQty\030\t \001(\005\022\021\n\tusageCode\030\n \001(\t\022\r\n\005u" +
-      "sage\030\013 \001(\t\022\r\n\005price\030\014 \001(\005\022\020\n\010drugName\030\r ",
-      "\001(\t\022\020\n\010drugSpec\030\016 \001(\t\022\020\n\010quantity\030\017 \001(\005\022" +
-      "\r\n\005total\030\020 \001(\005\022\016\n\006course\030\021 \001(\005\022\r\n\005group\030" +
-      "\022 \001(\005\022\022\n\norderIndex\030\023 \001(\005\022\023\n\013combination" +
-      "\030\024 \001(\005\022\016\n\006remark\030\025 \001(\t\022\023\n\013executeDate\030\026 " +
-      "\001(\t\022\022\n\ninjections\030\027 \001(\005\022\022\n\npackDetail\030\030 " +
-      "\001(\t\022\027\n\017oneDosageDetail\030\031 \001(\t\022\024\n\014usageRem" +
-      "arks\030\032 \001(\t\022\025\n\rdrugPrintName\030\033 \001(\t\022\031\n\021dru" +
-      "gRefrigeration\030\034 \001(\t\022\016\n\006drugId\030\035 \001(\005\022\020\n\010" +
-      "producer\030\036 \001(\t\022\022\n\nspecDosage\030\037 \001(\001\022\020\n\010ad" +
-      "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\"]\n\"SaveHisOp" +
-      "enApiPrescriptionResponse\022\014\n\004code\030\001 \001(\005\022" +
-      "\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"
+      "sModified\030> \001(\010\022\022\n\npostSource\030? \001(\t\022\021\n\tp" +
+      "resctype\030@ \001(\t\032\216\005\n\024PrescriptionDrugInfo\022" +
+      "\020\n\010drugCode\030\001 \001(\t\022\023\n\013drugCode3th\030\002 \001(\t\022\021" +
+      "\n\toneDosage\030\003 \001(\001\022\025\n\roneDosageUnit\030\004 \001(\t" +
+      "\022\016\n\006amount\030\005 \001(\005\022\r\n\005units\030\006 \001(\t\022\025\n\rfrequ" +
+      "encyCode\030\007 \001(\t\022\021\n\tfrequency\030\010 \001(\t\022\024\n\014fre" +
+      "quencyQty\030\t \001(\005\022\021\n\tusageCode\030\n \001(\t\022\r\n\005us",
+      "age\030\013 \001(\t\022\r\n\005price\030\014 \001(\005\022\020\n\010drugName\030\r \001" +
+      "(\t\022\020\n\010drugSpec\030\016 \001(\t\022\020\n\010quantity\030\017 \001(\005\022\r" +
+      "\n\005total\030\020 \001(\005\022\016\n\006course\030\021 \001(\005\022\r\n\005group\030\022" +
+      " \001(\005\022\022\n\norderIndex\030\023 \001(\005\022\023\n\013combination\030" +
+      "\024 \001(\005\022\016\n\006remark\030\025 \001(\t\022\023\n\013executeDate\030\026 \001" +
+      "(\t\022\022\n\ninjections\030\027 \001(\005\022\022\n\npackDetail\030\030 \001" +
+      "(\t\022\027\n\017oneDosageDetail\030\031 \001(\t\022\024\n\014usageRema" +
+      "rks\030\032 \001(\t\022\025\n\rdrugPrintName\030\033 \001(\t\022\031\n\021drug" +
+      "Refrigeration\030\034 \001(\t\022\016\n\006drugId\030\035 \001(\005\022\020\n\010p" +
+      "roducer\030\036 \001(\t\022\022\n\nspecDosage\030\037 \001(\001\022\020\n\010adv",
+      "iceId\030  \001(\t\022\022\n\nadviceFlag\030! \001(\005\"q\n!SaveH" +
+      "isOpenApiPrescriptionRequest\022>\n\021prescrip" +
+      "tionInfos\030\001 \003(\0132#.com.ywt.gapi.drug.Pres" +
+      "criptionInfo\022\014\n\004flag\030\002 \001(\005\"]\n\"SaveHisOpe" +
+      "nApiPrescriptionResponse\022\014\n\004code\030\001 \001(\005\022\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\032saveHisOpenApiPres" +
+      "cription\0224.com.ywt.gapi.drug.SaveHisOpen" +
+      "ApiPrescriptionRequest\0325.com.ywt.gapi.dr" +
+      "ug.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() {
@@ -121,7 +122,7 @@ public final class Drug {
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_com_ywt_gapi_drug_PrescriptionInfo_descriptor,
-        new java.lang.String[] { "No3Th", "DoctorName", "PatientName", "PatientAge", "PatientSex", "PatientNo", "Diagnose", "Dept", "Source", "HosptialCode", "HosptialId", "OrgCode3Th", "Drugs", "TotalPrice", "Status", "StatusStr", "CreateOn", "PayStatus", "CreateOnStr", "PatientMobile", "Description", "AllergicHistory", "DoctorSignId", "PrescriptionId", "BizNo", "UserId", "HisOrderNo", "AddressId", "DeliveryMethod", "SendNo", "QrCodeUrl", "PharmacyAddress", "PharmacyName", "FinshTime", "DoctorId", "Individual", "ExtStatus", "NeedPrintStatus", "Freight", "IdCardNo", "PharmacyId", "PrescriptionDate", "TimeStandard", "OrderNo", "OrderId", "RefundNo", "RefundStatus", "PayTime", "InvoiceEndTime", "Terminal", "HisOeoriOrderId", "HisPatientId", "HisClinicCode", "CancelStatus", "CancelRemark", "PatientAgeInt", "PatientSexInt", "IcdCodes", "PatientAddress", "Remarks", "AddressModified", });
+        new java.lang.String[] { "No3Th", "DoctorName", "PatientName", "PatientAge", "PatientSex", "PatientNo", "Diagnose", "Dept", "Source", "HosptialCode", "HosptialId", "OrgCode3Th", "Drugs", "TotalPrice", "Status", "StatusStr", "CreateOn", "PayStatus", "CreateOnStr", "PatientMobile", "Description", "AllergicHistory", "DoctorSignId", "PrescriptionId", "BizNo", "UserId", "HisOrderNo", "AddressId", "DeliveryMethod", "SendNo", "QrCodeUrl", "PharmacyAddress", "PharmacyName", "FinshTime", "DoctorId", "Individual", "ExtStatus", "NeedPrintStatus", "Freight", "IdCardNo", "PharmacyId", "PrescriptionDate", "TimeStandard", "OrderNo", "OrderId", "RefundNo", "RefundStatus", "PayTime", "InvoiceEndTime", "Terminal", "HisOeoriOrderId", "HisPatientId", "HisClinicCode", "CancelStatus", "CancelRemark", "PatientAgeInt", "PatientSexInt", "IcdCodes", "PatientAddress", "Remarks", "AddressModified", "PostSource", "Presctype", });
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_PrescriptionDrugInfo_descriptor =
       internal_static_com_ywt_gapi_drug_PrescriptionInfo_descriptor.getNestedTypes().get(0);
     internal_static_com_ywt_gapi_drug_PrescriptionInfo_PrescriptionDrugInfo_fieldAccessorTable = new

+ 310 - 0
src/main/java/com/ywt/gapi/drug/PrescriptionInfo.java

@@ -80,6 +80,8 @@ public  final class PrescriptionInfo extends
     patientAddress_ = "";
     remarks_ = "";
     addressModified_ = false;
+    postSource_ = "";
+    presctype_ = "";
   }
 
   @java.lang.Override
@@ -451,6 +453,18 @@ public  final class PrescriptionInfo extends
             addressModified_ = input.readBool();
             break;
           }
+          case 506: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            postSource_ = s;
+            break;
+          }
+          case 514: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            presctype_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6377,6 +6391,90 @@ public  final class PrescriptionInfo extends
     return addressModified_;
   }
 
+  public static final int POSTSOURCE_FIELD_NUMBER = 63;
+  private volatile java.lang.Object postSource_;
+  /**
+   * <pre>
+   *邮寄服务
+   * </pre>
+   *
+   * <code>string postSource = 63;</code>
+   */
+  public java.lang.String getPostSource() {
+    java.lang.Object ref = postSource_;
+    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();
+      postSource_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   *邮寄服务
+   * </pre>
+   *
+   * <code>string postSource = 63;</code>
+   */
+  public com.google.protobuf.ByteString
+      getPostSourceBytes() {
+    java.lang.Object ref = postSource_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      postSource_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PRESCTYPE_FIELD_NUMBER = 64;
+  private volatile java.lang.Object presctype_;
+  /**
+   * <pre>
+   *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+   * </pre>
+   *
+   * <code>string presctype = 64;</code>
+   */
+  public java.lang.String getPresctype() {
+    java.lang.Object ref = presctype_;
+    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();
+      presctype_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+   * </pre>
+   *
+   * <code>string presctype = 64;</code>
+   */
+  public com.google.protobuf.ByteString
+      getPresctypeBytes() {
+    java.lang.Object ref = presctype_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      presctype_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -6572,6 +6670,12 @@ public  final class PrescriptionInfo extends
     if (addressModified_ != false) {
       output.writeBool(62, addressModified_);
     }
+    if (!getPostSourceBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 63, postSource_);
+    }
+    if (!getPresctypeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 64, presctype_);
+    }
   }
 
   public int getSerializedSize() {
@@ -6789,6 +6893,12 @@ public  final class PrescriptionInfo extends
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(62, addressModified_);
     }
+    if (!getPostSourceBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(63, postSource_);
+    }
+    if (!getPresctypeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(64, presctype_);
+    }
     memoizedSize = size;
     return size;
   }
@@ -6927,6 +7037,10 @@ public  final class PrescriptionInfo extends
         .equals(other.getRemarks());
     result = result && (getAddressModified()
         == other.getAddressModified());
+    result = result && getPostSource()
+        .equals(other.getPostSource());
+    result = result && getPresctype()
+        .equals(other.getPresctype());
     return result;
   }
 
@@ -7065,6 +7179,10 @@ public  final class PrescriptionInfo extends
     hash = (37 * hash) + ADDRESSMODIFIED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getAddressModified());
+    hash = (37 * hash) + POSTSOURCE_FIELD_NUMBER;
+    hash = (53 * hash) + getPostSource().hashCode();
+    hash = (37 * hash) + PRESCTYPE_FIELD_NUMBER;
+    hash = (53 * hash) + getPresctype().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -7325,6 +7443,10 @@ public  final class PrescriptionInfo extends
 
       addressModified_ = false;
 
+      postSource_ = "";
+
+      presctype_ = "";
+
       return this;
     }
 
@@ -7420,6 +7542,8 @@ public  final class PrescriptionInfo extends
       result.patientAddress_ = patientAddress_;
       result.remarks_ = remarks_;
       result.addressModified_ = addressModified_;
+      result.postSource_ = postSource_;
+      result.presctype_ = presctype_;
       result.bitField0_ = to_bitField0_;
       result.bitField1_ = to_bitField1_;
       onBuilt();
@@ -7703,6 +7827,14 @@ public  final class PrescriptionInfo extends
       if (other.getAddressModified() != false) {
         setAddressModified(other.getAddressModified());
       }
+      if (!other.getPostSource().isEmpty()) {
+        postSource_ = other.postSource_;
+        onChanged();
+      }
+      if (!other.getPresctype().isEmpty()) {
+        presctype_ = other.presctype_;
+        onChanged();
+      }
       onChanged();
       return this;
     }
@@ -11496,6 +11628,184 @@ public  final class PrescriptionInfo extends
       onChanged();
       return this;
     }
+
+    private java.lang.Object postSource_ = "";
+    /**
+     * <pre>
+     *邮寄服务
+     * </pre>
+     *
+     * <code>string postSource = 63;</code>
+     */
+    public java.lang.String getPostSource() {
+      java.lang.Object ref = postSource_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        postSource_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     *邮寄服务
+     * </pre>
+     *
+     * <code>string postSource = 63;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPostSourceBytes() {
+      java.lang.Object ref = postSource_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        postSource_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     *邮寄服务
+     * </pre>
+     *
+     * <code>string postSource = 63;</code>
+     */
+    public Builder setPostSource(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      postSource_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *邮寄服务
+     * </pre>
+     *
+     * <code>string postSource = 63;</code>
+     */
+    public Builder clearPostSource() {
+      
+      postSource_ = getDefaultInstance().getPostSource();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *邮寄服务
+     * </pre>
+     *
+     * <code>string postSource = 63;</code>
+     */
+    public Builder setPostSourceBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      postSource_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object presctype_ = "";
+    /**
+     * <pre>
+     *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+     * </pre>
+     *
+     * <code>string presctype = 64;</code>
+     */
+    public java.lang.String getPresctype() {
+      java.lang.Object ref = presctype_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        presctype_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+     * </pre>
+     *
+     * <code>string presctype = 64;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPresctypeBytes() {
+      java.lang.Object ref = presctype_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        presctype_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+     * </pre>
+     *
+     * <code>string presctype = 64;</code>
+     */
+    public Builder setPresctype(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      presctype_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+     * </pre>
+     *
+     * <code>string presctype = 64;</code>
+     */
+    public Builder clearPresctype() {
+      
+      presctype_ = getDefaultInstance().getPresctype();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+     * </pre>
+     *
+     * <code>string presctype = 64;</code>
+     */
+    public Builder setPresctypeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      presctype_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return this;

+ 36 - 0
src/main/java/com/ywt/gapi/drug/PrescriptionInfoOrBuilder.java

@@ -688,4 +688,40 @@ public interface PrescriptionInfoOrBuilder extends
    * <code>bool addressModified = 62;</code>
    */
   boolean getAddressModified();
+
+  /**
+   * <pre>
+   *邮寄服务
+   * </pre>
+   *
+   * <code>string postSource = 63;</code>
+   */
+  java.lang.String getPostSource();
+  /**
+   * <pre>
+   *邮寄服务
+   * </pre>
+   *
+   * <code>string postSource = 63;</code>
+   */
+  com.google.protobuf.ByteString
+      getPostSourceBytes();
+
+  /**
+   * <pre>
+   *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+   * </pre>
+   *
+   * <code>string presctype = 64;</code>
+   */
+  java.lang.String getPresctype();
+  /**
+   * <pre>
+   *类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+   * </pre>
+   *
+   * <code>string presctype = 64;</code>
+   */
+  com.google.protobuf.ByteString
+      getPresctypeBytes();
 }

+ 14 - 0
src/main/java/com/ywt/mg/models/PrescriptionPushApiRequest/PrescriptionDetailInfo.java

@@ -38,6 +38,12 @@ public class PrescriptionDetailInfo implements Serializable {
     @JsonProperty("diagnosis")
     private String diagnosis;
 
+    /**
+     * 类型:“O”为门诊,“I”为住院  “E”为急诊   “H”为体检
+     */
+    @JsonProperty("presctype")
+    private String presctype;
+
     public String getPrescriptionNumber() {
         return prescriptionNumber;
     }
@@ -77,4 +83,12 @@ public class PrescriptionDetailInfo implements Serializable {
     public void setDiagnosis(String diagnosis) {
         this.diagnosis = diagnosis;
     }
+
+    public String getPresctype() {
+        return presctype;
+    }
+
+    public void setPresctype(String presctype) {
+        this.presctype = presctype;
+    }
 }

+ 1 - 0
src/main/java/com/ywt/mg/web/controller/DrugController.java

@@ -169,6 +169,7 @@ public class DrugController {
                         .setPatientMobile(Checker.getStringValue(patient.getPhoneNumber()))
                         .setPrescriptionDate(prescription.getDetail().getPrescriptionTime())
                         .setHosptialId(hospitalId)
+                        .setPresctype(Checker.getStringValue(prescription.getDetail().getPresctype()))
                         //表示his 来源
                         .setSource(source);