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

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

@@ -118,7 +118,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             QuestionVO questionVO = new QuestionVO();
             questionVO.setId(Long.parseLong(id));
             questionVO.setAge(questionIdsVO.getAge());
-            questionVO.setSexType(questionIdsVO.getAge());
+            questionVO.setSexType(questionIdsVO.getSexType());
             QuestionDTO item = this.getById(questionVO);
             data.put(item.getId(), item);
         }

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

@@ -1,8 +1,11 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.rabbit.MySender;
+import com.diagbot.vo.BuriedSomeStatisticalVO;
+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;
@@ -10,13 +13,7 @@ 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.RespDTO;
-import com.diagbot.facade.BuriedSomeStatisticalFacade;
-import com.diagbot.vo.BuriedSomeStatisticalVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.validation.Valid;
 
 /**
  * 
@@ -32,9 +29,6 @@ public class BuriedSomeStatisticalController {
 	@Autowired
 	MySender mySender;
 
-	@Autowired
-	BuriedSomeStatisticalFacade buriedSomeStatisticalFacade;
-
 	@ApiOperation(value = "数据埋点统计保存[by:wangfeng]", notes = "数据埋点统计保存")
 	@PostMapping("/saveBuriedSomeStatisticals")
 	@SysLogger("saveBuriedSomeStatisticals")

icssman-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -0,0 +1,68 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.diagbot.entity.DisclaimerInformation;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+@Setter
+@Getter
+public class DisclaimerInformationDTO {
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String modifier;
+
+    /**
+     * 主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

icssman-service/src/main/java/com/diagbot/dto/GetRetrievalsByTagDTO.java

@@ -36,6 +36,19 @@ public class GetRetrievalsByTagDTO {
 	@ApiModelProperty(value="同义词名称")
 	private String retrievalName;
 	
+	/**
+	 * 同义词拼音
+	 */
+	@ApiModelProperty(value="同义词拼音")
+	private String retrievalSpell;
+	
+	/**
+	 * 同义词种类,1：本体，2：同义词3：组合项目(生命体征-脉搏)
+	 */
+	@ApiModelProperty(value="同义词种类,1：本体，2：同义词3：组合项目(生命体征-脉搏)")
+	private Integer retrievalType;
+	
+	
 	
 
 }

icssman-service/src/main/java/com/diagbot/dto/IntroducePageDTO.java

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.IntroduceInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/12/11 9:59
+ */
+@Getter
+@Setter
+public class IntroducePageDTO extends IntroduceInfo {
+    private String operator;
+    private String operatorName;
+    private Date gmtOperate;
+    private String tagName;
+    private List<QuestionIntroduceDTO> questionList;
+    private List<QuestionIntroduceDTO> unRelatedQuestionList;
+}

icssman-service/src/main/java/com/diagbot/dto/QuestionIntroduceDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/12/11 10:06
+ */
+@Getter
+@Setter
+public class QuestionIntroduceDTO {
+    private Long id;
+    private String tagName;
+    private String name;
+    private Integer type;
+    private Integer subType;
+}

icssman-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    //private String creator;
+
+    private String modifierid;
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

icssman-service/src/main/java/com/diagbot/dto/VersionWrapperDTO.java

@@ -0,0 +1,49 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	//private String creator;
+	
+	private String modifierid;
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

icssman-service/src/main/java/com/diagbot/entity/DisclaimerInformation.java

@@ -0,0 +1,196 @@
+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 wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_disclaimer_information")
+public class DisclaimerInformation 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 versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    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 getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(Long versionId) {
+        this.versionId = versionId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getDisclaimerCode() {
+        return disclaimerCode;
+    }
+
+    public void setDisclaimerCode(String disclaimerCode) {
+        this.disclaimerCode = disclaimerCode;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "DisclaimerInformation{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", versionId=" + versionId +
+        ", title=" + title +
+        ", description=" + description +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", disclaimerCode=" + disclaimerCode +
+        ", remark=" + remark +
+        "}";
+    }
+}

icssman-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,7 +76,7 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置：0-都展示，1-推送展示，2-更多展示
+     * 显示位置：0-都展示，1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
      */
     private Integer position;
 

