Merge branch 'develop' into dev/precSR

data-service/src/main/java/com/diagbot/vo/HospitalSetVO.java

@@ -27,6 +27,11 @@ public class HospitalSetVO {
 	@ApiModelProperty(hidden = true)
 	private Integer sysType = SysTypeEnum.DATA_SERVICE.getKey();
 
+	/**
+	 * 方案编号
+	 */
+	private Integer plan;
+
 	/**
 	 * 配置名称
 	 */

docs/011.20190731ICSS历史病历优化增量脚本/init_icss.sql

@@ -0,0 +1,3 @@
+use `sys-icss`;
+ALTER TABLE `icss_inquiry_detail`
+ADD COLUMN `content_json`  text NULL COMMENT '内容字符串json' AFTER `content`;

docs/011.20190731ICSS历史病历优化增量脚本/init_med.sql

@@ -0,0 +1,3 @@
+use `med`;
+ALTER TABLE kl_concept ADD sort_deleted VARCHAR(5)  GENERATED ALWAYS AS ('Y' > is_deleted) VIRTUAL COMMENT '自动生成排序用删除标志';
+ALTER TABLE kl_concept ADD INDEX  idx_deleted_modified_id(`sort_deleted`,`gmt_modified`,`id`);

docs/011.20190731ICSS历史病历优化增量脚本/init_tran.sql

@@ -0,0 +1,3 @@
+use `sys-tran`;
+ALTER TABLE `tran_inquiry_detail`
+ADD COLUMN `content_json`  text NULL COMMENT '内容字符串json' AFTER `content`;

docs/012.20190814数据服务模式支持多种方案/init_tran.sql

@@ -0,0 +1,3 @@
+use `sys-tran`;
+ALTER TABLE `tran_sys_set`
+ADD COLUMN `plan` int(11) NOT NULL DEFAULT '0' COMMENT '方案编号' AFTER `hospital_code`;

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

@@ -18,7 +18,9 @@ import lombok.Setter;
 @Setter
 public class GetInquiryDetailDTO {
 	
-	private List<InquiryDetail> inquiryDetailList;
+    private String dataJson;
+	
+	private List<InquiryDetail> detailList;
 	
 	
 }

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

@@ -57,11 +57,11 @@ public class HisInquiryDTO{
 	@ApiModelProperty(value="类型：0：结构化 1：文本模式")
     private Integer sign;
 
-    /**
-     * 内容JSON字符串
-     */
-	@ApiModelProperty(value="内容JSON字符串")
-    private String dataJson;
+//    /**
+//     * 内容JSON字符串
+//     */
+//	@ApiModelProperty(value="内容JSON字符串")
+//    private String dataJson;
 	
 	
 	/**

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/dto/TemplateInfoPageDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 上午11:07:57
+ */
+@Getter
+@Setter
+public class TemplateInfoPageDTO {
+	 private Long id;//模板id
+	 private Date  gmtCreate;//创建时间
+	 private String creator;//创建人id
+	 private String name;//模板名字
+	 private Long doctorId;//医生id
+	 private Long hospitalId;//医院id
+	 private Long hospitalDeptId;//部门id
+	 private Integer sex;//性别
+	 private String type;//模板类型
+	 private String  preview;//预览文字
+	 private String remark;//备注
+}

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/InquiryDetailFacade.java

@@ -1,15 +1,15 @@
 package com.diagbot.facade;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
-import com.diagbot.util.ListUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author rengb
@@ -19,17 +19,6 @@ import java.util.stream.Collectors;
 @Component
 public class InquiryDetailFacade extends InquiryDetailServiceImpl {
 
-    /**
-     * 批量保存问诊明细
-     *
-     * @param inquiryDetailList
-     */
-    public void saveInquiryDetails(List<InquiryDetail> inquiryDetailList) {
-        if (ListUtil.isNotEmpty(inquiryDetailList)) {
-            baseMapper.saveInquiryDetails(inquiryDetailList);
-        }
-    }
-
     /**
      * 根据问诊记录id删除问诊记录明细
      *

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

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -49,6 +51,7 @@ import com.diagbot.enums.SexTypeEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.InquiryDetailService;
 import com.diagbot.service.InquiryDrugService;
 import com.diagbot.service.InquiryScaleService;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
@@ -83,6 +86,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     @Autowired
     private InquiryDetailFacade inquiryDetailFacade;
     @Autowired
+    @Qualifier("inquiryDetailServiceImpl")
+    private InquiryDetailService inquiryDetailService;
+    @Autowired
     private HospitalInfoFacade hospitalInfoFacade;
     @Autowired
     private PatientInfoFacade patientInfoFacade;
@@ -124,52 +130,36 @@ 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);
             });
-            inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
+            inquiryDetailService.saveBatch(inquiryDetailList);
         }
 
         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);
             });
@@ -178,7 +168,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());
@@ -187,7 +177,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);
@@ -207,7 +197,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;
     }
@@ -296,47 +286,35 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param hisInquirysVO
      * @return
      */
-    public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
-        QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
-        if (hisInquirysVO.getHospitalDeptId() != null) {
-            queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
-        }
-        if (hisInquirysVO.getDoctorId() != null) {
-            queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
-        }
-        if (hisInquirysVO.getPatientId() != null) {
-            queryWrapper.eq("patient_id", hisInquirysVO.getPatientId());
-        }
-        if (hisInquirysVO.getType() != null) {
-            queryWrapper.eq("type", hisInquirysVO.getType());
-        }
-        if (hisInquirysVO.getSign() != null) {
-            queryWrapper.eq("sign", hisInquirysVO.getSign());
-        }
-        if (hisInquirysVO.getStartDate() != null) {
-            queryWrapper.ge("gmt_create", hisInquirysVO.getStartDate());
-        }
-        if (hisInquirysVO.getEndDate() != null) {
-            queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
-        }
-        if (hisInquirysVO.getOrderType() == 1) {
-            queryWrapper.orderByDesc("gmt_modified");
-        } else if (hisInquirysVO.getOrderType() == 2) {
-            queryWrapper.orderByAsc("gmt_modified");
-        }
-
+    public IPage<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
+    	Page<HisInquiryDTO> hisInquiryDTOPage = new Page<>();
+    	
+        QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
+        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq("hospital_id", hisInquirysVO.getHospitalId());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null, "doctor_id", hisInquirysVO.getDoctorId());
+        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null, "patient_id", hisInquirysVO.getPatientId());
+        inquiryInfoQe.eq(hisInquirysVO.getType() != null, "type", hisInquirysVO.getType());
+        inquiryInfoQe.eq(hisInquirysVO.getSign() != null, "sign", hisInquirysVO.getSign());
+        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null, "gmt_create", hisInquirysVO.getStartDate());
+        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null, "gmt_create", hisInquirysVO.getEndDate());
+        inquiryInfoQe.orderByDesc(hisInquirysVO.getOrderType() == 1,"gmt_modified");
+        inquiryInfoQe.orderByAsc(hisInquirysVO.getOrderType() == 2, "gmt_modified");
+        
         if (hisInquirysVO.getDisType() == 1) {
             Date nowDate = DateUtil.now();
             Date lastDate = DateUtil.addMonth(nowDate, -6);
-            queryWrapper.ge("gmt_create", lastDate);
-            queryWrapper.le("gmt_create", nowDate);
-            queryWrapper.likeRight("diagnose", hisInquirysVO.getDisName());
+            inquiryInfoQe.ge("gmt_create", lastDate);
+            inquiryInfoQe.le("gmt_create", nowDate);
+            inquiryInfoQe.likeRight("diagnose", hisInquirysVO.getDisName());
         }
 
