Merge remote-tracking branch 'origin/dev/zzcx20200202_init' into dev/zzcx20200202_init

# Conflicts:
#	zzcx-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

zzcx-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -60,6 +60,11 @@ public class InquiryInfo implements Serializable {
      */
     private String diagnosis;
 
+    /**
+     * 医院名称
+     */
+    private String hospitalCode;
+
     /**
      * 访问者的IP
      */

zzcx-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -10,17 +10,9 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="app_id" property="appId" />
-        <result column="organ_name" property="organName" />
-        <result column="department" property="department" />
-        <result column="doctor_id" property="doctorId" />
-        <result column="doctor_name" property="doctorName" />
-        <result column="mpi_id" property="mpiId" />
-        <result column="patient_name" property="patientName" />
-        <result column="patient_age" property="patientAge" />
-        <result column="patient_sex" property="patientSex" />
+        <result column="hospital_code" property="hospitalCode" />
         <result column="diagnosis" property="diagnosis" />
-        <result column="ret_url" property="retUrl" />
+        <result column="ip" property="ip" />
         <result column="remark" property="remark" />
     </resultMap>
 

zzcx-service/src/main/resources/mapper/OptInfoMapper.xml

@@ -10,6 +10,7 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
+        <result column="hospital_code" property="hospitalCode" />
         <result column="ip" property="ip" />
         <result column="opt_type" property="optType" />
         <result column="remark" property="remark" />