icssman-service/src/main/java/com/diagbot/entity/QuestionInfo.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
@@ -114,11 +116,13 @@ public class QuestionInfo implements Serializable {
     /**
      * 最小值
      */
+    @TableField(fill = FieldFill.UPDATE)
     private BigDecimal minValue;
 
     /**
      * 最大值
      */
+    @TableField(fill = FieldFill.UPDATE)
     private BigDecimal maxValue;
 
     /**

icssman-service/src/main/java/com/diagbot/entity/VersionDetail.java

@@ -0,0 +1,183 @@
+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 wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_version_detail")
+public class VersionDetail 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 versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    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 getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(Long versionId) {
+        this.versionId = versionId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "VersionDetail{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", versionId=" + versionId +
+        ", title=" + title +
+        ", description=" + description +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

icssman-service/src/main/java/com/diagbot/entity/VersionInfo.java

@@ -0,0 +1,154 @@
+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 wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_version_info")
+public class VersionInfo 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;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    private Date refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    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 getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Date getRefreshTime() {
+        return refreshTime;
+    }
+
+    public void setRefreshTime(Date refreshTime) {
+        this.refreshTime = refreshTime;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "VersionInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", refreshTime=" + refreshTime +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -11,7 +11,9 @@ import lombok.Setter;
 public enum IntroducePositionEnum implements KeyedNamed {
     All(0, "都展示"),
     Push(1, "推送展示"),
-    More(2, "更多展示");
+    More(2, "更多展示"),
+    CommonTreatment(3, "一般治疗展示"),
+    SurgeryTreatment(4, "手术治疗展示");
 
     @Setter
     private Integer key;
@@ -47,4 +49,4 @@ public enum IntroducePositionEnum implements KeyedNamed {
     public String getName() {
         return name;
     }
-}
+}

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

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+
+import lombok.Setter;
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum StatusEnum implements KeyedNamed {
+    Disable(0, "禁用"),
+    Enable(1, "启用");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    StatusEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static StatusEnum getEnum(Integer key) {
+        for (StatusEnum item : StatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        StatusEnum 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/DeptVitalFacade.java

@@ -16,6 +16,7 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -29,12 +30,13 @@ import java.util.stream.Collectors;
  * @time: 2018/11/22 11:45
  */
 @Component
-public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalService {
+public class DeptVitalFacade extends DeptVitalServiceImpl {
 
     @Autowired
     private QuestionInfoFacade questionInfoFacade;
     @Autowired
-    private DeptVitalServiceImpl deptVitalServiceImpl;
+    @Qualifier("deptVitalServiceImpl")
+    private DeptVitalService deptVitalService;
 
     /**
      * 保存查体模板
@@ -46,11 +48,11 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
         //先删除该科室原有模板
         UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
         deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                eq("is_deleted",IsDeleteEnum.N.getKey()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
                 set("is_deleted", IsDeleteEnum.Y.getKey()).
                 set("modifier", UserUtils.getCurrentPrincipleID()).
                 set("gmt_modified", DateUtil.now());
-        this.update(new DeptVital(),deptVitalUpdateWrapper);
+        this.update(new DeptVital(), deptVitalUpdateWrapper);
 
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
@@ -81,7 +83,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
             deptVitalList.add(deptVital);
         }
 
-        deptVitalServiceImpl.saveBatch(deptVitalList);
+        deptVitalService.saveBatch(deptVitalList);
         return true;
     }
 
@@ -105,6 +107,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
 
     /**
      * 删除科室查体模板标签-全删除
+     *
      * @param deptId
      * @return
      */
@@ -121,6 +124,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
 
     /**
      * 根据部门获取查体模板
+     *
      * @param deptId
      * @return
      */

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

@@ -0,0 +1,188 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+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.client.UserServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+import com.diagbot.vo.DisclaimerInformationIdVO;
+import com.diagbot.vo.DisclaimerInformationVO;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:25:48
+ */
+@Component
+public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImpl {
+
+	@Autowired
+	UserServiceClient userServiceClient;
+
+	/**
+	 * 
+	 * @return
+	 */
+	public List<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
+
+		DisclaimerInformationAllVO disAll = new DisclaimerInformationAllVO();
+		disAll.setTitle(title);
+		IPage<DisclaimerInformationDTO> querDisclaimerInformation = getDisclaimerInformationAll(page, disAll);
+		List<DisclaimerInformationDTO> data = querDisclaimerInformation.getRecords();
+		
+		List<String> modifierid = new ArrayList<>();
+		modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		
+		Map<String, String> userNames = new HashMap<>();
+		if(modifierid.size()>0){
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);	
+			 if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
+	                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+	                        "获取所有用户信息失败");
+	            }
+			userNames = userNamesDTO.data;
+		}
+		
+		
+		List<DisclaimerInformationDTO> dataNew = new ArrayList<DisclaimerInformationDTO>();
+		for (DisclaimerInformationDTO disclaimerInformationDTO : data) {
+			DisclaimerInformationDTO dis = new DisclaimerInformationDTO();
+			dis.setId(disclaimerInformationDTO.getId());
+			dis.setDescription(disclaimerInformationDTO.getDescription());
+			dis.setDisclaimerCode(disclaimerInformationDTO.getDisclaimerCode());
+			dis.setGmtCreate(disclaimerInformationDTO.getGmtCreate());
+			dis.setModifier(userNames.get(disclaimerInformationDTO.getModifier()));
+			dis.setOrderNo(disclaimerInformationDTO.getOrderNo());
+			dis.setRemark(disclaimerInformationDTO.getRemark());
+			dis.setStatus(disclaimerInformationDTO.getStatus());
+			dis.setTitle(disclaimerInformationDTO.getTitle());
+			dis.setVersionId(disclaimerInformationDTO.getVersionId());
+
+			dataNew.add(dis);
+		}
+		return dataNew;
+	}
+
+	/**
+	 * 增加
+	 * 
+	 * @return
+	 */
+	public Boolean addDisclaimerInformation(DisclaimerInformationVO disclaimerInformationVO) {
+		DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
+		disclaimerInformation.setCreator(UserUtils.getCurrentPrincipleID());
+		disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
+		disclaimerInformation.setDescription(disclaimerInformationVO.getDescription());
+		disclaimerInformation.setDisclaimerCode(disclaimerInformationVO.getDisclaimerCode());
+		disclaimerInformation.setGmtCreate(DateUtil.now());
+		disclaimerInformation.setGmtModified(DateUtil.now());
+		disclaimerInformation.setOrderNo(disclaimerInformationVO.getOrderNo());
+		disclaimerInformation.setRemark(disclaimerInformationVO.getRemark());
+		disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+		disclaimerInformation.setTitle(disclaimerInformationVO.getTitle());
+		disclaimerInformation.setVersionId(0L);
+
+		boolean res = save(disclaimerInformation);
+
+		return res;
+	}
+
+	/**
+	 * 修改
+	 * 
+	 * @return
+	 */
+	public Boolean updateDisclaimerInformation(DisclaimerInformationAllVO disclaimerInformationAllVO) {
+		// 1.先判断数据是否存在有效
+		QueryWrapper<DisclaimerInformation> disclaimerInformationFand = new QueryWrapper<>();
+		disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id",
+				disclaimerInformationAllVO.getId());
+		DisclaimerInformation data = getOne(disclaimerInformationFand);
+		if (data == null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+		}
+		// 2.修改版本详情信息
+		DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
+
+		disclaimerInformation.setGmtModified(DateUtil.now());// 修改时间
+		disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
+		disclaimerInformation.setDescription(disclaimerInformationAllVO.getDescription());
+		disclaimerInformation.setDisclaimerCode(disclaimerInformationAllVO.getDisclaimerCode());
+		disclaimerInformation.setGmtCreate(DateUtil.now());
+		disclaimerInformation.setId(disclaimerInformationAllVO.getId());
+		disclaimerInformation.setOrderNo(disclaimerInformationAllVO.getOrderNo());
+		disclaimerInformation.setRemark(disclaimerInformationAllVO.getRemark());
+		disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+		disclaimerInformation.setTitle(disclaimerInformationAllVO.getTitle());
+		disclaimerInformation.setVersionId(0L);
+
+		boolean res = updateById(disclaimerInformation);
+
+		if (!res) {
+			throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+		}
+
+		return res;
+	}
+
+	/**
+	 * 删除
+	 * 
+	 * @return
+	 */
+	public Boolean cancelDisclaimerInformation(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+		UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
+		disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
+		return update(new DisclaimerInformation(), disclaimerInformationNew);
+	}
+
+	/**
+	 * 启用
+	 * 
+	 * @return
+	 */
+	public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+		UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
+		disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Enable.getKey());
+		return update(new DisclaimerInformation(), disclaimerInformationNew);
+	}
+
+	/**
+	 * 停用
+	 * 
+	 * @return
+	 */
+	public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+		UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
+		disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+		return update(new DisclaimerInformation(), disclaimerInformationNew);
+	}
+
+}

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

@@ -3,13 +3,18 @@ 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.UserServiceClient;
+import com.diagbot.dto.IntroducePageDTO;
+import com.diagbot.dto.QuestionIntroduceDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.entity.IntroduceMap;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.IntroduceDetailServiceImpl;
+import com.diagbot.service.IntroduceDetailService;
+import com.diagbot.service.IntroduceMapService;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
-import com.diagbot.service.impl.IntroduceMapServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
@@ -19,10 +24,12 @@ import com.diagbot.vo.IntroducePageVO;
 import com.diagbot.vo.IntroduceVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -36,9 +43,15 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     @Autowired
     IntroduceDetailFacade introduceDetailFacade;
     @Autowired
-    IntroduceDetailServiceImpl introduceDetailServiceImpl;
+    @Qualifier("introduceDetailServiceImpl")
+    IntroduceDetailService introduceDetailService;
     @Autowired
-    IntroduceMapServiceImpl introduceMapServiceImpl;
+    @Qualifier("introduceMapServiceImpl")
+    IntroduceMapService introduceMapService;
+    @Autowired
+    UserServiceClient userServiceClient;
+    @Autowired
+    QuestionInfoFacade questionInfoFacade;
 
     /**
      * 保存提示信息（新增or修改）
@@ -52,10 +65,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceInfo = this.getById(introduceVO.getId());
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtModified(DateUtil.now());
-        } else {
-            introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceInfo.setGmtCreate(DateUtil.now());
         }
+        introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
+        introduceInfo.setGmtCreate(DateUtil.now());
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
 
@@ -88,7 +100,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceDetailList.add(detail);
         }
         //插入新的明细记录
-        introduceDetailServiceImpl.saveBatch(introduceDetailList);
+        introduceDetailService.saveBatch(introduceDetailList);
 
         //更新映射关系
         //删除已有映射关系
@@ -107,7 +119,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceMap.setIntroduceId(introduceInfo.getId());
             introduceMapList.add(introduceMap);
         }
-        introduceMapServiceImpl.saveBatch(introduceMapList);
+        introduceMapService.saveBatch(introduceMapList);
         return true;
     }
 
@@ -180,18 +192,35 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     }
 
     /**
-     * 分页查询提示信息，可带等于条件
+     * 获取提示信息分页信息，带条件
      *
      * @param introducePageVO
      * @return
      */
