急诊病历列表修改

icss-service/src/main/java/com/diagbot/dto/HisInquirysForJzDetailDTO.java

@@ -129,6 +129,12 @@ public class HisInquirysForJzDetailDTO{
      */
 	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
+	
+    /**
+     * 内容JSON字符串
+     */
+	@ApiModelProperty(value="内容JSON字符串")
+    private String dataJson;
     
 	/**
      * 病历明细

icss-service/src/main/java/com/diagbot/vo/SaveInquiryToHisVO.java

@@ -53,6 +53,11 @@ public class SaveInquiryToHisVO {
      * 诊断
      */
     private String diagnose;
+    
+    /**
+     * 内容JSON字符串
+     */
+    private String dataJson;
 
 	/**
 	 * 问诊明细

tran-service/src/main/java/com/diagbot/dto/HisInquirysForJzDetailDTO.java

@@ -111,6 +111,11 @@ public class HisInquirysForJzDetailDTO{
      */
     private String patientIdNo;
     
+    /**
+     * 内容JSON字符串
+     */
+    private String dataJson;
+    
 	/**
      * 病历明细
      */

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

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author zhaops
- * @since 2019-05-27
+ * @since 2019-06-03
  */
 @TableName("tran_inquiry_info")
 public class InquiryInfo implements Serializable {
@@ -91,6 +91,11 @@ public class InquiryInfo implements Serializable {
      */
     private String diagnose;
 
+    /**
+     * 内容JSON字符串
+     */
+    private String dataJson;
+
     /**
      * 备注
      */
@@ -194,6 +199,13 @@ public class InquiryInfo implements Serializable {
     public void setDiagnose(String diagnose) {
         this.diagnose = diagnose;
     }
+    public String getDataJson() {
+        return dataJson;
+    }
+
+    public void setDataJson(String dataJson) {
+        this.dataJson = dataJson;
+    }
     public String getRemark() {
         return remark;
     }
@@ -219,6 +231,7 @@ public class InquiryInfo implements Serializable {
         ", regVisitedState=" + regVisitedState +
         ", type=" + type +
         ", diagnose=" + diagnose +
+        ", dataJson=" + dataJson +
         ", remark=" + remark +
         "}";
     }

tran-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -77,6 +77,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
         inquiryInfoSave.setRegVisitedState(saveInquiryToHisVO.getRegVisitedState());
         inquiryInfoSave.setType(saveInquiryToHisVO.getType());
         inquiryInfoSave.setDiagnose(saveInquiryToHisVO.getDiagnose());
+        inquiryInfoSave.setDataJson(saveInquiryToHisVO.getDataJson());
         if (inquiryInfo == null) {
             inquiryInfoSave.setGmtCreate(now);
             inquiryInfoSave.setGmtModified(now);

tran-service/src/main/java/com/diagbot/vo/SaveInquiryToHisVO.java

@@ -53,6 +53,11 @@ public class SaveInquiryToHisVO {
      * 诊断
      */
     private String diagnose;
+    
+    /**
+     * 内容JSON字符串
+     */
+    private String dataJson;
 
 	/**
 	 * 问诊明细

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

@@ -18,6 +18,7 @@
         <result column="reg_visited_state" property="regVisitedState" />
         <result column="type" property="type" />
         <result column="diagnose" property="diagnose" />
+        <result column="data_json" property="dataJson" />
         <result column="remark" property="remark" />
     </resultMap>
     
@@ -35,7 +36,8 @@
 		a.inquiry_code AS inquiryCode,
 		a.hospital_dept_id AS hospitalDeptId,
 		c.`name` AS hospitalDeptName,
-		a.patient_id AS patientId	
+		a.patient_id AS patientId,
+		a.data_json AS dataJson
 		FROM tran_inquiry_info a
 		LEFT JOIN
 		(SELECT