病历保存修改

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

@@ -1,173 +1,186 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 问诊记录明细表
- * </p>
- *
- * @author zhoutg
- * @since 2019-03-18
- */
-@TableName("icss_inquiry_detail")
-public class InquiryDetail implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 问诊记录id
-     */
-    private Long inquiryId;
-
-    /**
-     * 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）
-     */
-    private Integer type;
-
-    /**
-     * 内容字符串
-     */
-    private String content;
-
-    /**
-     * 内容字符串纯文本
-     */
-    private String contentValue;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getInquiryId() {
-        return inquiryId;
-    }
-
-    public void setInquiryId(Long inquiryId) {
-        this.inquiryId = inquiryId;
-    }
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-    public String getContentValue() {
-        return contentValue;
-    }
-
-    public void setContentValue(String contentValue) {
-        this.contentValue = contentValue;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "InquiryDetail{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", inquiryId=" + inquiryId +
-        ", type=" + type +
-        ", content=" + content +
-        ", contentValue=" + contentValue +
-        ", remark=" + remark +
-        "}";
-    }
-}
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 问诊记录明细表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-07-31
+ */
+@TableName("icss_inquiry_detail")
+public class InquiryDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 问诊记录id
+     */
+    private Long inquiryId;
+
+    /**
+     * 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱，9二次诊断）
+     */
+    private Integer type;
+
+    /**
+     * 内容字符串
+     */
+    private String content;
+
+    /**
+     * 内容字符串json
+     */
+    private String contentJson;
+
+    /**
+     * 内容字符串纯文本
+     */
+    private String contentValue;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getInquiryId() {
+        return inquiryId;
+    }
+
+    public void setInquiryId(Long inquiryId) {
+        this.inquiryId = inquiryId;
+    }
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    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;
+    }
+
+    public void setContentValue(String contentValue) {
+        this.contentValue = contentValue;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "InquiryDetail{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", inquiryId=" + inquiryId +
+        ", type=" + type +
+        ", content=" + content +
+        ", contentJson=" + contentJson +
+        ", contentValue=" + contentValue +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -126,42 +126,26 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq("doctor_id", saveInquiryVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", saveInquiryVO.getPatientId());
         inquiryInfoQe.eq("inquiry_code", saveInquiryVO.getInquiryCode());
-        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
-
-        Long inquiryId = null;
-        InquiryInfo inquiryInfoSave = new InquiryInfo();
-        inquiryInfoSave.setHospitalId(saveInquiryVO.getHospitalId());
-        inquiryInfoSave.setHospitalDeptId(saveInquiryVO.getHospitalDeptId());
-        inquiryInfoSave.setDoctorId(saveInquiryVO.getDoctorId());
-        inquiryInfoSave.setPatientId(saveInquiryVO.getPatientId());
-        inquiryInfoSave.setInquiryCode(saveInquiryVO.getInquiryCode());
-        inquiryInfoSave.setRegVisitedState(saveInquiryVO.getRegVisitedState());
-        inquiryInfoSave.setType(saveInquiryVO.getType());
-        inquiryInfoSave.setDiagnose(saveInquiryVO.getDiagnose());
-        inquiryInfoSave.setSign(saveInquiryVO.getSign());
-        inquiryInfoSave.setDataJson(saveInquiryVO.getDataJson());
+        InquiryInfo inquiryInfo = getOne(inquiryInfoQe);
+
         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);
-
-            inquiryDetailFacade.removeByInquiryId(inquiryId);
-            inquiryDrugFacade.removeByInquiryId(inquiryId);
-            inquiryEvaluationFacade.removeByInquiryId(inquiryId);
-            inquiryScaleFacade.removeByInquiryId(inquiryId);
+            inquiryDetailFacade.removeByInquiryId(inquiryInfo.getId());
+            inquiryDrugFacade.removeByInquiryId(inquiryInfo.getId());
+            inquiryEvaluationFacade.removeByInquiryId(inquiryInfo.getId());
+            inquiryScaleFacade.removeByInquiryId(inquiryInfo.getId());
         }
+        inquiryInfo.setGmtModified(now);
+        BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);
+        this.saveOrUpdate(inquiryInfo);
 
-        Long inquiryId_ = inquiryId;
+        Long inquiryId = inquiryInfo.getId();
         if (ListUtil.isNotEmpty(saveInquiryVO.getDetailList())) {
             List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
             inquiryDetailList.forEach(i->{
-            	i.setInquiryId(inquiryId_);
+            	i.setInquiryId(inquiryId);
                 i.setGmtCreate(now);
                 i.setGmtModified(now);
             });
@@ -170,8 +154,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         if (ListUtil.isNotEmpty(saveInquiryVO.getDrugList())) {
             List<InquiryDrug> inquiryDrugList = BeanUtil.listCopyTo(saveInquiryVO.getDrugList(), InquiryDrug.class);
-            inquiryDrugList.stream().forEach(i -> {
-                i.setInquiryId(inquiryId_);
+            inquiryDrugList.forEach(i -> {
+                i.setInquiryId(inquiryId);
                 i.setGmtCreate(now);
                 i.setGmtModified(now);
             });
@@ -180,7 +164,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         if (saveInquiryVO.getInquiryEvaluation() != null) {
             InquiryEvaluation inquiryEvaluation = new InquiryEvaluation();
-            inquiryEvaluation.setInquiryId(inquiryId_);
+            inquiryEvaluation.setInquiryId(inquiryId);
             inquiryEvaluation.setGmtCreate(now);
             inquiryEvaluation.setGmtModified(now);
             inquiryEvaluation.setHtmlContent(saveInquiryVO.getInquiryEvaluation().getHtmlContent());
@@ -189,7 +173,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             if (ListUtil.isNotEmpty(saveInquiryVO.getInquiryEvaluation().getScaleList())) {
                 List<InquiryScale> inquiryScaleList = BeanUtil.listCopyTo(saveInquiryVO.getInquiryEvaluation().getScaleList(), InquiryScale.class);
                 inquiryScaleList.forEach(i -> {
-                    i.setInquiryId(inquiryId_);
+                    i.setInquiryId(inquiryId);
                     i.setInquiryEvaluationId(inquiryEvaluation.getId());
                     i.setGmtCreate(now);
                     i.setGmtModified(now);
@@ -209,7 +193,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         saveInquiryToHisVO.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
         RespDTOUtil.respNGDeal(tranServiceClient.saveInquiryToHis(saveInquiryToHisVO), "问诊记录插入tran层失败");
 
-        saveInquiryDTO.setInquiryId(inquiryId_);
+        saveInquiryDTO.setInquiryId(inquiryId);
         
         return saveInquiryDTO;
     }

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

@@ -34,6 +34,12 @@ public class SaveInquiryDetailVO {
     @ApiModelProperty(value="内容字符串")
     private String content;
     
+    /**
+     * 内容字符串json
+     */
+    @ApiModelProperty(value="内容字符串json")
+    private String contentJson;
+    
     /**
      * 内容字符串纯文本
      */

icss-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>