-    public IPage<IntroduceInfo> getPageByMap(IntroducePageVO introducePageVO) {
-        QueryWrapper<IntroduceInfo> introduceInfoQueryWrapper = new QueryWrapper<>();
-        for (Map.Entry<String, Object> entry : introducePageVO.getMap().entrySet()) {
-            introduceInfoQueryWrapper.eq(entry.getKey(), entry.getValue());
+    public IPage<IntroducePageDTO> getIntroducePageByMap(IntroducePageVO introducePageVO) {
+        IPage<IntroducePageDTO> introducePageDTOIPage = this.getIntroducePage(introducePageVO);
+        List<IntroducePageDTO> records = introducePageDTOIPage.getRecords();
+        for (IntroducePageDTO introducePageDTO : records) {
+            if (introducePageDTO.getGmtModified().after(introducePageDTO.getGmtCreate())) {
+                introducePageDTO.setOperator(introducePageDTO.getModifier());
+                introducePageDTO.setGmtOperate(introducePageDTO.getGmtModified());
+            } else {
+                introducePageDTO.setOperator(introducePageDTO.getCreator());
+                introducePageDTO.setGmtOperate(introducePageDTO.getGmtCreate());
+            }
         }
-        IPage<IntroduceInfo> introduceInfoIPage = this.page(introducePageVO, introduceInfoQueryWrapper);
-        return introduceInfoIPage;
+        List<String> userIds = records.stream().map(introduceList -> introduceList.getOperator()).collect(Collectors.toList());
+        RespDTO<Map<String, String>> userInfos = userServiceClient.getUserInfoByIds(userIds);
+        if (userInfos != null) {
+            Map<String, String> userInfoMap = userInfos.data;
+            for (IntroducePageDTO introducePageDTO : records) {
+                if (userInfoMap.containsKey(introducePageDTO.getOperator())) {
+                    introducePageDTO.setOperatorName(userInfoMap.get(introducePageDTO.getOperator()));
+                }
+            }
+        }
+        introducePageDTOIPage.setRecords(records);
+        return introducePageDTOIPage;
     }
 
     /**
@@ -207,4 +236,71 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         }
         return this.list(introduceInfoQueryWrapper);
     }
+
+    /**
+     * 根据id获取提示信息
+     *
+     * @param id
+     * @return
+     */
+    public IntroducePageDTO getIntroduceById(Long id) {
+        IntroducePageDTO introducePageDTO = new IntroducePageDTO();
+        IntroduceInfo introduceInfo = this.getById(id);
+        BeanUtil.copyProperties(introduceInfo, introducePageDTO);
+
+        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
+        introduceMapQueryWrapper.eq("introduce_id", id).eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<IntroduceMap> introduceMapList = introduceMapFacade.list(introduceMapQueryWrapper);
+
+        List<Long> questionIds = introduceMapList.stream().map(introduceMap -> introduceMap.getQuestionId()).collect(Collectors.toList());
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.in("id", questionIds).eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<QuestionInfo> questionInfoList = questionInfoFacade.list(questionInfoQueryWrapper);
+
+        List<QuestionIntroduceDTO> questionIntroduceDTOList = Lists.newLinkedList();
+        String tagName = "";
+        for (QuestionInfo questionInfo : questionInfoList) {
+            QuestionIntroduceDTO questionIntroduceDTO = new QuestionIntroduceDTO();
+            BeanUtil.copyProperties(questionInfo, questionIntroduceDTO);
+            questionIntroduceDTOList.add(questionIntroduceDTO);
+            tagName += questionInfo.getTagName() + ",";
+        }
+        if (tagName.endsWith(",")) {
+            tagName = tagName.substring(0, tagName.length() - 1);
+        }
+        introducePageDTO.setTagName(tagName);
+        introducePageDTO.setQuestionList(questionIntroduceDTOList);
+
+        //未关联的标签
+        QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
+        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).notIn("id", questionIds);
+        List<QuestionInfo> unRelatedQuestionList = questionInfoFacade.list(unRelatedQuestionWrapper);
+        List<QuestionIntroduceDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
+        for (QuestionInfo questionInfo : unRelatedQuestionList) {
+            QuestionIntroduceDTO questionIntroduceDTO = new QuestionIntroduceDTO();
+            BeanUtil.copyProperties(questionInfo, questionIntroduceDTO);
+            unRelatedQuestionDTOList.add(questionIntroduceDTO);
+        }
+        introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);
+
+        return introducePageDTO;
+    }
+
+    /**
+     * 获取未关联标签列表
+     *
+     * @return
+     */
+    public List<QuestionIntroduceDTO> getAllQuestionList() {
+        QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
+        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<QuestionInfo> unRelatedQuestionList = questionInfoFacade.list(unRelatedQuestionWrapper);
+        List<QuestionIntroduceDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
+        for (QuestionInfo questionInfo : unRelatedQuestionList) {
+            QuestionIntroduceDTO questionIntroduceDTO = new QuestionIntroduceDTO();
+            BeanUtil.copyProperties(questionInfo, questionIntroduceDTO);
+            unRelatedQuestionDTOList.add(questionIntroduceDTO);
+        }
+        return unRelatedQuestionDTOList;
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.diagbot.facade;
 
+import com.diagbot.entity.QuestionDetail;
 import com.diagbot.service.impl.QuestionDetailServiceImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,4 +24,15 @@ public class QuestionDetailFacade extends QuestionDetailServiceImpl {
     public void deleteByQuestionIdFac(Map map) {
         this.deleteByQuestionIds(map);
     }
+
+
+    /**
+     * 根据questionId删除明细
+     *
+     * @param list
+     * @return
+     */
+    public void saveBatchFac(List<QuestionDetail> list) {
+        super.saveBatch(list);
+    }
 }

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

@@ -1,22 +1,29 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.QuestionIndexDTO;
+import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.wrapper.QuestionWrapper;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.QuestionDetailService;
 import com.diagbot.service.impl.QuestionInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.QuestionSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +39,9 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
     @Autowired
     QuestionDetailFacade questionDetailFacade;
     @Autowired
+    @Qualifier("questionDetailServiceImpl")
+    QuestionDetailService questionDetailService;
+    @Autowired
     QuestionMappingFacade questionMappingFacade;
     @Autowired
     ModuleDetailFacade moduleDetailFacade;
@@ -51,43 +61,61 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
         QuestionInfo questionInfo = new QuestionInfo();
         String saveOrUpdate = "save"; //新增或修改的标识
         if(questionWrapper.getId() != null) {
-            QueryWrapper queryWrapper = new QueryWrapper();
-            queryWrapper.eq("id", questionWrapper.getId());
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-            questionInfo = getOne(queryWrapper);
+            questionInfo = this.getOne(new QueryWrapper<QuestionInfo>()
+                    .eq("id", questionWrapper.getId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey()));
             if(questionInfo == null) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                        "标签不存在");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签不存在");
             }
             saveOrUpdate = "update";
         }
         BeanUtil.copyProperties(questionWrapper, questionInfo);
-        //标签type、tagName唯一
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("tag_name", questionInfo.getTagName());
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("type", questionInfo.getType());
-        queryWrapper.ne("id", questionInfo.getId() == null ? 0 : questionInfo.getId());
-        List<QuestionInfo> questionInfoList = this.list(queryWrapper);
-        if(questionInfoList.size() > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                    "标签名已存在");
+        List<QuestionInfo> questionInfoList = this.list(new QueryWrapper<QuestionInfo>()
+                .eq("tag_name", questionInfo.getTagName())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("type", questionInfo.getType())
+                .ne("id", questionInfo.getId() == null ? 0 : questionInfo.getId()));
+        if(questionInfoList.size() > 0) { //标签type、tagName唯一
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签名已存在");
         }
+        Date now = DateUtil.now();
         if("save".equals(saveOrUpdate)) {
             questionInfo.setCreator(person); //创建人
-            questionInfo.setGmtCreate(DateUtil.now());//创建时间
-        } else {
-            questionInfo.setGmtModified(DateUtil.now());//修改时间
-            questionInfo.setModifier(person);//修改人
+            questionInfo.setGmtCreate(now);//创建时间
         }
+        questionInfo.setGmtModified(now);//修改时间
+        questionInfo.setModifier(person);//修改人
         this.saveOrUpdate(questionInfo);
 