-
-        List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
+        Page<InquiryInfo> inquiryInfoPage = new Page<>(hisInquirysVO.getCurrent(),hisInquirysVO.getSize());
+        IPage<InquiryInfo> iPage = this.page(inquiryInfoPage, inquiryInfoQe);
+    	BeanUtil.copyProperties(iPage, hisInquiryDTOPage);
+        
+        List<InquiryInfo> inquiryInfoList = iPage.getRecords();
         if (inquiryInfoList.size() == 0) {
             return null;
         }
@@ -371,8 +349,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             hisInquiryDTOList.add(hisInquiryDTO);
         });
 
-
-        return hisInquiryDTOList;
+        hisInquiryDTOPage.setRecords(hisInquiryDTOList);
+        return hisInquiryDTOPage;
     }
     
     /**
@@ -450,10 +428,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      */
     public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
         GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
-
+        
+        InquiryInfo inquiryInfo = this.getById(getInquiryDetailVO.getInquiryId());
         List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.getListByInquryId(getInquiryDetailVO.getInquiryId());
-
-        getInquiryDetailDTO.setInquiryDetailList(inquiryDetailList);
+        
+        getInquiryDetailDTO.setDataJson(inquiryInfo.getDataJson());
+        getInquiryDetailDTO.setDetailList(inquiryDetailList);
 
         return getInquiryDetailDTO;
     }

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

@@ -1,27 +1,35 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.TemplateInfoService;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author wangfeng
@@ -168,4 +176,53 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         return res;
     }
 
+    /**
+     * 
+     * @param page
+     * @param templateInfoPageVO
+     * @return
+     */
+	public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
+/*		  //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+
+        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("hospital_dept_id", templateInfoPageVO.getHospitalDeptId());
+        mapAll.put("doctor_id", templateInfoPageVO.getDoctorId());
+        mapAll.put("hospital_id", templateInfoPageVO.getHospitalId());
+        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+        mapAll.put("type", templateInfoPageVO.getType());
+        if (templateInfoPageVO.getSex() != null) {
+            templateInfoQuery.allEq(mapAll).in("sex", 3, templateInfoPageVO.getSex()).orderByDesc("gmt_create");
+        } else {
+            templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
+        }
+        IPage<TemplateInfoPageDTO> TemplateInfoData =page(page, templateInfoQuery);
+        List<TemplateInfoPageDTO> datas = TemplateInfoData.getRecords();
+        List<TemplateInfoPageDTO> data = new ArrayList<TemplateInfoPageDTO>();
+        //过滤
+        data = BeanUtil.listCopyTo(datas, TemplateInfoPageDTO.class);
+        
+		return TemplateInfoData.setRecords(data);*/
+		IPage<TemplateInfoPageDTO> TemplateInfoData = getTemplatePages(templateInfoPageVO);
+		return TemplateInfoData;
+	}
+
+	/**
+	 * 
+	 * @param templateIdVO
+	 * @return
+	 */
+	public TemplateInfoDTO getTemplateIdAlls(TemplateIdVO templateIdVO) {
+		 //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
+        templateInfoQuery.eq("id", templateIdVO.getId())
+        .eq("is_deleted", IsDeleteEnum.N.getKey());    
+        TemplateInfoDTO data = new TemplateInfoDTO();
+        TemplateInfo datas = getOne(templateInfoQuery);
+        //过滤
+        BeanUtil.copyProperties(datas, data);
+        return data;
+	}
+
 }

