历史病历列表修改

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

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

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

@@ -13,7 +13,7 @@ import lombok.Setter;
 public class SaveInquiryToHisDetailVO {
 	
 	/**
-     * 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）
+     * 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱，9二次诊断）
      */
     private Integer type;
     
@@ -21,6 +21,11 @@ public class SaveInquiryToHisDetailVO {
      * 内容字符串
      */
     private String content;
+    
+    /**
+     * 内容字符串json
+     */
+    private String contentJson;
 
     /**
      * 内容字符串纯文本

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

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

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

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author zhaops
- * @since 2019-06-04
+ * @since 2019-07-31
  */
 @TableName("tran_inquiry_detail")
 public class InquiryDetail implements Serializable {
@@ -66,6 +66,11 @@ public class InquiryDetail implements Serializable {
      */
     private String content;
 
+    /**
+     * 内容字符串json
+     */
+    private String contentJson;
+
     /**
      * 内容字符串纯文本
      */
@@ -139,6 +144,13 @@ public class InquiryDetail implements Serializable {
     public void setContent(String content) {
         this.content = content;
     }
+    public String getContentJson() {
+        return contentJson;
+    }
+
+    public void setContentJson(String contentJson) {
+        this.contentJson = contentJson;
+    }
     public String getContentValue() {
         return contentValue;
     }
@@ -166,6 +178,7 @@ public class InquiryDetail implements Serializable {
         ", inquiryId=" + inquiryId +
         ", type=" + type +
         ", content=" + content +
+        ", contentJson=" + contentJson +
         ", contentValue=" + contentValue +
         ", remark=" + remark +
         "}";

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

@@ -55,7 +55,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
      * @return
      */
     public Boolean saveInquiryToHis(SaveInquiryToHisVO saveInquiryToHisVO) {
-        
         Date now = new Date();
 
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
@@ -65,40 +64,25 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
         inquiryInfoQe.eq("doctor_id", saveInquiryToHisVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", saveInquiryToHisVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", saveInquiryToHisVO.getInquiryCode());
-        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
+        InquiryInfo inquiryInfo = getOne(inquiryInfoQe);
 
-        Long inquiryId = null;
-        InquiryInfo inquiryInfoSave = new InquiryInfo();
-        inquiryInfoSave.setHospitalId(saveInquiryToHisVO.getHospitalId());
-        inquiryInfoSave.setHospitalDeptId(saveInquiryToHisVO.getHospitalDeptId());
-        inquiryInfoSave.setDoctorId(saveInquiryToHisVO.getDoctorId());
-        inquiryInfoSave.setPatientId(saveInquiryToHisVO.getPatientId());
-        inquiryInfoSave.setInquiryCode(saveInquiryToHisVO.getInquiryCode());
-        inquiryInfoSave.setRegVisitedState(saveInquiryToHisVO.getRegVisitedState());
-        inquiryInfoSave.setType(saveInquiryToHisVO.getType());
-        inquiryInfoSave.setDiagnose(saveInquiryToHisVO.getDiagnose());
-        inquiryInfoSave.setDataJson(saveInquiryToHisVO.getDataJson());
-        inquiryInfoSave.setSysType(saveInquiryToHisVO.getSysType());
         if (inquiryInfo == null) {
-            inquiryInfoSave.setGmtCreate(now);
-            inquiryInfoSave.setGmtModified(now);
-            this.save(inquiryInfoSave);
-            inquiryId = inquiryInfoSave.getId();
+        	inquiryInfo = new InquiryInfo();
+        	inquiryInfo.setGmtCreate(now);
         } else {
-            inquiryId = inquiryInfo.getId();
-            inquiryInfoSave.setId(inquiryId);
-            inquiryInfoSave.setGmtModified(now);
-            this.updateById(inquiryInfoSave);
-            
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
-            inquiryDetailQe.eq("inquiry_id", inquiryId);
+            inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
             inquiryDetailQe.ne("type", 9);
             inquiryDetailFacade.remove(inquiryDetailQe);
         }
-
+        
+        inquiryInfo.setGmtModified(now);
+        BeanUtil.copyProperties(saveInquiryToHisVO, inquiryInfo);
+        saveOrUpdate(inquiryInfo);
+        
         List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryToHisVO.getDetailList(), InquiryDetail.class);
         for(InquiryDetail i : inquiryDetailList){
-        	i.setInquiryId(inquiryId);
+        	i.setInquiryId(inquiryInfo.getId());
         	i.setGmtCreate(now);
         	i.setGmtModified(now);
         }

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

@@ -21,6 +21,11 @@ public class SaveInquiryToHisDetailVO {
      * 内容字符串
      */
     private String content;
+    
+    /**
+     * 内容字符串json
+     */
+    private String contentJson;
 
     /**
      * 内容字符串纯文本

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

@@ -13,6 +13,7 @@
         <result column="inquiry_id" property="inquiryId" />
         <result column="type" property="type" />
         <result column="content" property="content" />
+        <result column="content_json" property="contentJson" />
         <result column="content_value" property="contentValue" />
         <result column="remark" property="remark" />
     </resultMap>

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

@@ -37,8 +37,7 @@
 		a.inquiry_code AS inquiryCode,
 		a.hospital_dept_id AS hospitalDeptId,
 		c.`name` AS hospitalDeptName,
-		a.patient_id AS patientId,
-		a.data_json AS dataJson
+		a.patient_id AS patientId
 		FROM tran_inquiry_info a
 		LEFT JOIN
 		(SELECT