+        //2、明细信息（先删除原明细，再插入新明细）
+        questionDetailFacade.update(new QuestionDetail(), //删除原明细
+                new UpdateWrapper<QuestionDetail>()
+                    .eq("question_id", questionInfo.getId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("gmt_modified", now)
+                    .set("modifier", person)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
+        List<QuestionDetail> questionDetails = questionWrapper.getQuestionDetails();
+        if(ListUtil.isNotEmpty(questionDetails)) {
+            List<QuestionDetail> saveDetail = new ArrayList<>();
+            int i = 1;
+            for(QuestionDetail detail : questionDetails) {
+                QuestionDetail bean = new QuestionDetail();
+                BeanUtil.copyProperties(detail, bean);
+                bean.setId(null); //防止前端传参，将前端的id置空自动插入
+                bean.setCreator(person);
+                bean.setGmtCreate(now);
+                bean.setModifier(person);
+                bean.setGmtModified(now);
+                bean.setQuestionId(questionInfo.getId());
+                bean.setOrderNo(i++);
+                saveDetail.add(bean);
+            }
+            questionDetailService.saveBatch(saveDetail);
+        }
 
-        //明细信息
-
-        //映射信息
+        //3、映射信息
 
-        //同义词信息
 
     }
 

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

@@ -63,7 +63,6 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 		if(retrieval==null){
 			retrieval = new Retrieval();
 			retrieval.setName(addTagRetrievalVO.getRetrievalName());
-			this.save(retrieval);
 		}else{
 			QueryWrapper<RetrievalMapping> queryWrapper2 = new QueryWrapper<RetrievalMapping>();
 			queryWrapper2.eq("retrieval_id", retrieval.getId());
@@ -71,9 +70,13 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 			retrievalMappingFacede.remove(queryWrapper2);
 		}
 		
+		retrieval.setSpell(addTagRetrievalVO.getRetrievalSpell());
+		this.saveOrUpdate(retrieval);
+		
 		RetrievalMapping retrievalMapping = new RetrievalMapping();
 		retrievalMapping.setQuestionId(addTagRetrievalVO.getQuestionId());
 		retrievalMapping.setRetrievalId(retrieval.getId());
+		retrievalMapping.setShowType(addTagRetrievalVO.getRetrievalType());
 		retrievalMappingFacede.save(retrievalMapping);
 		
 		addTagRetrievalDTO.setRetrievalId(retrieval.getId());

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

@@ -0,0 +1,204 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+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.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VersionDetailIdVO;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAndDetailIdVO;
+
+/**
+ * 版本详情
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:38:40
+ */
+@Component
+public class VersionDetailFacade extends VersionDetailServiceImpl {
+
+	@Autowired
+	VersionDetailServiceImpl versionDetailServiceImpl;
+	@Autowired
+	UserServiceClient userServiceClient;
+	/**
+	 * 根据版本id查询版本详情
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public List<VersionDetailDTO> getById(Long id) {
+		QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+		versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.eq("version_id", id).orderByAsc("order_no");
+
+		VersionDetail versionDetail = new VersionDetail();
+		versionDetail.setVersionId(id);
+		List<VersionDetail> datas = list(versionDetailQuery);
+		// System.out.println("List<VersionDetail>==="+datas.toString());
+		List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+		// 过滤字段
+		for (VersionDetail versionData : datas) {
+			VersionDetailDTO versionDTO = new VersionDetailDTO();
+			versionDTO.setId(versionData.getId());
+			//versionDTO.setCreator(versionData.getCreator());
+			versionDTO.setDescription(versionData.getDescription());
+			versionDTO.setGmtCreate(versionData.getGmtCreate());
+			versionDTO.setOrderNo(versionData.getOrderNo());
+			versionDTO.setRemark(versionData.getRemark());
+			versionDTO.setStatus(versionData.getStatus());
+			versionDTO.setTitle(versionData.getTitle());
+			versionDTO.setVersionId(versionData.getVersionId());
+			dataNew.add(versionDTO);
+		}
+		return dataNew;
+
+	}
+
+	/**
+	 * 根据版本ids查询版本详情
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	public List<VersionDetailDTO> getByIds(List<Long> ids) {
+		QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+		versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.in("version_id", ids).orderByAsc("order_no");
+
+		List<VersionDetail> datas = list(versionDetailQuery);
+		// System.out.println("List<VersionDetail>==="+datas.toString());
+		List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+		/*List<String> modifierid = datas.stream().map(ac->ac.getModifier()).collect(Collectors.toList());
+		RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+		Map<String, String> userNames = userNamesDTO.data;*/
+		List<String> modifierid = new ArrayList<>();
+		modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		
+		Map<String, String> userNames = new HashMap<>();
+		if(modifierid.size()>0){
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);	
+			 if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
+	                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+	                        "获取所有用户信息失败");
+	            }
+			userNames = userNamesDTO.data;
+		}
+		
+		// 过滤字段
+		for (VersionDetail versionData : datas) {
+			VersionDetailDTO versionDTO = new VersionDetailDTO();
+			versionDTO.setId(versionData.getId());
+			//versionDTO.setCreator(versionData.getCreator());
+			versionDTO.setModifierid(userNames.get(versionData.getModifier()));
+			versionDTO.setDescription(versionData.getDescription());
+			versionDTO.setGmtCreate(versionData.getGmtCreate());
+			versionDTO.setOrderNo(versionData.getOrderNo());
+			versionDTO.setRemark(versionData.getRemark());
+			versionDTO.setStatus(versionData.getStatus());
+			versionDTO.setTitle(versionData.getTitle());
+			versionDTO.setVersionId(versionData.getVersionId());
+			dataNew.add(versionDTO);
+		}
+		return dataNew;
+
+	}
+
+	/**
+	 * 更新接口
+	 * 
+	 * @param versionDetailVO
+	 * @return
+	 */
+	public boolean updateVersionDetail(VersionDetailVO versionDetailVO) {
+		// 1.先判断数据是否存在有效
+		QueryWrapper<VersionDetail> VersionInfoFand = new QueryWrapper<>();
+		VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionDetailVO.getDetailId());
+		VersionDetail data = getOne(VersionInfoFand);
+		if (data == null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+		}
+		// 2.修改版本详情信息
+		VersionDetail versionDetail = new VersionDetail();
+
+		versionDetail.setGmtModified(DateUtil.now());// 修改时间
+		versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+		versionDetail.setTitle(versionDetailVO.getTitle());
+		versionDetail.setOrderNo(versionDetailVO.getOrderNo());
+		versionDetail.setStatus(versionDetailVO.getStatus());
+		versionDetail.setId(versionDetailVO.getDetailId());
+		versionDetail.setDescription(versionDetailVO.getDescription());
+		versionDetail.setRemark(versionDetailVO.getRemark());
+		boolean res = updateById(versionDetail);
+		if (!res) {
+			throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+		}
+
+		return res;
+	}
+
+	/**
+	 * 删除接口
+	 * 
+	 * @param versionDetailIdVO
+	 * @return
+	 */
+	public boolean cancelVersionDetail(VersionDetailIdVO versionDetailIdVO) {
+		UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
+		versionDetailNew.in("id", versionDetailIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
+				IsDeleteEnum.Y.getKey()).set("modifier",UserUtils.getCurrentPrincipleID()).set("gmt_modified",DateUtil.now());
+		return update(new VersionDetail(), versionDetailNew);
+	}
+
+	/**
+	 * 增加明细接口
+	 * 
+	 * @param versionDetailIdVO
+	 * @return
+	 */
+	public boolean addVersionDetail(VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
+
+		List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
+		List<VersionDetailVO> datas = versionInfoAndDetailIdVO.getVersionDetail();
+		for (VersionDetailVO data : datas) {
+			VersionDetail versionDetail = new VersionDetail();
+			versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+			versionDetail.setGmtCreate(DateUtil.now());
+			versionDetail.setGmtModified(DateUtil.now());
+			versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+			versionDetail.setDescription(data.getDescription());
+			versionDetail.setOrderNo(data.getOrderNo());
+			versionDetail.setTitle(data.getTitle());
+			versionDetail.setVersionId(versionInfoAndDetailIdVO.getVersionInfoId());
+			versionDetail.setRemark(data.getRemark());
+			versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+			dataNew.add(versionDetail);
+
+		}
+
+		boolean res = versionDetailServiceImpl.saveBatch(dataNew);
+
+		return res;
+	}
+}

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