icss-service/src/main/java/com/diagbot/mapper/InquiryDetailMapper.java

@@ -1,10 +1,7 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.InquiryDetail;
-
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.InquiryDetail;
 
 /**
  * <p>
@@ -16,10 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface InquiryDetailMapper extends BaseMapper<InquiryDetail> {
 	
-	/**
-	 * 批量保存问诊明细
-	 * @param inquiryDetailList
-	 */
-	public void saveInquiryDetails(List<InquiryDetail> inquiryDetailList);
 
 }

icss-service/src/main/java/com/diagbot/mapper/TemplateInfoMapper.java

@@ -1,10 +1,17 @@
 package com.diagbot.mapper;
 
 import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
+import com.diagbot.vo.TemplateInfoPageVO;
 
 /**
  * <p>
@@ -19,4 +26,6 @@ public interface TemplateInfoMapper extends BaseMapper<TemplateInfo> {
 	//根据医生id查询该医生保存的病历模板
 	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo);
 
+	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO);
+
 }

icss-service/src/main/java/com/diagbot/service/TemplateInfoService.java

@@ -1,10 +1,15 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
+import com.diagbot.vo.TemplateInfoPageVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +26,8 @@ public interface TemplateInfoService extends IService<TemplateInfo> {
 
     public boolean updateById(TemplateInfo templateInfo);
 
+	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO );
+    
+
+
 }

icss-service/src/main/java/com/diagbot/service/impl/TemplateInfoServiceImpl.java

@@ -1,13 +1,19 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.mapper.TemplateInfoMapper;
 import com.diagbot.service.TemplateInfoService;
+import com.diagbot.vo.TemplateInfoPageVO;
+
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,5 +35,10 @@ public class TemplateInfoServiceImpl extends ServiceImpl<TemplateInfoMapper, Tem
         return baseMapper.findByDoctorIdTemplate(templateInfo);
     }
 
+	@Override
+	public IPage<TemplateInfoPageDTO> getTemplatePages(TemplateInfoPageVO templateInfoPageVO) {
+		return baseMapper.getTemplatePages(templateInfoPageVO);
+	}
+
 
 }

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

@@ -23,6 +23,16 @@ import lombok.Setter;
 @Setter
 public class HisInquirysVO {
 	
+    /**
+     * 每页显示条数，默认 10
+     */
+    private long size = 10;
+    
+    /**
+     * 当前页
+     */
+    private long current = 1;
+	
 	/**
      * 医院id
      */

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/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;
 
     /**
      * 内容字符串纯文本

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 下午1:20:52
+ */
+@Getter
+@Setter
+public class TemplateIdVO {
+
+	@NotBlank(message = "请输入模板id")
+	private String id;
+}

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

@@ -0,0 +1,44 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 上午11:06:33
+ */
+@Getter
+@Setter
+public class TemplateInfoPageVO extends Page{
+
+	/**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    /**
+     * 医院编码
+     */
+	@NotNull(message = "请输入医院Id")
+    private Long hospitalId;
+	/**
+	 * 部门id
+	 */
+	@NotNull(message = "请输入部门id")
+	private Long hospitalDeptId;//部门id
+	
+	@NotBlank(message = "请输入模板类型")
+	private String type;//模板类型
+	
+	private List<Integer> sex;//性别
+}

icss-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -78,7 +79,7 @@ public class InquiryInfoController {
     @ApiOperation(value = "历史病历列表[by:rengb]")
     @PostMapping("/hisInquirys")
     @SysLogger("hisInquirys")
-    public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
+    public RespDTO<IPage<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
     }
     

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -1,26 +1,33 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateInfoPageDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.facade.TemplateInfoFacade;
+import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
 
 /**
  * @author wangfeng
@@ -83,5 +90,25 @@ public class TemplateInfoController {
 
         return RespDTO.onSuc(res);
     }
+    
+    @ApiOperation(value = "分页查询病历模板列表[by:wangfeng]",
+            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>" + "type:模式<br> sex：性别")
+    @PostMapping("/getTemplatePageAlls")
+    @SysLogger("getTemplatePageAlls")
+    public RespDTO<IPage<TemplateInfoPageDTO>> getTemplatePageAll(@Valid @RequestBody TemplateInfoPageVO templateInfoPageVO) {
 
+    	IPage<TemplateInfoPageDTO> data = templateInfoFacade.getTemplatePageAlls(templateInfoPageVO,templateInfoPageVO);
+
+        return RespDTO.onSuc(data);
+    }
+    
+    @ApiOperation(value = "根据模板id获取病历模板内容[by:wangfeng]",notes = "id: 请输入模板id")
+    @PostMapping("/getTemplateIdAlls")
+    @SysLogger("getTemplateIdAlls")
+    public RespDTO<TemplateInfoDTO> getTemplateIdAll(@Valid @RequestBody TemplateIdVO templateIdVO) {
+
+    	TemplateInfoDTO data = templateInfoFacade.getTemplateIdAlls(templateIdVO);
+
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -13,15 +13,9 @@
         <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>
     
-    <insert id="saveInquiryDetails" parameterType="list">
-    	insert into icss_inquiry_detail(inquiry_id,type,content,content_value) values
-    	<foreach collection="list" separator="," item="detail">
-    		(#{detail.inquiryId},#{detail.type},#{detail.content},#{detail.contentValue})
-    	</foreach>
-    </insert>
-
 </mapper>

icss-service/src/main/resources/mapper/TemplateInfoMapper.xml

@@ -2,39 +2,41 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.TemplateInfoMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.TemplateInfo">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="doctor_id" property="doctorId" />
-        <result column="hospital_dept_id" property="hospitalDeptId" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="sex" property="sex" />
-        <result column="type" property="type" />
-        <result column="preview" property="preview" />
-        <result column="data_json" property="dataJson" />
-        <result column="remark" property="remark" />
-    </resultMap>
-    <!--根据医生id查询该医生保存的病历模板 -->
+	<!-- 通用查询映射结果 -->
+	<resultMap id="BaseResultMap" type="com.diagbot.entity.TemplateInfo">
+		<id column="id" property="id" />
+		<result column="is_deleted" property="isDeleted" />
+		<result column="gmt_create" property="gmtCreate" />
+		<result column="gmt_modified" property="gmtModified" />
+		<result column="creator" property="creator" />
+		<result column="modifier" property="modifier" />
+		<result column="name" property="name" />
+		<result column="doctor_id" property="doctorId" />
+		<result column="hospital_dept_id" property="hospitalDeptId" />
+		<result column="hospital_id" property="hospitalId" />
+		<result column="sex" property="sex" />
+		<result column="type" property="type" />
+		<result column="preview" property="preview" />
+		<result column="data_json" property="dataJson" />
+		<result column="remark" property="remark" />
+	</resultMap>
+	<!--根据医生id查询该医生保存的病历模板 -->
 	<select id="findByDoctorIdTemplate" resultType="com.diagbot.dto.TemplateInfoDTO">
-	SELECT
+		SELECT
 		id AS id,
 		gmt_create AS gmtCreate,
 		creator AS creator,
-		NAME AS modeName,
+		NAME AS
+		modeName,
 		doctor_id AS doctorId,
 		hospital_id AS hospitalId,
 		hospital_dept_id As hospitalDeptId,
 		TYPE AS modeType,
-		preview AS preview,
+		preview AS
+		preview,
 		data_json AS dataJson,
 		remark AS remark
-	FROM
+		FROM
 		icss_template_info WHERE is_deleted = "N"
 		<if test="id != null and id != ''">
 			and id = #{id}
@@ -42,7 +44,7 @@
 		<if test="name != null and name != ''">
 			and name = #{name}
 		</if>
-	    <if test="hospitalDeptId != null and hospitalDeptId != ''">
+		<if test="hospitalDeptId != null and hospitalDeptId != ''">
 			and hospital_dept_id = #{hospitalDeptId}
 		</if>
 		<if test="doctorId != null and doctorId != ''">
@@ -57,4 +59,42 @@
 		ORDER BY gmt_create DESC
 
 	</select>
+	<select id="getTemplatePages" resultType="com.diagbot.dto.TemplateInfoPageDTO">
+		SELECT
+		id AS id,
+		gmt_create AS gmtCreate,
+		creator AS creator,
+		NAME AS
+		name,
+		doctor_id AS doctorId,
+		hospital_id AS hospitalId,
+		hospital_dept_id
+		As hospitalDeptId,
+		TYPE AS type,
+		sex AS sex,
+		preview AS preview,
+		remark AS
+		remark
+		FROM
+		icss_template_info WHERE is_deleted = "N"
+		<if test="hospitalDeptId != null ">
+			and hospital_dept_id = #{hospitalDeptId}
+		</if>
+		<if test="doctorId != null ">
+			and doctor_id = #{doctorId}
+		</if>
+		<if test="hospitalId != null">
+			and hospital_id = #{hospitalId}
+		</if>
+		<if test="type != null and type != ''">
+			and type = #{type}
+		</if>
+		and sex in
+		<foreach collection="sex" item="sexNew" open="(" close=")"
+			separator=",">
+			#{sexNew}
+		</foreach>
+		ORDER BY gmt_create DESC
+
+	</select>
 </mapper>

icssman-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -0,0 +1,65 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/7 14:06
+ */
+public enum ConceptTypeEnum implements KeyedNamed {
+    Symptom(1, "症状"),
+    Past(2, "既往史"),
+    Other(3, "其他史"),
+    Vital(4, "查体"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检"),
+    Disease(7, "诊断"),
+    Drug(8, "药品"),
+    Drug_Category_Big(9, "药品分类-大类"),
+    SIDE_EFFECTS(10, "不良反应"),
+    Drug_Category_Small(11, "药品分类-小类"),
+    LIS_TABLES(12,"化验公表项"),
+    DEPARTMENT(15,"科室"),
+    Scale(21, "量表"),
+    Indication(22, "指标"),
+    LisDetail(51, "化验明细");
+
+
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ConceptTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ConceptTypeEnum getEnum(Integer key) {
+        for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ConceptTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

icssman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -3,11 +3,14 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.KnowledgemanServiceClient;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.LisMappingPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LisMapping;
 import com.diagbot.entity.QuestionInfo;
+import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -16,10 +19,13 @@ import com.diagbot.service.LisMappingService;
 import com.diagbot.service.impl.LisMappingServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IdListVO;
 import com.diagbot.vo.IdVO;
+import com.diagbot.vo.IndexLexiconVO;
+import com.diagbot.vo.IndexVO;
 import com.diagbot.vo.LisMappingPageVO;
 import com.diagbot.vo.LisMappingVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +53,8 @@ public class LisMappingFacade extends LisMappingServiceImpl {
     private CacheFacade cacheFacade;
     @Autowired
     private QuestionFacade questionFacade;
+    @Autowired
+    private KnowledgemanServiceClient knowledgemanServiceClient;
 
     /**
      * 化验公表映射分页信息
@@ -91,12 +99,40 @@ public class LisMappingFacade extends LisMappingServiceImpl {
             }
             lisMappingQueryWrapper.and(i -> i.isNull("item_name").or(j -> j.eq("item_name", "")));
         } else {
+
             String uniqueName = lisMappingVO.getMealName() + "--" + lisMappingVO.getItemName();
             if (!uniqueName.equals(lisMappingVO.getUniqueName())) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "化验公表名称不匹配");
             }
             lisMappingQueryWrapper.eq("item_name", lisMappingVO.getItemName());
         }
+
+        //验证医学术语是否存在
+        IndexVO indexVO = new IndexVO();
+        indexVO.setName(lisMappingVO.getMealName());
+        indexVO.setType(ConceptTypeEnum.Lis.getKey());
+        RespDTO<List<ConceptBaseDTO>> listRespDTO = knowledgemanServiceClient.index(indexVO);
+        RespDTOUtil.respNGDeal(listRespDTO, "获取医学术语失败");
+        if (ListUtil.isEmpty(listRespDTO.data)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "化验套餐项【" + lisMappingVO.getMealName() + "】术语不存在");
+        }
+        if (StringUtil.isNotBlank(lisMappingVO.getItemName())) {
+            indexVO.setName(lisMappingVO.getItemName());
+            indexVO.setType(ConceptTypeEnum.LisDetail.getKey());
+            RespDTO<List<ConceptBaseDTO>> lisDetailRespDTO = knowledgemanServiceClient.index(indexVO);
+            RespDTOUtil.respNGDeal(lisDetailRespDTO, "获取医学术语失败");
+            if (ListUtil.isEmpty(lisDetailRespDTO.data)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "化验明细项【" + lisMappingVO.getItemName() + "】术语不存在");
+            }
+        }
+        indexVO.setName(lisMappingVO.getUniqueName());
+        indexVO.setType(ConceptTypeEnum.LIS_TABLES.getKey());
+        RespDTO<List<ConceptBaseDTO>> lisTablesRespDTO = knowledgemanServiceClient.index(indexVO);
+        RespDTOUtil.respNGDeal(lisTablesRespDTO, "获取医学术语失败");
+        if (ListUtil.isEmpty(lisTablesRespDTO.data)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "化验公表项项【" + lisMappingVO.getUniqueName() + "】术语不存在");
+        }
+
         List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
         if (lisMappingList.size() > 1) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "存在多条映射关系，请删除重复映射");

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -365,8 +365,12 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             for (ModuleDetail moduleDetail : moduleDetailList) {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
                 BeanUtil.copyProperties(moduleDetail, getModuleDetailInfoDTO);
-                getModuleDetailInfoDTO.setTagName(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()).getName());
-                getModuleDetailInfoDTOList.add(getModuleDetailInfoDTO);
+                if(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()) != null){
+                    getModuleDetailInfoDTO.setTagName(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()).getName());
+                }
+                if(pacsCeptMap.get(getModuleDetailInfoDTO.getQuestionId()) != null) {//如果标准词库中没有该标签，则不显示
+                    getModuleDetailInfoDTOList.add(getModuleDetailInfoDTO);
+                }
             }
         }else {
             //获取标签信息
@@ -386,12 +390,16 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
                 BeanUtil.copyProperties(moduleDetail, getModuleDetailInfoDTO);
                 if (moduleDetail.getQuestionId() != null) {
-                    getModuleDetailInfoDTO.setTagName(questionInfoMap.get(moduleDetail.getQuestionId()).getTagName());
-                    getModuleDetailInfoDTO.setTagType(questionInfoMap.get(moduleDetail.getQuestionId()).getTagType());
+                    if(questionInfoMap.get(moduleDetail.getQuestionId()) != null){
+                        getModuleDetailInfoDTO.setTagName(questionInfoMap.get(moduleDetail.getQuestionId()).getTagName());
+                        getModuleDetailInfoDTO.setTagType(questionInfoMap.get(moduleDetail.getQuestionId()).getTagType());
+                    }
                 } else {
                     getModuleDetailInfoDTO.setRelationModuleName(moduleInfoMap.get(moduleDetail.getRelationModule()).getName());
                 }
-                getModuleDetailInfoDTOList.add(getModuleDetailInfoDTO);
+                if(questionInfoMap.get(moduleDetail.getQuestionId()) != null || moduleInfoMap.get(moduleDetail.getRelationModule()) != null){//如果标签表中已经删除这条数据，则不再显示该标签
+                    getModuleDetailInfoDTOList.add(getModuleDetailInfoDTO);
+                }
             }
         }
         return getModuleDetailInfoDTOList;

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -264,7 +264,7 @@ public class ConceptFacade extends ConceptServiceImpl {
     	conceptQe.like(StringUtil.isNotBlank(getAllInformationVO.getName()),"lib_name", getAllInformationVO.getName());
     	conceptQe.eq(StringUtil.isNotBlank(getAllInformationVO.getType()),"lib_type", LexiconTypeEnum.getKey(getAllInformationVO.getType()));
     	conceptQe.eq(StringUtil.isNotBlank(getAllInformationVO.getIsDeleted()),"is_deleted", getAllInformationVO.getIsDeleted());
-    	conceptQe.orderByAsc("is_deleted");
+    	conceptQe.orderByDesc("sort_deleted");
     	conceptQe.orderByDesc("gmt_modified");
     	conceptQe.orderByDesc("id");
     	IPage<Concept> iPage = this.page(conceptPage, conceptQe);
@@ -808,9 +808,17 @@ public class ConceptFacade extends ConceptServiceImpl {
         
         Map<String,Lexicon> lexiconMap = lexiconFacade.list().stream().collect(Collectors.toMap(Lexicon::getName, i->i));
         
-        addConceptInfoVOList.forEach(i -> {
-        	i = checkImConceptInfo(i,libraryInfoListMap,lexiconMap);
-        });
+        String ckmsg = null;
+        for(AddConceptInfoVO addConceptInfoVO : addConceptInfoVOList){
+        	ckmsg = checkImConceptInfo(addConceptInfoVO,libraryInfoListMap,lexiconMap);
+        	if(StringUtil.isNotBlank(ckmsg)){
+        		sbf.append("第").append(addConceptInfoVO.getLineNum()).append("行").append(ckmsg).append("<br/>");
+        	}
+        }
+        
+        if (sbf.length() > 0) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, sbf.toString());
+        }
         
         saveAddConceptInfoVOList(addConceptInfoVOList);
 
@@ -824,27 +832,25 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @param lexiconMap
      * @return
      */
-    public AddConceptInfoVO checkImConceptInfo(AddConceptInfoVO addConceptInfoVO,Map<String,List<LibraryInfo>> libraryInfoListAllMap,Map<String,Lexicon> lexiconMap) {
+    public String checkImConceptInfo(AddConceptInfoVO addConceptInfoVO,Map<String,List<LibraryInfo>> libraryInfoListAllMap,Map<String,Lexicon> lexiconMap) {
     	String currentUser = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
     	
     	Concept concept = new Concept();
     	ConceptCommon conceptCommon = null;
     	List<LibraryInfo> libraryInfoList = Lists.newArrayList();
-    	
-        String lineNumStr = "第" + addConceptInfoVO.getLineNum() + "行";
 
         List<AddConceptInfoDetailVO> addConceptInfoDetailVOMainList = addConceptInfoVO.getDetailList().stream().filter(i -> i.getIsConcept() == 1).collect(Collectors.toList());
         if (addConceptInfoDetailVOMainList.size() == 0) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, lineNumStr + "同义词中缺少标准词本体！");
+        	return "同义词中缺少标准词本体！";
         }
         if (addConceptInfoDetailVOMainList.size() > 1) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, lineNumStr + "标准术语只能有一个！");
+        	return "标准术语只能有一个！";
         }
         
         Lexicon lexicon = lexiconMap.get(addConceptInfoVO.getType());
         if (lexicon == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, lineNumStr + "数据有误，该类型信息在数据库中不存在！");
+        	return "数据有误，该类型信息在数据库中不存在！";
         }
         Long typeId = lexicon.getId();
         concept.setLibType(typeId);
@@ -887,7 +893,7 @@ public class ConceptFacade extends ConceptServiceImpl {
             addConceptInfoVO.setConceptId(conceptId);
 
             if (libraryInfoMain.getIsConcept()!=1&&extLibraryInfoList.stream().filter(i -> i.getConceptId().intValue() == libraryInfoMain.getConceptId().intValue()).count() == 1) {
-            	throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "标准术语已作为同义词被占用！");
+            	return "标准术语已作为同义词被占用！";
             }
         }
 