@@ -0,0 +1,236 @@
+package com.diagbot.facade;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+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.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAllVO;
+import com.diagbot.vo.VersionInfoIdVO;
+import com.diagbot.vo.VersionInfoVO;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年12月6日 下午2:14:54
+ */
+@Component
+public class VersionInfoFacade extends VersionInfoServiceImpl {
+
+	@Autowired
+	VersionDetailFacade versionDetailFacade;
+	@Autowired
+	VersionDetailServiceImpl versionDetailServiceImpl;
+	@Autowired
+	UserServiceClient userServiceClient;
+
+	/**
+	 * 查询版本信息
+	 * 
+	 * @return
+	 */
+	public List<VersionWrapperDTO> getVersionInfoAll(Page page, String name) {
+		// 查询最新的一条版本信息
+		QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.like("name", name).orderByDesc("refresh_time");
+
+		// List<VersionInfo> versionInfos =list(versionInfoQuery);//
+		// getOne(versionInfoQuery);
+		IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+
+		List<VersionInfo> versionInfos = queryUserInformation.getRecords();
+
+		List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
+		/*
+		 * List<String> modifierid =
+		 * versionInfos.stream().map(ac->ac.getModifier()).collect(Collectors.
+		 * toList()); RespDTO<Map<String, String>> userNamesDTO =
+		 * userServiceClient.getUserInfoByIds(modifierid); Map<String, String>
+		 * userNames = userNamesDTO.data;
+		 */
+		List<String> modifierid = new ArrayList<>();
+		modifierid = versionInfos.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+
+		Map<String, String> userNames = new HashMap<>();
+		if (modifierid.size() > 0) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
+			userNames = userNamesDTO.data;
+		}
+
+		// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+		// System.out.println(detail.toString());
+		for (VersionInfo versionInfo : versionInfos) {
+			VersionWrapperDTO versionList = new VersionWrapperDTO();
+			versionList.setId(versionInfo.getId());
+			versionList.setName(versionInfo.getName());
+			versionList.setModifierid(userNames.get(versionInfo.getModifier()));
+			versionList.setRefreshTime(versionInfo.getRefreshTime());
+			versionList.setStatus(versionInfo.getStatus());
+			versionLists.add(versionList);
+		}
+
+		List<Long> ids = new ArrayList<>();
+		if (versionInfos != null) {
+			// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+			for (VersionInfo versionInfo : versionInfos) {
+				ids.add(versionInfo.getId());
+			}
+
+			List<VersionDetailDTO> details = versionDetailFacade.getByIds(ids);
+			Map<Long, List<VersionDetailDTO>> map = new HashMap<>();
+			// 获取所有用户开通的产品信息
+			map = EntityUtil.makeEntityListMap(details, "versionId");
+			if (map.size() > 0) {
+				for (VersionWrapperDTO versionList : versionLists) {
+					List<VersionDetailDTO> userAndProdutUDTO = map.get(versionList.getId());
+					if (ListUtil.isNotEmpty(userAndProdutUDTO)) {
+						versionList.setDetail(userAndProdutUDTO);
+					}
+				}
+			}
+		}
+		return versionLists;
+
+	}
+
+	public boolean saveVersionInfoAll(VersionInfoVO versionInfoVO) {
+		// 1.判断该版本号是否存在名字相同的数据
+		QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+		templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		VersionInfo dataInfo = getOne(templateInfoFand);
+		if (dataInfo != null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
+		}
+
+		//增加版本数据
+		VersionInfo versionInfo = new VersionInfo();
+		versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
+		versionInfo.setGmtCreate(DateUtil.now());
+		versionInfo.setName(versionInfoVO.getName());
+		versionInfo.setGmtModified(DateUtil.now());
+		versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		try {
+			versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
+		} catch (ParseException e) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+			// e.printStackTrace();
+		}
+		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+		versionInfo.setRemark(versionInfoVO.getRemark());
+		boolean res = save(versionInfo);
+		if (res) {
+			List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
+			List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
+			if (datas != null && datas.size() > 0) {
+				for (VersionDetailVO data : datas) {
+					VersionDetail versionDetail = new VersionDetail();
+					versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+					versionDetail.setGmtCreate(DateUtil.now());
+					versionDetail.setGmtModified(DateUtil.now());
+					versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+					versionDetail.setDescription(data.getDescription());
+					versionDetail.setOrderNo(data.getOrderNo());
+					versionDetail.setTitle(data.getTitle());
+					versionDetail.setVersionId(versionInfo.getId());
+					// System.out.println("========versionInfo.getId()======" +
+					// versionInfo.getId());
+					versionDetail.setRemark(data.getRemark());
+					versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+					dataNew.add(versionDetail);
+				}
+
+				res = versionDetailServiceImpl.saveBatch(dataNew);
+			}
+
+			// System.out.println(res);
+		}
+		return res;
+	}
+
+	/**
+	 * 
+	 * @param versionInfoVO
+	 * @return
+	 */
+	public boolean updateVersionInfoAll(VersionInfoAllVO versionInfoVO) {
+		// 1.先判断数据是否存在有效
+		QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
+		VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", versionInfoVO.getId());
+		VersionInfo data = getOne(VersionInfoFand);
+		if (data == null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+		}
+		// 3.修改版本信息
+		VersionInfo versionInfo = new VersionInfo();
+		versionInfo.setId(versionInfoVO.getId());// 模板id
+		versionInfo.setName(versionInfoVO.getName());// 模板名称
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		if (versionInfoVO.getRefreshTime() != null) {
+			try {
+				versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
+			} catch (ParseException e) {
+				throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+				// e.printStackTrace();
+			}
+		}
+
+		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+		versionInfo.setRemark(versionInfoVO.getRemark());
+		versionInfo.setGmtModified(DateUtil.now());// 修改时间
+		versionInfo.setModifier(UserUtils.getCurrentPrincipleID());
+		boolean res = updateById(versionInfo);
+		if (!res) {
+			throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+		}
+
+		return res;
+	}
+
+	/**
+	 * 删除
+	 * 
+	 * @param versionInfoVO
+	 * @return
+	 */
+	public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
+		UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
+		versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
+		return update(new VersionInfo(), versionInfoNew);
+	}
+
+}

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.VitalInfoDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.VitalOrderService;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -13,6 +14,7 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -27,7 +29,8 @@ import java.util.Map;
 public class VitalOrderFacade extends VitalOrderServiceImpl {
 
     @Autowired
-    VitalOrderServiceImpl vitalOrderServiceImpl;
+    @Qualifier("vitalOrderServiceImpl")
+    VitalOrderService vitalOrderService;
     @Autowired
     QuestionInfoFacade questionInfoFacade;
 
@@ -47,9 +50,11 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
             vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
             vitalOrder.setCreator(UserUtils.getCurrentPrincipleID());
             vitalOrder.setGmtCreate(DateUtil.now());
+            vitalOrder.setModifier(UserUtils.getCurrentPrincipleID());
+            vitalOrder.setGmtModified(DateUtil.now());
             vitalOrderList.add(vitalOrder);
         }
-        vitalOrderServiceImpl.saveBatch(vitalOrderList);
+        vitalOrderService.saveBatch(vitalOrderList);
         return true;
     }
 

icssman-service/src/main/java/com/diagbot/mapper/DisclaimerInformationMapper.java