@@ -918,14 +924,14 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         if (sbf.length() > 0) {
             sbf.append("已被占用");
-            throw new CommonException(CommonErrorCode.RPC_ERROR, sbf.toString());
+            return sbf.toString();
         }
         
         addConceptInfoVO.setConcept(concept);
         addConceptInfoVO.setConceptCommon(conceptCommon);
         addConceptInfoVO.setLibraryInfoList(libraryInfoList);
 
-        return addConceptInfoVO;
+        return null;
     }
     
     /**
@@ -976,7 +982,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         }
         for(AddConceptInfoVO i : addConceptInfoVOList){
         	if(i.getConceptCommon()!=null){
-        		if(i.getConceptId()!=null&&conceptCommonMap!=null){
+        		if(i.getConceptId()!=null&&conceptCommonMap!=null&&conceptCommonMap.containsKey(i.getConceptId())){
             		i.getConceptCommon().setId(conceptCommonMap.get(i.getConceptId()).getId());
             	}
             	i.getConceptCommon().setConceptId(i.getConcept().getId());

knowledgeman-service/src/main/resources/mapper/ConceptDetailMapper.xml

@@ -20,17 +20,17 @@
     </resultMap>
 
    	<select id="getConceptDetailList" resultType="com.diagbot.dto.GetConceptDetailListDTO">
-   		SELECT b.id concept_id, b.lib_name,b.lib_type as typeId, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
-		FROM kl_concept_detail a ,kl_concept b
-		WHERE   b.is_deleted='N' and a.concept_id=b.id
+        SELECT a.concept_id concept_id, b.lib_name,b.lib_type as typeId, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
+        FROM kl_concept_detail a ,kl_concept b
+        WHERE   b.is_deleted='N' and a.concept_id=b.id
 		<if test="conceptName!=null and conceptName!=''">
 			and b.`lib_name` like concat('%',#{conceptName},'%')
 		</if>
 		<if test="status!=null and status!=''">
 			and a.is_deleted = #{status}
 		</if>
-		group by b.id, b.lib_name
-		ORDER BY a.is_deleted ASC, a.gmt_modified DESC
+        group by a.concept_id
+        ORDER BY a.is_deleted ASC, a.gmt_modified DESC
    	</select>
 
 

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/entity/SysSet.java

@@ -1,20 +1,19 @@
 package com.diagbot.entity;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 医院所有配置信息
  * </p>
  *
- * @author wangfeng
- * @since 2019-06-12
+ * @author zhaops
+ * @since 2019-08-14
  */
 @TableName("tran_sys_set")
 public class SysSet implements Serializable {
@@ -58,7 +57,12 @@ public class SysSet implements Serializable {
     private String hospitalCode;
 
     /**
-     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     * 方案编号
+     */
+    private Integer plan;
+
+    /**
+     * 访问的系统类型(1, "user-service"),(2, "diagbotman-service"),(3, "uaa-service"),(4, "log-service"),(5, "bi-service"),(6, "ltapi-service"),(7, "feedback-service"),(8, "icss-old-service"),(9, "triage-service"),(10, "appkey"),(11, "icss-service"),(12, "icssman-service"),(13, "knowledgeman-service"),(14, "tran-service"),(15, "aipt-service"),(16, "data-service"),(17, "prec-service");
      */
     private Integer sysType;
 
@@ -71,6 +75,7 @@ public class SysSet implements Serializable {
      * 配置编码
      */
     private String code;
+
     /**
      * 配置值
      */
@@ -81,109 +86,114 @@ public class SysSet implements Serializable {
      */
     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 String getHospitalCode() {
-		return hospitalCode;
-	}
-
-	public void setHospitalCode(String hospitalCode) {
-		this.hospitalCode = hospitalCode;
-	}
-
-	public Integer getSysType() {
-		return sysType;
-	}
-
-	public void setSysType(Integer sysType) {
-		this.sysType = sysType;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Integer getValue() {
-		return value;
-	}
-
-	public void setValue(Integer value) {
-		this.value = value;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	@Override
-	public String toString() {
-		return "SysSet [id=" + id + ", isDeleted=" + isDeleted + ", gmtCreate=" + gmtCreate + ", gmtModified="
-				+ gmtModified + ", creator=" + creator + ", modifier=" + modifier + ", hospitalCode=" + hospitalCode
-				+ ", sysType=" + sysType + ", name=" + name + ", code=" + code + ", value=" + value + ", remark="
-				+ 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 String getHospitalCode() {
+        return hospitalCode;
+    }
+
+    public void setHospitalCode(String hospitalCode) {
+        this.hospitalCode = hospitalCode;
+    }
+    public Integer getPlan() {
+        return plan;
+    }
+
+    public void setPlan(Integer plan) {
+        this.plan = plan;
+    }
+    public Integer getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(Integer sysType) {
+        this.sysType = sysType;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "SysSet{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", hospitalCode=" + hospitalCode +
+        ", plan=" + plan +
+        ", sysType=" + sysType +
+        ", name=" + name +
+        ", code=" + code +
+        ", value=" + value +
+        ", 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/facade/SysSetFacade.java

@@ -1,39 +1,38 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.entity.SysSet;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.SysSetServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.IntegerUtil;
 import com.diagbot.vo.HospitalSetVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年6月12日 下午3:25:36
  */
 @Component
-public class SysSetFacade extends SysSetServiceImpl{
+public class SysSetFacade extends SysSetServiceImpl {
+
 
-	
-	/**
-	 * 
-	 * @param hospitalSetVO
-	 * @return
-	 */
-	public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
-/*		 QueryWrapper<SysSet> queryWrapper = new QueryWrapper<SysSet>();
-	        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-	        			.in("hospital_code", hospitalSetVO.getHospitalCode());*/
-	        List<SysSet> sysSetData = querySysSetInfo(hospitalSetVO);
-	        List<SysSetInfoDTO> data =   BeanUtil.listCopyTo(sysSetData, SysSetInfoDTO.class);
-		return data;
-	}
+    /**
+     * @param hospitalSetVO
+     * @return
+     */
+    public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
+        //		 QueryWrapper<SysSet> queryWrapper = new QueryWrapper<SysSet>();
+        //	        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+        //	        			.in("hospital_code", hospitalSetVO.getHospitalCode());
+        if (IntegerUtil.isNull(hospitalSetVO.getPlan())) {
+            hospitalSetVO.setPlan(0);
+        }
+        List<SysSet> sysSetData = querySysSetInfo(hospitalSetVO);
+        List<SysSetInfoDTO> data = BeanUtil.listCopyTo(sysSetData, SysSetInfoDTO.class);
+        return data;
+    }
 
 }

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

@@ -20,6 +20,11 @@ public class HospitalSetVO {
      */
     private Integer sysType;
 
+    /**
+     * 方案编号
+     */
+    private Integer plan;
+
     /**
      * 配置名称
      */

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/java/com/diagbot/web/SysSetController.java

@@ -1,25 +1,20 @@
 package com.diagbot.web;
 
-
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.facade.SysSetFacade;
 import com.diagbot.vo.HospitalSetVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -35,16 +30,14 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class SysSetController {
 
-	@Autowired
-	SysSetFacade sysSetFacade;
-	
-	@ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
-	@PostMapping("/getSysSetInfoDatas")
-	@SysLogger("getSysSetInfoDatas")
-	public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
-
-		 List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+    @Autowired
+    SysSetFacade sysSetFacade;
 
-		return RespDTO.onSuc(data);
-	}
+    @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode ：医院code  必填<br> ")
+    @PostMapping("/getSysSetInfoDatas")
+    @SysLogger("getSysSetInfoDatas")
+    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
+        List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+        return RespDTO.onSuc(data);
+    }
 }

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

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

@@ -2,37 +2,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.SysSetMapper">
 
-	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.diagbot.entity.SysSet">
-		<id column="id" property="id" />
-		<result column="is_deleted" property="isDeleted" />
-		<result column="gmt_create" property="gmtCreate" />
-		<result column="gmt_modified" property="gmtModified" />
-		<result column="creator" property="creator" />
-		<result column="modifier" property="modifier" />
-		<result column="hospital_code" property="hospitalCode" />
-		<result column="sys_type" property="sysType" />
-		<result column="name" property="name" />
-		<result column="code" property="code" />
-		<result column="value" property="value" />
-		<result column="remark" property="remark" />
-	</resultMap>
-	<select id="querySysSetInfo" parameterType="com.diagbot.vo.HospitalSetVO" resultType="com.diagbot.entity.SysSet">
-		SELECT * FROM tran_sys_set 
-		<where>
-			is_deleted = "N"
-			<if test="hospitalCode != null and hospitalCode != '' ">
-				and hospital_code = #{hospitalCode}
-			</if>
-			<if test="sysType != null">
-				and sys_type = #{sysType}
-			</if>
-			<if test="name != null and name !=''">
-				and name = #{name}
-			</if>
-			<if test="code != null and code !=''">
-				and code = #{code}
-			</if>
-		</where>
-	</select>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysSet">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="hospital_code" property="hospitalCode" />
+        <result column="plan" property="plan" />
+        <result column="sys_type" property="sysType" />
+        <result column="name" property="name" />
+        <result column="code" property="code" />
+        <result column="value" property="value" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <select id="querySysSetInfo" parameterType="com.diagbot.vo.HospitalSetVO" resultType="com.diagbot.entity.SysSet">
+        SELECT * FROM tran_sys_set
+        <where>
+            is_deleted = "N"
+            <if test="hospitalCode != null and hospitalCode != '' ">
+                and hospital_code = #{hospitalCode}
+            </if>
+            <if test="plan != null">
+                and plan = #{plan}
+            </if>
+            <if test="sysType != null">
+                and sys_type = #{sysType}
+            </if>
+            <if test="name != null and name !=''">
+                and name = #{name}
+            </if>
+            <if test="code != null and code !=''">
+                and code = #{code}
+            </if>
+        </where>
+    </select>
+
 </mapper>

tran-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "tran_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "tran_inquiry_info","tran_inquiry_detail" }); // 需要生成的表
+        strategy.setInclude(new String[] { "tran_sys_set" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);