@@ -0,0 +1,24 @@
+package com.diagbot.mapper;
+
+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.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+
+/**
+ * <p>
+ * 免责申明详情 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DisclaimerInformationMapper extends BaseMapper<DisclaimerInformation> {
+	
+	public IPage<DisclaimerInformationDTO> getDisclaimerInformationAll(Page page, @Param("disAll") DisclaimerInformationAllVO disAll);
+
+}

icssman-service/src/main/java/com/diagbot/mapper/IntroduceInfoMapper.java

@@ -1,7 +1,12 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.IntroduceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.IntroducePageDTO;
+import com.diagbot.entity.IntroduceInfo;
+import com.diagbot.vo.IntroducePageVO;
+import org.apache.ibatis.annotations.Param;
+
 
 /**
  * <p>
@@ -12,5 +17,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-11-16
  */
 public interface IntroduceInfoMapper extends BaseMapper<IntroduceInfo> {
-
+    /**
+     * 获取提示信息分页信息
+     *
+     * @param introducePageVO
+     * @return
+     */
+    IPage<IntroducePageDTO> getIntroducePage(@Param("introducePageVO")IntroducePageVO introducePageVO) ;
 }

icssman-service/src/main/java/com/diagbot/mapper/VersionDetailMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.VersionDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 版本详情(关于) Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionDetailMapper extends BaseMapper<VersionDetail> {
+
+}

icssman-service/src/main/java/com/diagbot/mapper/VersionInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.VersionInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 版本信息(关于) Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionInfoMapper extends BaseMapper<VersionInfo> {
+
+}

icssman-service/src/main/java/com/diagbot/service/DisclaimerInformationService.java

@@ -0,0 +1,22 @@
+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.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+
+/**
+ * <p>
+ * 免责申明详情 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DisclaimerInformationService extends IService<DisclaimerInformation> {
+	
+	public IPage<DisclaimerInformationDTO> getDisclaimerInformationAll(Page page, DisclaimerInformationAllVO disAll);
+
+}

icssman-service/src/main/java/com/diagbot/service/IntroduceInfoService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.IntroduceInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.IntroducePageDTO;
+import com.diagbot.entity.IntroduceInfo;
+import com.diagbot.vo.IntroducePageVO;
 
 /**
  * <p>
@@ -12,5 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-11-16
  */
 public interface IntroduceInfoService extends IService<IntroduceInfo> {
-
+    /**
+     * 获取提示信息分页信息
+     * @param introducePageVO
+     * @return
+     */
+    IPage<IntroducePageDTO> getIntroducePage(IntroducePageVO introducePageVO);
 }

icssman-service/src/main/java/com/diagbot/service/VersionDetailService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.VersionDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 版本详情(关于) 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionDetailService extends IService<VersionDetail> {
+
+}

icssman-service/src/main/java/com/diagbot/service/VersionInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.VersionInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 版本信息(关于) 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionInfoService extends IService<VersionInfo> {
+
+}

icssman-service/src/main/java/com/diagbot/service/impl/DisclaimerInformationServiceImpl.java

@@ -0,0 +1,32 @@
+package com.diagbot.service.impl;
+
+import org.springframework.stereotype.Service;
+
+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.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.mapper.DisclaimerInformationMapper;
+import com.diagbot.service.DisclaimerInformationService;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+
+/**
+ * <p>
+ * 免责申明详情 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class DisclaimerInformationServiceImpl extends ServiceImpl<DisclaimerInformationMapper, DisclaimerInformation> implements DisclaimerInformationService {
+
+	
+	@Override
+	public IPage<DisclaimerInformationDTO> getDisclaimerInformationAll(Page page, DisclaimerInformationAllVO disAll) {
+		 
+		return baseMapper.getDisclaimerInformationAll(page, disAll);
+	}
+
+}

icssman-service/src/main/java/com/diagbot/service/impl/IntroduceInfoServiceImpl.java

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.IntroducePageDTO;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.mapper.IntroduceInfoMapper;
 import com.diagbot.service.IntroduceInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.IntroducePageVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class IntroduceInfoServiceImpl extends ServiceImpl<IntroduceInfoMapper, IntroduceInfo> implements IntroduceInfoService {
 
+    /**
+     * 获取提示信息分页信息
+     *
+     * @param introducePageVO
+     * @return
+     */
+    public IPage<IntroducePageDTO> getIntroducePage(IntroducePageVO introducePageVO) {
+        return this.baseMapper.getIntroducePage(introducePageVO);
+    }
 }

icssman-service/src/main/java/com/diagbot/service/impl/VersionDetailServiceImpl.java

@@ -0,0 +1,21 @@
+package com.diagbot.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.mapper.VersionDetailMapper;
+import com.diagbot.service.VersionDetailService;
+
+/**
+ * <p>
+ * 版本详情(关于) 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class VersionDetailServiceImpl extends ServiceImpl<VersionDetailMapper, VersionDetail> implements VersionDetailService {
+
+}

icssman-service/src/main/java/com/diagbot/service/impl/VersionInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.mapper.VersionInfoMapper;
+import com.diagbot.service.VersionInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 版本信息(关于) 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class VersionInfoServiceImpl extends ServiceImpl<VersionInfoMapper, VersionInfo> implements VersionInfoService {
+
+}

icssman-service/src/main/java/com/diagbot/vo/AddTagRetrievalVO.java

@@ -33,4 +33,18 @@ public class AddTagRetrievalVO {
 	@NotBlank(message="同义词名称必传")
 	private String retrievalName;
 	
+	/**
+	 * 同义词拼音
+	 */
+	@ApiModelProperty(value="同义词拼音",required=true)
+	@NotBlank(message="同义词拼音必传")
+	private String retrievalSpell;
+	
+	/**
+	 * 同义词种类
+	 */
+	@ApiModelProperty(value="同义词种类",required=true)
+	@NotNull(message="同义词种类必传")
+	private Integer retrievalType;
+	
 }

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationAllVO.java

@@ -0,0 +1,46 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DisclaimerInformationAllVO {
+	
+	
+	private Long id;
+    /**
+     * 主表id
+     */
+   // private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationIdVO.java

@@ -0,0 +1,11 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DisclaimerInformationIdVO {
+
+	private Long id;
+}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationTitleVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Setter
+@Getter
+public class DisclaimerInformationTitleVO extends Page{
+
+	/**
+     * 归属名称
+     */
+    private String title;
+}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class DisclaimerInformationVO {
+	 /**
+     * 主表id
+     */
+   // private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

icssman-service/src/main/java/com/diagbot/vo/IntroducePageVO.java

@@ -7,12 +7,13 @@ import lombok.Setter;
 import java.util.Map;
 
 /**
- * @Description:
+ * @Description:提示信息分页展示入参
  * @Author:zhaops
  * @time: 2018/11/16 15:50
  */
 @Getter
 @Setter
 public class IntroducePageVO extends Page {
-    Map<String, Object> map;
+    String name;
+    String tagName;
 }

icssman-service/src/main/java/com/diagbot/vo/VersionDetailIdVO.java

@@ -0,0 +1,12 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class VersionDetailIdVO {
+	private Long id;
+}

icssman-service/src/main/java/com/diagbot/vo/VersionDetailVO.java

@@ -0,0 +1,45 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 上午10:20:56
+ */
+@Getter
+@Setter
+public class VersionDetailVO {
+
+	   /**
+     * 版本主表id
+     */
+    private Long detailId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

icssman-service/src/main/java/com/diagbot/vo/VersionInfoAllVO.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月29日 下午4:01:30
+ */
+@Getter
+@Setter
+public class VersionInfoAllVO {
+	/**
+	 * 版本id
+	 */
+	private Long id;
+	/**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 时间
+     */
+    private String refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

icssman-service/src/main/java/com/diagbot/vo/VersionInfoAndDetailIdVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class VersionInfoAndDetailIdVO {
+	/**
+	 * 用户id
+	 */
+	private Long versionInfoId;
+	
+    private List<VersionDetailVO> versionDetail;
+}

icssman-service/src/main/java/com/diagbot/vo/VersionInfoIdVO.java

@@ -0,0 +1,10 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class VersionInfoIdVO {
+	private Long id;
+}

icssman-service/src/main/java/com/diagbot/vo/VersionInfoVO.java

@@ -0,0 +1,45 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月28日 上午10:55:17
+ */
+@Getter
+@Setter
+public class VersionInfoVO {
+
+	/**
+	 * 用户id
+	 */
+	//private Long id;
+	/**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 时间
+     */
+    private String refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    
+    private List<VersionDetailVO> versionDetail;
+}

icssman-service/src/main/java/com/diagbot/vo/VersionWrapperNameVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class VersionWrapperNameVO extends Page{
+	/**
+     * 名称
+     */
+    private String name;
+}

icssman-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -0,0 +1,105 @@
+package com.diagbot.web;
+
+
+import java.util.List;
+
+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.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisclaimerInformationFacaed;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+import com.diagbot.vo.DisclaimerInformationIdVO;
+import com.diagbot.vo.DisclaimerInformationTitleVO;
+import com.diagbot.vo.DisclaimerInformationVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 免责申明详情 前端控制器
+ * @date 2018年12月5日 下午3:44:22
+ */
+@RestController
+@RequestMapping("/disclaimerInformation")
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "WF——免责申明详情API" })
+@SuppressWarnings("unchecked")
+public class DisclaimerInformationController {
+	
+	@Autowired
+	DisclaimerInformationFacaed disclaimerInformationFacaed;
+
+	@ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+	@PostMapping("/getDisclaimerInformations")
+	@SysLogger("getDisclaimerInformations")
+	@Transactional
+	public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationTitleVO disclaimerInformationTitleVO) {
+
+		List<DisclaimerInformationDTO> data = disclaimerInformationFacaed.getDisclaimerInformation(disclaimerInformationTitleVO,disclaimerInformationTitleVO.getTitle());
+		
+		return RespDTO.onSuc(data);
+	}
+	
+	@ApiOperation(value = "增加免责申明详情[by:wangfeng]", notes = "增加免责申明详情")
+	@PostMapping("/addDisclaimerInformations")
+	@SysLogger("addDisclaimerInformations")
+	@Transactional
+	public RespDTO<Boolean> addDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO) {
+
+		boolean res = disclaimerInformationFacaed.addDisclaimerInformation(disclaimerInformationVO);
+		
+		return RespDTO.onSuc(res);
+	}
+	
+	@ApiOperation(value = "修改免责申明详情[by:wangfeng]", notes = "修改免责申明详情")
+	@PostMapping("/updateDisclaimerInformations")
+	@SysLogger("updateDisclaimerInformations")
+	@Transactional
+	public RespDTO<Boolean> updateDisclaimerInformations(@RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
+
+		boolean res = disclaimerInformationFacaed.updateDisclaimerInformation(disclaimerInformationAllVO);
+		
+		return RespDTO.onSuc(res);
+	}
+	
+	@ApiOperation(value = "删除免责申明详情[by:wangfeng]", notes = "删除免责申明详情")
+	@PostMapping("/cancelDisclaimerInformations")
+	@SysLogger("cancelDisclaimerInformations")
+	@Transactional
+	public RespDTO<Boolean> cancelDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
+
+		boolean res = disclaimerInformationFacaed.cancelDisclaimerInformation(disclaimerInformationIdVO);
+		
+		return RespDTO.onSuc(res);
+	}
+	@ApiOperation(value = "启用免责申明详情[by:wangfeng]", notes = "启用免责申明详情")
+	@PostMapping("/startDisclaimerInformations")
+	@SysLogger("startDisclaimerInformations")
+	@Transactional
+	public RespDTO<Boolean> startDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
+		
+		boolean res = disclaimerInformationFacaed.startDisclaimerInformations(disclaimerInformationIdVO);
+		
+		return RespDTO.onSuc(res);
+	}
+	
+	@ApiOperation(value = "停用免责申明详情[by:wangfeng]", notes = "停用免责申明详情")
+	@PostMapping("/endDisclaimerInformations")
+	@SysLogger("endDisclaimerInformations")
+	@Transactional
+	public RespDTO<Boolean> endDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
+		
+		boolean res = disclaimerInformationFacaed.endDisclaimerInformations(disclaimerInformationIdVO);
+		
+		return RespDTO.onSuc(res);
+	}
+}

icssman-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -3,6 +3,8 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.IntroducePageDTO;
+import com.diagbot.dto.QuestionIntroduceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.facade.IntroduceInfoFacade;
@@ -86,11 +88,12 @@ public class IntroduceInfoController {
     @ApiOperation(value = "分页查询提示信息，可带等于条件[by:zhaops]",
             notes = "current:页码，必填<br>" +
                     "size:每页显示条数，必填<br>" +
-                    "map:查询条件（=），key为数据库字段名<br>")
-    @PostMapping("/getPageByMap")
-    @SysLogger("getPageByMap")
-    public RespDTO getPageByMap(@RequestBody IntroducePageVO introducePageVO) {
-        IPage<IntroduceInfo> infoIPage = introduceInfoFacade.getPageByMap(introducePageVO);
+                    "name:提示信息名称<br>" +
+                    "tagName:标签名称<br>")
+    @PostMapping("/getIntroducePage")
+    @SysLogger("getIntroducePage")
+    public RespDTO getIntroducePage(@RequestBody IntroducePageVO introducePageVO) {
+        IPage<IntroducePageDTO> infoIPage = introduceInfoFacade.getIntroducePageByMap(introducePageVO);
         return RespDTO.onSuc(infoIPage);
     }
 
@@ -108,4 +111,21 @@ public class IntroduceInfoController {
         List<IntroduceInfo> data = introduceInfoFacade.getByMap(map);
         return RespDTO.onSuc(data);
     }
-}
+
+    @ApiOperation(value = "根据id获取提示信息[by:zhaops]",
+            notes = "id:id，必填<br>")
+    @PostMapping("/getIntroduceById")
+    @SysLogger("getIntroduceById")
+    public RespDTO<IntroducePageDTO> getIntroduceById(@RequestParam Long id) {
+        IntroducePageDTO data = introduceInfoFacade.getIntroduceById(id);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "获取未关联标签列表-新增提示信息时[by:zhaops]")
+    @PostMapping("/getAllQuestionList")
+    @SysLogger("getAllQuestionList")
+    public RespDTO<QuestionIntroduceDTO> getUnRelatedQuestionList() {
+        List<QuestionIntroduceDTO> data = introduceInfoFacade.getAllQuestionList();
+        return RespDTO.onSuc(data);
+    }
+}

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -23,14 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/moduleInfo")
 @SuppressWarnings("unchecked")
-@Api(value = "标签模板相关API", tags = { "标签模板相关API" })
+@Api(value = "主诉-既往史模板相关API", tags = { "主诉-既往史模板相关API" })
 public class ModuleInfoController {
 
 
     @Autowired
     ModuleInfoFacade moduleInfoFacade;
 
-    @ApiOperation(value = "标签模板新增或更新[by:zhoutg]",
+    @ApiOperation(value = "模板新增或更新[by:zhoutg]",
             notes = "")
     @PostMapping("/saveOrUpdate")
     @SysLogger("saveOrUpdate")
@@ -41,7 +41,7 @@ public class ModuleInfoController {
     }
 
 
-    @ApiOperation(value = "标签模板删除[by:zhoutg]",
+    @ApiOperation(value = "模板删除[by:zhoutg]",
             notes = "")
     @PostMapping("/delete")
     @SysLogger("delete")

icssman-service/src/main/java/com/diagbot/web/VersionDetailController.java

@@ -0,0 +1,68 @@
+package com.diagbot.web;
+
+
+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.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.VersionDetailFacade;
+import com.diagbot.vo.VersionDetailIdVO;
+import com.diagbot.vo.VersionDetailVO;
+import com.diagbot.vo.VersionInfoAndDetailIdVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 版本详情(关于) 前端控制器
+ * @date 2018年12月4日 上午13:18:25
+ */
+@RestController
+@RequestMapping("/versionDetail")
+@Api(value = "版本信息详情API[by:wangfeng]", tags = { "WF——版本信息详情API" })
+@SuppressWarnings("unchecked")
+public class VersionDetailController {
+	
+	@Autowired
+	VersionDetailFacade versionDetailFacade;
+	
+	@ApiOperation(value = "更新版本详情信息[by:wangfeng]", notes = "更新版本详情信息")
+	@PostMapping("/updateVersionDetails")
+	@SysLogger("updateVersionDetails")
+	@Transactional
+	public RespDTO<Boolean> updateVersionDetails(@RequestBody VersionDetailVO versionDetailVO) {
+
+		boolean res = versionDetailFacade.updateVersionDetail(versionDetailVO);
+
+		return RespDTO.onSuc(res);
+	}
+	
+	@ApiOperation(value = "删除版本详情信息[by:wangfeng]", notes = "删除版本详情信息")
+	@PostMapping("/cancelVersionDetails")
+	@SysLogger("cancelVersionDetails")
+	@Transactional
+	public RespDTO<Boolean> cancelVersionDetails(@RequestBody VersionDetailIdVO versionDetailIdVO) {
+
+		boolean res = versionDetailFacade.cancelVersionDetail(versionDetailIdVO);
+
+		return RespDTO.onSuc(res);
+	}
+
+	@ApiOperation(value = "增加版本详情信息[by:wangfeng]", notes = "增加版本详情信息")
+	@PostMapping("/addVersionDetails")
+	@SysLogger("addVersionDetails")
+	@Transactional
+	public RespDTO<Boolean> addVersionDetails(@RequestBody VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
+
+		boolean res = versionDetailFacade.addVersionDetail(versionInfoAndDetailIdVO);
+
+		return RespDTO.onSuc(res);
+	}
+}

icssman-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -0,0 +1,82 @@
+package com.diagbot.web;
+
+import java.util.List;
+
+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.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.facade.VersionInfoFacade;
+import com.diagbot.vo.VersionInfoAllVO;
+import com.diagbot.vo.VersionInfoIdVO;
+import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionWrapperNameVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description:  版本信息(关于) 前端控制器
+ * @date 2018年12月4日 上午10:57:49
+ */
+@RestController
+@RequestMapping("/versionInfo")
+@Api(value = "版本信息(关于)API[by:wangfeng]", tags = { "WF——版本信息(关于)API" })
+@SuppressWarnings("unchecked")
+public class VersionInfoController {
+
+	@Autowired
+	VersionInfoFacade versionInfoFacade;
+
+	@ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
+	@PostMapping("/getVersionInfoAlls")
+	@SysLogger("getVersionInfoAlls")
+	@Transactional
+	public RespDTO<List<VersionWrapperDTO>> getVersionInfoAlls(@RequestBody VersionWrapperNameVO versionWrapperNameVO) {
+
+		List<VersionWrapperDTO> data = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO,versionWrapperNameVO.getName());
+
+		return RespDTO.onSuc(data);
+	}
+	
+	@ApiOperation(value = "保存版本信息[by:wangfeng]", notes = "保存版本信息")
+	@PostMapping("/saveVersionInfoAlls")
+	@SysLogger("saveVersionInfoAlls")
+	@Transactional
+	public RespDTO<Boolean> saveVersionInfoAlls(@RequestBody VersionInfoVO versionInfoVO) {
+
+		boolean res = versionInfoFacade.saveVersionInfoAll(versionInfoVO);
+
+		return RespDTO.onSuc(res);
+	}
+
+	@ApiOperation(value = "更新版本信息[by:wangfeng]", notes = "更新版本信息")
+	@PostMapping("/updateVersionInfoAlls")
+	@SysLogger("updateVersionInfoAlls")
+	@Transactional
+	public RespDTO<Boolean> updateVersionInfoAlls(@RequestBody VersionInfoAllVO versionInfoVO) {
+
+		boolean res = versionInfoFacade.updateVersionInfoAll(versionInfoVO);
+
+		return RespDTO.onSuc(res);
+	}
+	
+	@ApiOperation(value = "删除版本信息[by:wangfeng]", notes = "删除版本信息")
+	@PostMapping("/cancelVersionInfoAlls")
+	@SysLogger("cancelVersionInfoAlls")
+	@Transactional
+	public RespDTO<Boolean> cancelVersionInfoAlls(@RequestBody VersionInfoIdVO versionInfoVO) {
+
+		boolean res = versionInfoFacade.cancelVersionInfoAll(versionInfoVO);
+
+		return RespDTO.onSuc(res);
+	}
+}

icssman-service/src/main/resources/mapper/DisclaimerInformationMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.DisclaimerInformationMapper">
+
+	<!-- 通用查询映射结果 -->
+	<resultMap id="BaseResultMap" type="com.diagbot.entity.DisclaimerInformation">
+		<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="version_id" property="versionId" />
+		<result column="title" property="title" />
+		<result column="description" property="description" />
+		<result column="order_no" property="orderNo" />
+		<result column="status" property="status" />
+		<result column="disclaimer_code" property="disclaimerCode" />
+		<result column="remark" property="remark" />
+	</resultMap>
+	<select id="getDisclaimerInformationAll" resultType="com.diagbot.dto.DisclaimerInformationDTO">
+		SELECT
+		id as id,
+		gmt_create as gmtCreate,
+		modifier as modifier,
+		version_id as versionId,
+		title as title,
+		description as description,
+		order_no as orderNo,
+		status as status,
+		disclaimer_code as disclaimerCode,
+		remark as remark
+		FROM icss_disclaimer_information
+		WHERE is_deleted = "N"
+		AND version_id =0
+		<if test="disAll.title != null">
+		and title like concat('%',#{disAll.title},'%')
+		</if>
+		ORDER BY order_no
+	</select>
+</mapper>

icssman-service/src/main/resources/mapper/IntroduceInfoMapper.xml

@@ -14,4 +14,44 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapDTO" type="com.diagbot.dto.IntroducePageDTO">
+        <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="remark" property="remark" />
+        <result column="tag_name" property="tagName" />
+    </resultMap>
+
+    <!-- 分页查询 -->
+    <select id="getIntroducePage" resultMap="BaseResultMapDTO">
+    SELECT info.*, t.tag_name FROM icss_introduce_info info,
+	    (SELECT tt.introduce_id,GROUP_CONCAT(tt.tag_name) AS tag_name
+		    FROM
+			(
+				SELECT
+					a.introduce_id,
+					b.tag_name,
+					b.id
+				FROM
+					icss_introduce_map a,
+					icss_question_info b
+				WHERE
+					a.question_id = b.id
+				AND a.type = b.type
+			) tt
+		    GROUP BY tt.introduce_id
+	    ) t
+    WHERE info.id = t.introduce_id
+	<if test="introducePageVO.name != null and introducePageVO.name != '' ">
+	    and info.name like concat('%',#{introducePageVO.name},'%')
+    </if>
+    <if test="introducePageVO.tagName != null and introducePageVO.tagName != '' ">
+        and t.tag_name like concat('%',#{introducePageVO.tagName},'%')
+    </if>
+    </select>
 </mapper>

icssman-service/src/main/resources/mapper/RetrievalMapper.xml

@@ -20,7 +20,9 @@
 		SELECT
 			c.id as retrievalId,
 			b.id as retrievalMappingId,
-			c.`name` as retrievalName
+			c.`name` as retrievalName,
+			c.spell as retrievalSpell,
+			b.show_type as retrievalType
 		FROM icss_question_info a 
 		JOIN icss_retrieval_mapping b
 		ON a.id=b.question_id

icssman-service/src/main/resources/mapper/VersionDetailMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.VersionDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.VersionDetail">
+        <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="version_id" property="versionId" />
+        <result column="title" property="title" />
+        <result column="description" property="description" />
+        <result column="order_no" property="orderNo" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

icssman-service/src/main/resources/mapper/VersionInfoMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.VersionInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.VersionInfo">
+        <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="refresh_time" property="refreshTime" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>