Merge remote-tracking branch 'origin/debug' into debug

config-server/src/main/resources/shared/icss-service-dev.yml

@@ -109,7 +109,3 @@ graph:
 symptom:
   server:
     address: http://192.168.2.234:5002
-
-treat:
-  server:
-    address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-local.yml

@@ -109,7 +109,3 @@ graph:
 symptom:
   server:
     address: http://192.168.2.234:5002
-
-treat:
-  server:
-    address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -110,6 +110,3 @@ symptom:
   server:
     address: http://192.168.2.234:5002
 
-treat:
-  server:
-    address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-test.yml

@@ -109,7 +109,3 @@ graph:
 symptom:
   server:
     address: http://192.168.2.234:5002
-
-treat:
-  server:
-    address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icssman-service-dev.yml

@@ -98,3 +98,11 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.236:22122
+

config-server/src/main/resources/shared/icssman-service-local.yml

@@ -98,3 +98,12 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.236:22122
+
+

config-server/src/main/resources/shared/icssman-service-pro.yml

@@ -98,3 +98,11 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.236:22122
+

config-server/src/main/resources/shared/icssman-service-test.yml

@@ -98,3 +98,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+fastdfs:
+  connect_timeout_in_seconds: 60
+  network_timeout_in_seconds: 60
+  charset: UTF-8
+  http_tracker_http_port: 8080
+  http_anti_steal_token: no
+  tracker_servers: 192.168.2.241:22122

icss-service/src/main/java/com/diagbot/client/TreatServiceClient.java

@@ -1,20 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.bean.GdbResponse;
-import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.TreatInput;
-import com.diagbot.client.hystrix.TreatServiceHystrix;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/17 15:02
- */
-@FeignClient(name = "Treat", url = "${treat.server.address}", fallback = TreatServiceHystrix.class)
-public interface TreatServiceClient {
-    @PostMapping(value = "/web/graphdb/treat")
-    Response<GdbResponse> treatPageData(@RequestBody TreatInput treatInput);
-}

icss-service/src/main/java/com/diagbot/client/hystrix/TreatServiceHystrix.java

@@ -1,23 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.TreatServiceClient;
-import com.diagbot.client.bean.GdbResponse;
-import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.TreatInput;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/17 15:03
- */
-@Component
-@Slf4j
-public class TreatServiceHystrix implements TreatServiceClient {
-    @Override
-    public Response<GdbResponse> treatPageData(TreatInput treatInput) {
-        log.error("【hystrix】调用{}异常", "treatPageData");
-        return null;
-    }
-}

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

@@ -22,7 +22,8 @@ public class QuestionDTO {
     private String tagName;//标签名称
     private Integer type;//类型（1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
     private Integer controlType; //控件类型
-    private Integer subType; //子类型
+    private Integer subType; //检索类型
+    private Integer itemType; //元素类型
     private Integer tagType; //标签标识
     private String labelPrefix = ""; //前置内容
     private String labelSuffix = ""; //后置内容

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

@@ -64,10 +64,15 @@ public class QuestionInfo implements Serializable {
 
 
     /**
-     * 子类型，(31：既往史 32：家族史 33：个人史 34：月经史 35：婚育史)
+     * 检索类型
      */
     private Integer subType;
 
+    /**
+     * 元素类型
+     */
+    private Integer itemType;
+
     /**
      * 标签标识
      */

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

@@ -9,6 +9,7 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.ListUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -47,6 +48,9 @@ public class FeatureFacade {
                 symptomNameList.add(symptomFeature.get("feature_name").toString());
             }
         }
+        if (!ListUtil.isNotEmpty(symptomFeatureList)) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "未提取到特征词");
+        }
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 in("tag_name", symptomNameList).

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

@@ -215,7 +215,7 @@ public class LisExcelResFacade {
 					obj = DateFormatUtils.format(date, "yyyy-MM-dd");
 				} else {
 					obj = cell.getNumericCellValue();
-					DecimalFormat df = new DecimalFormat("0");
+					DecimalFormat df = new DecimalFormat();
 					obj = df.format(obj);
 				}
 

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

@@ -2,7 +2,6 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.TreatServiceClient;
 import com.diagbot.client.bean.Medicition;
 import com.diagbot.client.bean.MedicitionClass;
 import com.diagbot.entity.IntroduceDetail;
@@ -36,8 +35,6 @@ public class TreatmentFacade {
     @Autowired
     IntroduceDetailFacade introduceDetailFacade;
     @Autowired
-    TreatServiceClient treatServiceClient;
-    @Autowired
     IntroduceMapFacade introduceMapFacade;
 
     /**

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

@@ -14,6 +14,7 @@
         <result column="text_generate" property="textGenerate" />
         <result column="control_type" property="controlType" />
         <result column="sub_type" property="subType" />
+        <result column="item_type" property="itemType" />
         <result column="tag_type" property="tagType" />
         <result column="label_prefix" property="labelPrefix" />
         <result column="label_suffix" property="labelSuffix" />

icssman-service/src/main/java/com/diagbot/client/fastdfs/FastDFSClient.java

@@ -9,7 +9,6 @@ import org.csource.fastdfs.StorageServer;
 import org.csource.fastdfs.TrackerClient;
 import org.csource.fastdfs.TrackerServer;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.io.ClassPathResource;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -23,15 +22,6 @@ import java.io.InputStream;
 public class FastDFSClient {
     private static org.slf4j.Logger logger = LoggerFactory.getLogger(FastDFSClient.class);
 
-    static {
-        try {
-            String filePath = new ClassPathResource("fdfs_client.conf").getFile().getAbsolutePath();
-            ClientGlobal.init(filePath);
-        } catch (Exception e) {
-            logger.error("FastDFS Client Init Fail!", e);
-        }
-    }
-
     public static String[] upload(FastDFSFile file) {
         logger.info("File Name: " + file.getName() + "File Length:" + file.getContent().length);
 

icssman-service/src/main/java/com/diagbot/config/FastDFSConfigurer.java

@@ -0,0 +1,49 @@
+package com.diagbot.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.csource.fastdfs.ClientGlobal;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/3/1 14:15
+ */
+@Configuration
+@Slf4j
+public class FastDFSConfigurer {
+    @Value("${fastdfs.connect_timeout_in_seconds}")
+    private String connectTimeout;
+    @Value("${fastdfs.network_timeout_in_seconds}")
+    private String networkTimeout;
+    @Value("${fastdfs.charset}")
+    private String charset;
+    @Value("${fastdfs.http_tracker_http_port}")
+    private String httpTrackerHttpPort;
+    @Value("${fastdfs.http_anti_steal_token}")
+    private String httpAntiStealToken;
+    @Value("${fastdfs.tracker_servers}")
+    private String trackerServers;
+
+    @Bean
+    public Integer fastDFSInit(){
+        try {
+            Properties props = new Properties();
+            props.put(ClientGlobal.PROP_KEY_CONNECT_TIMEOUT_IN_SECONDS, connectTimeout);
+            props.put(ClientGlobal.PROP_KEY_NETWORK_TIMEOUT_IN_SECONDS, networkTimeout);
+            props.put(ClientGlobal.PROP_KEY_CHARSET, charset);
+            props.put(ClientGlobal.PROP_KEY_HTTP_TRACKER_HTTP_PORT, httpTrackerHttpPort);
+            props.put(ClientGlobal.PROP_KEY_HTTP_ANTI_STEAL_TOKEN, httpAntiStealToken);
+            props.put(ClientGlobal.PROP_KEY_TRACKER_SERVERS, trackerServers);
+            ClientGlobal.initByProperties(props);
+
+        } catch (Exception e) {
+            log.error("FastDFS Client Init Fail!", e);
+        }
+        return 1;
+    }
+}

icssman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -22,6 +22,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
 
     @Override
     public void configure(HttpSecurity http) throws Exception {
+        http.headers().frameOptions().disable();
         http
                 .csrf().disable()
                 .authorizeRequests()
@@ -32,7 +33,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/dictionaryInfo/getList").permitAll()
                 .antMatchers("/getIcssEnumsData").permitAll()
                 .antMatchers("/**").authenticated();
-//                .antMatchers("/**").permitAll();
+        //                .antMatchers("/**").permitAll();
+
+
     }
 
 

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

@@ -1,11 +1,27 @@
 package com.diagbot.dto;
 
 import com.diagbot.entity.DeptInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
 
 /**
  * @Description:
  * @author: wangyu
  * @time: 2018/11/19 18:56
  */
+@Getter
+@Setter
 public class DeptInfoDTO extends DeptInfo {
+
+    /**
+     * 归属类型和类型名称
+     */
+    private List<QuestionTypeDTO> typeDTOList;
+
+    /**
+     * 常用标签
+     */
+    private List<GetQuestionUsualAndTypeDTO> questionUsuals;
 }

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

@@ -1,11 +1,8 @@
 package com.diagbot.dto;
 
-import java.util.Date;
-
-import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.enums.DisclaimerCodeEnum;
 
-import lombok.Getter;
-import lombok.Setter;
+import java.util.Date;
 
 /**
  * 
@@ -13,56 +10,133 @@ import lombok.Setter;
  * @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;
+	/**
+	 * 记录创建时间
+	 */
+	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;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	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() {
+		if (disclaimerCode.equals("1")) {
+			return DisclaimerCodeEnum.getName(1);
+		} else if (disclaimerCode.equals("2")) {
+			return DisclaimerCodeEnum.getName(2);
+		} else if (disclaimerCode.equals("3")) {
+			return DisclaimerCodeEnum.getName(3);
+		} else {
+			return disclaimerCode;
+		}
+	}
+
+	public void setDisclaimerCode(String disclaimerCode) {
+		this.disclaimerCode = disclaimerCode;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 
 }

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

@@ -15,4 +15,13 @@ public class FileDTO {
     private String original;
     private String title;
     private String url;
+    private String info;
+
+    public FileDTO(String state, String info) {
+        this.state = state;
+        this.info = info;
+    }
+    public FileDTO(){
+
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.QuestionUsual;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/3/7 16:13
+ */
+@Getter
+@Setter
+public class GetQuestionUsualAndTypeDTO extends QuestionUsual {
+    /**
+     * 标签类型
+     */
+    private Integer type;
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -20,5 +21,6 @@ public class IntroducePageDTO extends IntroduceInfo {
     private Date gmtOperate;
     private String tagName;
     private List<QuestionShortDTO> questionList;
-    private List<QuestionShortDTO> unRelatedQuestionList;
+    //private List<QuestionShortDTO> unRelatedQuestionList;
+    private List<IntroduceDetail> details;
 }

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

@@ -22,7 +22,8 @@ public class QuestionDTO {
     private String tagName;//标签名称
     private Integer type;//类型（1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
     private Integer controlType; //控件类型
-    private Integer subType; //子类型
+    private Integer subType; //检索类型
+    private Integer itemType; //元素类型
     private Integer tagType; //标签标识
     private String labelPrefix = ""; //前置内容
     private String labelSuffix = ""; //后置内容

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

@@ -114,10 +114,15 @@ public class QuestionPageDTO implements Serializable {
     private String typeCn;
 
     /**
-     * 子类型，(0：项目，1：描述)
+     * 检索类型
      */
     private Integer subType;
 
+    /**
+     * 元素类型
+     */
+    private Integer itemType;
+
     /**
      * 前置内容
      */

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

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/3/12 11:29
+ */
+@Getter
+@Setter
+public class QuestionTypeDTO {
+    /**
+     * 标签类型
+     */
+    private Integer type;
+
+    /**
+     * 标签名称
+     */
+    private String typeName;
+}

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

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -32,7 +34,7 @@ public class VersionWrapperDTO {
 	 * 名称
 	 */
 	private String name;
-
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date refreshTime;
 
 	/**

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

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.enums.DisclaimerCodeEnum;
 
 /**
  * <p>
@@ -161,7 +162,7 @@ public class DisclaimerInformation implements Serializable {
         this.status = status;
     }
     public String getDisclaimerCode() {
-        return disclaimerCode;
+    	return disclaimerCode;
     }
 
     public void setDisclaimerCode(String disclaimerCode) {

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

@@ -99,10 +99,15 @@ public class QuestionInfo implements Serializable {
     private Integer type;
 
     /**
-     * 子类型，(0：项目，1：描述)
+     * 检索类型
      */
     private Integer subType;
 
+    /**
+     * 元素类型
+     */
+    private Integer itemType;
+
     /**
      * 前置内容
      */

icssman-service/src/main/java/com/diagbot/entity/wrapper/QuestionWrapper.java

@@ -30,7 +30,8 @@ public class QuestionWrapper implements Serializable {
     private Integer tagType; //标签显示类型
     private Integer controlType; //控件类型
     private Integer type; //所属类型（1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
-    private Integer subType; //(0：项目，1：描述)
+    private Integer subType; //检索类型
+    private Integer itemType; //元素类型
     private String labelPrefix; //前置内容
     private String labelSuffix; //后置内容
     private BigDecimal minValue; //最小值

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

@@ -0,0 +1,47 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+
+import lombok.Setter;
+
+public enum DisclaimerCodeEnum implements KeyedNamed{
+	
+	DiagnoseDisclaimer(1, "诊断免责信息"),
+	PushLiability(2, "推送免责信息"),
+	Disclaimer(3,"免责声明");
+	
+	@Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DisclaimerCodeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DisclaimerCodeEnum getEnum(Integer key) {
+        for (DisclaimerCodeEnum item : DisclaimerCodeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+    	DisclaimerCodeEnum 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/DeptInfoFacade.java

@@ -5,19 +5,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.GetDeptInfoDTO;
+import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
+import com.diagbot.dto.QuestionTypeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddDeptInfoVO;
 import com.diagbot.vo.DeleteDeptInfoVO;
 import com.diagbot.vo.GetDeptInfoDetialsVO;
 import com.diagbot.vo.GetDeptInfoVO;
+import com.diagbot.vo.GetQuestionUsualAndTypeVO;
 import com.diagbot.vo.UpdateDeptInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -37,7 +42,10 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
 
     @Autowired
     private UserServiceClient userServiceClient;
-
+    @Autowired
+    private QuestionUsualFacade questionUsualFacade;
+    @Autowired
+    private QuestionFacade questionFacade;
     /**
      * 添加科室信息
      *
@@ -140,8 +148,59 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public List<DeptInfoDTO> getAllDeptInfo() {
-        List<DeptInfoDTO> deptInfoList = this.getDeptName();
-        return deptInfoList;
+        //查询所有科室
+        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<DeptInfo> deptInfoList = this.list(queryWrapper);
+        List<DeptInfoDTO> deptInfoDTOList = BeanUtil.listCopyTo(deptInfoList,DeptInfoDTO.class);
+        List<Long> deptIds = new ArrayList<>();
+        deptInfoList.stream().forEach(deptInfoDTO -> deptIds.add(deptInfoDTO.getId()));
+        //在常用标签中查询所有相关标签
+        GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO = new GetQuestionUsualAndTypeVO();
+        getQuestionUsualAndTypeVO.setDeptIds(deptIds);
+        List<GetQuestionUsualAndTypeDTO> getQuestionUsualAndTypeDTOS = questionUsualFacade.getQuestionUsualByDeptIds(getQuestionUsualAndTypeVO);
+        List<GetQuestionUsualAndTypeDTO> questionUsuals = new ArrayList<>();
+        List<DeptInfoDTO> deptInfoDTOS = new ArrayList<>();
+        List<QuestionTypeDTO> questionTypeDTOS = new ArrayList<>();
+        QuestionTypeDTO questionTypeDTO = null;
+        //将标签明细放入科室信息中，并排除类型
+        for (DeptInfoDTO deptInfoDTO : deptInfoDTOList) {
+            questionUsuals = new ArrayList<>();
+            questionTypeDTOS = new ArrayList<>();
+            for (GetQuestionUsualAndTypeDTO getQuestionUsualAndTypeDTO : getQuestionUsualAndTypeDTOS) {
+                    if (deptInfoDTO.getId().intValue() == getQuestionUsualAndTypeDTO.getDeptId().intValue()){
+                        questionUsuals.add(getQuestionUsualAndTypeDTO);
+                    }
+            }
+            deptInfoDTO.setQuestionUsuals(questionUsuals);
+            List<Integer> questionType = new ArrayList<>();
+            deptInfoDTO.getQuestionUsuals().forEach(getQuestionUsualAndTypeDTO -> questionType.add(getQuestionUsualAndTypeDTO.getType()));
+            //对类型进行筛选，已经添加过得类型不再显示
+            if(!questionType.contains(QuestionTypeEnum.Symptom.getKey())){
+                questionTypeDTO = new QuestionTypeDTO();
+                questionTypeDTO.setType(QuestionTypeEnum.Symptom.getKey());
+                questionTypeDTO.setTypeName(QuestionTypeEnum.getName(QuestionTypeEnum.Symptom.getKey()));
+                questionTypeDTOS.add(questionTypeDTO);
+            }
+            if(!questionType.contains(QuestionTypeEnum.Lis.getKey())){
+                questionTypeDTO = new QuestionTypeDTO();
+                questionTypeDTO.setType(QuestionTypeEnum.Lis.getKey());
+                questionTypeDTO.setTypeName(QuestionTypeEnum.getName(QuestionTypeEnum.Lis.getKey()));
+                questionTypeDTOS.add(questionTypeDTO);
+            }
+            if(!questionType.contains(QuestionTypeEnum.Pacs.getKey())){
+                questionTypeDTO = new QuestionTypeDTO();
+                questionTypeDTO.setType(QuestionTypeEnum.Pacs.getKey());
+                questionTypeDTO.setTypeName(QuestionTypeEnum.getName(QuestionTypeEnum.Pacs.getKey()));
+                questionTypeDTOS.add(questionTypeDTO);
+            }
+            deptInfoDTO.setTypeDTOList(questionTypeDTOS);
+            //对总体类型进行筛选，若该科室已经添加过疾病，化验，复检的常用标签，则该科室不再显示
+            if(ListUtil.isNotEmpty(deptInfoDTO.getTypeDTOList())){
+                deptInfoDTOS.add(deptInfoDTO);
+            }
+        }
+        return deptInfoDTOS;
     }
 
     /**

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

@@ -164,16 +164,20 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         List<Long> vitalIds = deptVitalList.stream()
                 .map(deptVitals -> deptVitals.getVitalId())
                 .collect(Collectors.toList());
-        List<QuestionInfo> vitalList = Lists.newArrayList(questionFacade.listByIds(vitalIds));
-        List<QuestionShortDTO> vitals = BeanUtil.listCopyTo(vitalList, QuestionShortDTO.class);
-        deptVitalDTO.setVitals(vitals);
+        if (vitalIds.size() > 0) {
+            List<QuestionInfo> vitalList = Lists.newArrayList(questionFacade.listByIds(vitalIds));
+            List<QuestionShortDTO> vitals = BeanUtil.listCopyTo(vitalList, QuestionShortDTO.class);
+            deptVitalDTO.setVitals(vitals);
+        }
 
         //未关联查体
         QueryWrapper<QuestionInfo> unSelectedVitalQueryWrapper = new QueryWrapper<>();
         unSelectedVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("sub_type", 0).
-                notIn("id", vitalIds).
                 eq("type", QuestionTypeEnum.Vital.getKey());
+        if (vitalIds.size() > 0) {
+            unSelectedVitalQueryWrapper.notIn("id", vitalIds);
+        }
         List<QuestionInfo> unSelectedVitalList = questionFacade.list(unSelectedVitalQueryWrapper);
         List<QuestionShortDTO> unSelectedVitals = BeanUtil.listCopyTo(unSelectedVitalList, QuestionShortDTO.class);
         deptVitalDTO.setUnSelectedVitals(unSelectedVitals);

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

@@ -1,5 +1,14 @@
 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;
@@ -20,14 +29,6 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DisclaimerInformationAllVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -47,7 +48,7 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      * @param title
      * @return
      */
-    public List<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
+    public IPage<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
 
         DisclaimerInformationAllVO disAll = new DisclaimerInformationAllVO();
         disAll.setTitle(title);
@@ -76,7 +77,7 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
 
             dataNew.add(dis);
         }
-        return dataNew;
+        return querDisclaimerInformation.setRecords(dataNew);
     }
 
     /**
@@ -85,6 +86,14 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      * @return
      */
     public Boolean addDisclaimerInformation(DisclaimerInformationVO disclaimerInformationVO) {
+    	//每一处免责声明（免责声明按钮、推送免责声明、诊断免责声明）同时最多可启用1条内容，显示（按操作时间）最新的条记录；新添加免责声明，则自动展示新添加的内容；自动开启，最近一条数据自动停用；
+    	UpdateWrapper<DisclaimerInformation>  DisclaimerInformationStatus= new UpdateWrapper<>();
+    	DisclaimerInformationStatus.eq("disclaimer_code",disclaimerInformationVO.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        .set("modifier", UserUtils.getCurrentPrincipleID())
+        .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+    	
+    	update(new DisclaimerInformation(), DisclaimerInformationStatus);
+    	
         DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
         disclaimerInformation.setCreator(UserUtils.getCurrentPrincipleID());
         disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
@@ -120,9 +129,9 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
         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.setOrderNo(disclaimerInformationAllVO.getOrderNo());
+        //disclaimerInformation.setRemark(disclaimerInformationAllVO.getRemark());
+        //disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
         disclaimerInformation.setTitle(disclaimerInformationAllVO.getTitle());
         disclaimerInformation.setVersionId(0L);
 
@@ -158,6 +167,18 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
     public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
         // 1.先判断数据是否存在有效
         checkExist(disclaimerInformationIdVO.getId());
+        //每一处免责声明（免责声明按钮、推送免责声明、诊断免责声明）同时最多可启用1条内容，显示（按操作时间）最新的条记录；新添加免责声明，则自动展示新添加的内容；自动开启，最近一条数据自动停用；
+      //  QueryWrapper<DisclaimerInformation> data = new QueryWrapper<DisclaimerInformation>();
+       // data.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+        DisclaimerInformation disclaimerInformation = getById(disclaimerInformationIdVO.getId());
+        
+        UpdateWrapper<DisclaimerInformation>  DisclaimerInformationStatus= new UpdateWrapper<>();
+    	DisclaimerInformationStatus.eq("disclaimer_code",disclaimerInformation.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        .set("modifier", UserUtils.getCurrentPrincipleID())
+        .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+    	
+    	update(new DisclaimerInformation(), DisclaimerInformationStatus);
+        
         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())
@@ -170,11 +191,11 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      *
      * @return
      */
-    public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationEndVO) {
         // 1.先判断数据是否存在有效
-        checkExist(disclaimerInformationIdVO.getId());
+        checkExist(disclaimerInformationEndVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-        disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformationNew.in("id", disclaimerInformationEndVO.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/IntroduceDetailFacade.java

@@ -10,6 +10,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.IntroduceDetailServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.IdVO;
 import com.diagbot.vo.IntroduceDetailSingleVO;
 import com.diagbot.vo.IntroduceDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -121,10 +123,11 @@ public class IntroduceDetailFacade extends IntroduceDetailServiceImpl {
     /**
      * 批量删除提示信息明细 逻辑删除
      *
-     * @param ids
+     * @param idVOList
      * @return
      */
-    public Boolean deleteRecords(Long[] ids) {
+    public Boolean deleteRecords(List<IdVO> idVOList) {
+        List<Long> ids = idVOList.stream().map(idVO -> idVO.getId()).collect(Collectors.toList());
         UpdateWrapper<IntroduceDetail> introduceDetailUpdateWrapper = new UpdateWrapper<>();
         introduceDetailUpdateWrapper.in("id", ids).
                 eq("is_deleted", IsDeleteEnum.N.getKey()).

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

@@ -19,7 +19,9 @@ import com.diagbot.service.IntroduceMapService;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.IdVO;
 import com.diagbot.vo.IntroduceDetailVO;
 import com.diagbot.vo.IntroduceMapVO;
 import com.diagbot.vo.IntroducePageVO;
@@ -185,10 +187,11 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     /**
      * 批量删除提示信息 逻辑删除
      *
-     * @param ids
+     * @param idVOList
      * @return
      */
-    public Boolean deleteRecords(Long[] ids) {
+    public Boolean deleteRecords(List<IdVO> idVOList) {
+        List<Long> ids = idVOList.stream().map(idVO -> idVO.getId()).collect(Collectors.toList());
         //删除已有映射关系
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
         introduceMapUpdateWrapper.in("introduce_id", ids).
@@ -273,26 +276,28 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         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 = questionFacade.list(questionInfoQueryWrapper);
+        if(ListUtil.isNotEmpty(questionIds)) {
+            QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+            questionInfoQueryWrapper.in("id", questionIds).eq("is_deleted", IsDeleteEnum.N.getKey());
+            List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
 
-        List<QuestionShortDTO> questionShortDTOList = Lists.newLinkedList();
-        String tagName = "";
-        for (QuestionInfo questionInfo : questionInfoList) {
-            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
-            BeanUtil.copyProperties(questionInfo, questionShortDTO);
-            questionShortDTOList.add(questionShortDTO);
-            tagName += questionInfo.getTagName() + ",";
-        }
-        if (tagName.endsWith(",")) {
-            tagName = tagName.substring(0, tagName.length() - 1);
+            List<QuestionShortDTO> questionShortDTOList = Lists.newLinkedList();
+            String tagName = "";
+            for (QuestionInfo questionInfo : questionInfoList) {
+                QuestionShortDTO questionShortDTO = new QuestionShortDTO();
+                BeanUtil.copyProperties(questionInfo, questionShortDTO);
+                questionShortDTOList.add(questionShortDTO);
+                tagName += questionInfo.getTagName() + ",";
+            }
+            if (tagName.endsWith(",")) {
+                tagName = tagName.substring(0, tagName.length() - 1);
+            }
+            introducePageDTO.setTagName(tagName);
+            introducePageDTO.setQuestionList(questionShortDTOList);
         }
-        introducePageDTO.setTagName(tagName);
-        introducePageDTO.setQuestionList(questionShortDTOList);
 
         //未关联的标签
-        QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
+        /*QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
         unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("sub_type", 0)
                 .notIn("id", questionIds);
@@ -300,7 +305,13 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
 
         List<QuestionShortDTO> unRelatedQuestionDTOList
                 = BeanUtil.listCopyTo(unRelatedQuestionList, QuestionShortDTO.class);
-        introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);
+        introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);*/
+
+        //提示信息明细
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper=new QueryWrapper<>();
+        introduceDetailQueryWrapper.eq("is_deleted",IsDeleteEnum.N).eq("introduce_id",id).orderByAsc("order_no");
+        List<IntroduceDetail> introduceDetailList=introduceDetailFacade.list(introduceDetailQueryWrapper);
+        introducePageDTO.setDetails(introduceDetailList);
 
         return introducePageDTO;
     }

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

@@ -35,6 +35,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionIdsVO;
@@ -520,6 +521,16 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return getQuestionInfoDTOS;
     }
 
+    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO){
+        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id",getQuestionIdsByTypeVO.getQuestionIds() )
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("type", getQuestionIdsByTypeVO.getQuestionType());
+        List<QuestionInfo> questionInfoList = this.list(queryWrapper);
+        List<Long> questionIds = questionInfoList.stream().map(questionInfo -> questionInfo.getId()).collect(Collectors.toList());
+        return questionIds;
+    }
+
 
     /**
      * 根据科室id获取常用标签信息

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

@@ -18,6 +18,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.GetDeptInfoVO;
+import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.QuestionUsualVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,6 +43,8 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
     @Autowired
     @Qualifier("questionUsualServiceImpl")
     private QuestionUsualService questionUsualService;
+    @Autowired
+    private QuestionFacade questionFacade;
 
     /**
      * 添加常用标签
@@ -106,7 +108,9 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         QueryWrapper<QuestionUsual> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId());
         List<QuestionUsual> questionUsualList = this.list(queryWrapper);
+        List<Long> questionIds = new ArrayList<>();
         Boolean flag = false;
+        questionUsualList.stream().forEach(questionUsual -> questionIds.add(questionUsual.getQuestionId()));
         for (QuestionUsual questionUsual:questionUsualList) {
             if(questionUsual.getIsDeleted().equals(IsDeleteEnum.N.getKey())){
                 flag = true;
@@ -117,14 +121,23 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             throw new CommonException(CommonErrorCode.FAIL,
                     "标签已删除");
         }
-        //删除常用标签
-        String userId = UserUtils.getCurrentPrincipleID();
-        UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("dept_id", deleteQuestionUsualVO.getDeptId())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", DateUtil.now());
-        this.update(new QuestionUsual(), updateWrapper);
+        //查询出相关类型的标签id
+        GetQuestionIdsByTypeVO getQuestionIdsByTypeVO = new GetQuestionIdsByTypeVO();
+        getQuestionIdsByTypeVO.setQuestionIds(questionIds);
+        getQuestionIdsByTypeVO.setQuestionType(deleteQuestionUsualVO.getType());
+        List<Long> questionInfoList = questionFacade.getQuestionIdsByType(getQuestionIdsByTypeVO);
+        //如果存在相关类型的数据，就删除
+        if(ListUtil.isNotEmpty(questionInfoList)){
+            //删除常用标签
+            String userId = UserUtils.getCurrentPrincipleID();
+            UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("dept_id", deleteQuestionUsualVO.getDeptId())
+                    .in("question_id",questionInfoList)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("modifier", userId)
+                    .set("gmt_modified", DateUtil.now());
+            this.update(new QuestionUsual(), updateWrapper);
+        }
         return true;
     }
 
@@ -135,25 +148,8 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public IPage<GetDeptInfoDTO> getDeptInfos(GetDeptInfoVO getDeptInfoVO) {
-        //获取标签修改时间和修改人
-        QueryWrapper<QuestionUsual> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<QuestionUsual> questionUsualList = this.list(queryWrapper);
-        Map<Long, QuestionUsual> map = new HashMap<>();
-        if (ListUtil.isNotEmpty(questionUsualList)) {
-            for (QuestionUsual questionUsual : questionUsualList) {
-                map.put(questionUsual.getDeptId(), questionUsual);
-            }
-        }
         //分页查询科室
         IPage<GetDeptInfoDTO> iPage = deptInfoFacade.getAllDeptInfo(getDeptInfoVO);
-        //将科室的修改人替换成常用标签的修改人
-        for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
-            if (map.get(getDeptInfoDTO.getId()) != null) {
-                getDeptInfoDTO.setModifier(map.get(getDeptInfoDTO.getId()).getModifier());
-                getDeptInfoDTO.setGmtModified(map.get(getDeptInfoDTO.getId()).getGmtModified());
-            }
-        }
         //获取用户信息
         List<String> ids = new ArrayList<>();
         for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {

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

@@ -35,6 +35,7 @@ import com.diagbot.vo.VersionDetailVO;
 import com.diagbot.vo.VersionInfoAllVO;
 import com.diagbot.vo.VersionInfoIdVO;
 import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionWrapperNameVO;
 
 /**
  * @author wangfeng
@@ -56,19 +57,20 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      *
      * @return
      */
-    public List<VersionWrapperDTO> getVersionInfoAll(Page page, String name) {
+    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page,VersionWrapperNameVO versionWrapperNameVO) {
         // 模糊查询最新的一条版本信息
-        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
         versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
                 .like("name", name).orderByDesc("refresh_time");
-
+      
         // 分页查询
-        IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
-        List<VersionInfo> versionInfos = queryUserInformation.getRecords();
+*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page,versionWrapperNameVO);
+        List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
         List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
         // 取出操作人id
         List<String> modifierid = new ArrayList<>();
-        modifierid = versionInfos.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+        modifierid = versionInfos.stream().map(ac -> ac.getModifierid()).collect(Collectors.toList());
         // 根据操作人的id获取操作人信息
         Map<String, String> userNames = new HashMap<>();
         if (ListUtil.isNotEmpty(modifierid)) {
@@ -79,12 +81,12 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
             userNames = userNamesDTO.data;
         }
         // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-		for (VersionInfo versionInfo : versionInfos) {
+		for (VersionWrapperDTO versionInfo : versionInfos) {
 			VersionWrapperDTO versionList = new VersionWrapperDTO();
 			versionList.setId(versionInfo.getId());
 			versionList.setGmtCreate(versionInfo.getGmtCreate());
 			versionList.setName(versionInfo.getName());
-			versionList.setModifierid(userNames.get(versionInfo.getModifier()));
+			versionList.setModifierid(userNames.get(versionInfo.getModifierid()));
 			versionList.setRefreshTime(versionInfo.getRefreshTime());
 			versionList.setStatus(versionInfo.getStatus());
 			versionList.setRemark(versionInfo.getRemark());
@@ -94,7 +96,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         List<Long> ids = new ArrayList<>();
         if (versionInfos != null) {
             // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-            for (VersionInfo versionInfo : versionInfos) {
+            for (VersionWrapperDTO versionInfo : versionInfos) {
                 ids.add(versionInfo.getId());
             }
             // 获取明细信息
@@ -111,7 +113,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 }
             }
         }
-        return versionLists;
+        return queryUserInformation.setRecords(versionLists);
 
     }
 
@@ -185,7 +187,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
         VersionInfo dataInfo = getOne(templateInfoFand);
-        if (dataInfo != null) {
+        if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
         }
         // 3.修改版本信息

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

@@ -16,8 +16,8 @@ import com.diagbot.service.impl.VitalOrderServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VitalIdVO;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -171,10 +171,11 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
     /**
      * 删除排序-批量
      *
-     * @param vitalIds
+     * @param vitalIdVOList
      * @return
      */
-    public Boolean deleteVitalOrders(Long[] vitalIds) {
+    public Boolean deleteVitalOrders(List<VitalIdVO> vitalIdVOList) {
+        List<Long> vitalIds = vitalIdVOList.stream().map(vitalIdVO -> vitalIdVO.getVitalId()).collect(Collectors.toList());
         UpdateWrapper<VitalOrder> vitalOrderUpdateWrapper = new UpdateWrapper<>();
         vitalOrderUpdateWrapper.in("vital_id", vitalIds).
                 eq("is_deleted", IsDeleteEnum.N.getKey()).

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

@@ -1,9 +1,12 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.entity.wrapper.QuestionUsualWapper;
 import com.diagbot.entity.wrapper.QuestionWrapper;
+import com.diagbot.vo.GetQuestionIdsByTypeVO;
+import com.diagbot.vo.GetQuestionUsualAndTypeVO;
 import com.diagbot.vo.QuestionUsualVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,10 +22,17 @@ import java.util.List;
  */
 public interface QuestionUsualMapper extends BaseMapper<QuestionUsual> {
     /**
+     *
      * 根据标签id获取常用标签信息
      * @param questionUsualVO
      * @return
      */
     public List<QuestionUsual> getQuestionUsualByQuestionId(@Param("questionUsualVO") QuestionUsualVO questionUsualVO);
 
+    /**
+     * 根据科室id获取常用标签
+     *
+     * @return
+     */
+    public List<GetQuestionUsualAndTypeDTO> getQuestionUsualByDeptIds(GetQuestionUsualAndTypeVO GetQuestionUsualAndTypeVO);
 }

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

@@ -1,7 +1,14 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.VersionInfo;
+import com.diagbot.vo.VersionWrapperNameVO;
+
+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;
 
 /**
  * <p>
@@ -13,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface VersionInfoMapper extends BaseMapper<VersionInfo> {
 
+	public IPage<VersionWrapperDTO> getVersionInfoAPage(Page page, @Param("versionWrapperNameVO") VersionWrapperNameVO versionWrapperNameVO);
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
 import com.diagbot.entity.QuestionUsual;
+import com.diagbot.vo.GetQuestionUsualAndTypeVO;
 import com.diagbot.vo.QuestionUsualVO;
 
 import java.util.List;
@@ -24,4 +26,11 @@ public interface QuestionUsualService extends IService<QuestionUsual> {
      */
     public List<QuestionUsual> getQuestionUsualByQuestionId(QuestionUsualVO questionUsualVO);
 
+    /**
+     * 根据科室id获取常用标签
+     *
+     * @return
+     */
+    public List<GetQuestionUsualAndTypeDTO> getQuestionUsualByDeptIds(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO);
+
 }

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

@@ -1,7 +1,11 @@
 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.VersionWrapperDTO;
 import com.diagbot.entity.VersionInfo;
+import com.diagbot.vo.VersionWrapperNameVO;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.diagbot.entity.VersionInfo;
  */
 public interface VersionInfoService extends IService<VersionInfo> {
 
+	  public IPage<VersionWrapperDTO> getVersionInfoAPage(Page page, VersionWrapperNameVO versionWrapperNameVO); 
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.enums.DisclaimerCodeEnum;
 import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.EnumsDataService;
@@ -27,6 +28,7 @@ public class EnumsDataServiceImpl implements EnumsDataService {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("questionTypeEnum", QuestionTypeEnum.values())
                 .addEnums("introducePositionEnum", IntroducePositionEnum.values())
+                .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
                 .build();
         return enumMap;
     }

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

@@ -1,9 +1,11 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.mapper.QuestionUsualMapper;
 import com.diagbot.service.QuestionUsualService;
+import com.diagbot.vo.GetQuestionUsualAndTypeVO;
 import com.diagbot.vo.QuestionUsualVO;
 import org.springframework.stereotype.Service;
 
@@ -24,4 +26,9 @@ public class QuestionUsualServiceImpl extends ServiceImpl<QuestionUsualMapper, Q
     public List<QuestionUsual> getQuestionUsualByQuestionId(QuestionUsualVO questionUsualVO) {
         return baseMapper.getQuestionUsualByQuestionId(questionUsualVO);
     }
+
+    @Override
+    public List<GetQuestionUsualAndTypeDTO> getQuestionUsualByDeptIds(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
+        return baseMapper.getQuestionUsualByDeptIds(getQuestionUsualAndTypeVO);
+    }
 }

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

@@ -3,8 +3,6 @@ package com.diagbot.service.impl;
 import com.diagbot.client.fastdfs.FastDFSClient;
 import com.diagbot.client.fastdfs.FastDFSFile;
 import com.diagbot.dto.FileDTO;
-import com.diagbot.exception.CommonException;
-import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.service.UploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,22 +21,20 @@ import java.io.InputStream;
 public class UploadServiceImpl implements UploadService {
     @Override
     public FileDTO singleFileUpload(MultipartFile file) {
-        FileDTO fileDTO = new FileDTO();
-
         if (file.isEmpty()) {
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件不能为空");
+            return new FileDTO("FAILURE", "文件不能为空");
         }
         //文件大小上限1M
         if (file.getSize() > 1024 * 1024) {
-            throw new CommonException(ServiceErrorCode.FILE_MAX_SIZE_LIMIT, "文件上传失败，超出大小限制1MB");
+            return new FileDTO("FAILURE", "文件上传失败，超出大小限制1MB");
         }
         try {
-            fileDTO = saveFile(file);
+            FileDTO fileDTO = saveFile(file);
+            return fileDTO;
         } catch (Exception e) {
             log.error("文件上传失败", e);
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
+            return new FileDTO("FAILURE", "文件上传失败，请重新上传");
         }
-        return fileDTO;
     }
 
 
@@ -48,7 +44,7 @@ public class UploadServiceImpl implements UploadService {
      * @throws IOException
      */
     public FileDTO saveFile(MultipartFile multipartFile) throws IOException {
-        FileDTO fileDTO = new FileDTO();
+
         String[] fileAbsolutePath = {};
         String fileName = multipartFile.getOriginalFilename();
         String ext = fileName.substring(fileName.lastIndexOf(".") + 1);
@@ -65,19 +61,18 @@ public class UploadServiceImpl implements UploadService {
             fileAbsolutePath = FastDFSClient.upload(file);  //upload to fastdfs
         } catch (Exception e) {
             log.error("文件上传异常", e);
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传异常");
+            return new FileDTO("FAILURE", "文件上传异常");
         }
         if (fileAbsolutePath == null) {
             log.error("文件上传失败，请重新上传");
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
+            return new FileDTO("FAILURE", "文件上传失败，请重新上传");
         }
         String path = "/" + fileAbsolutePath[0] + "/" + fileAbsolutePath[1];
-        fileDTO.setState("SUCCESS");
+        FileDTO fileDTO = new FileDTO("SUCCESS", "文件上传成功");
         fileDTO.setUrl(path);
         fileDTO.setOriginal(multipartFile.getOriginalFilename());
         fileDTO.setTitle(multipartFile.getOriginalFilename());
         return fileDTO;
-
     }
 
     /**
@@ -86,7 +81,7 @@ public class UploadServiceImpl implements UploadService {
      * @param path
      * @return
      */
-    public Boolean deleteRemoteFile(String path) {
+    public FileDTO deleteRemoteFile(String path) {
         if (path.startsWith("/")) {
             path = path.substring(1);
         }
@@ -96,8 +91,8 @@ public class UploadServiceImpl implements UploadService {
             FastDFSClient.deleteFile(groupName, fileName);
         } catch (Exception e) {
             log.error("", e);
-            throw new CommonException(ServiceErrorCode.FILE_DELETE_ERROR, "文件删除失败");
+            return new FileDTO("FAILURE", "文件删除失败");
         }
-        return true;
+        return new FileDTO("SUCCESS", "文件删除成功");
     }
 }

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

@@ -1,9 +1,14 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.VersionInfo;
 import com.diagbot.mapper.VersionInfoMapper;
 import com.diagbot.service.VersionInfoService;
+import com.diagbot.vo.VersionWrapperNameVO;
+
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class VersionInfoServiceImpl extends ServiceImpl<VersionInfoMapper, VersionInfo> implements VersionInfoService {
 
+	@Override
+	public IPage<VersionWrapperDTO> getVersionInfoAPage(Page page, VersionWrapperNameVO versionWrapperNameVO) {
+		// TODO Auto-generated method stub
+		return baseMapper.getVersionInfoAPage(page, versionWrapperNameVO);
+	}
+
 }

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

@@ -11,5 +11,13 @@ import lombok.Setter;
 @Setter
 @Getter
 public class DeleteQuestionUsualVO {
+    /**
+     * 科室id
+     */
     private Long deptId;
+
+    /**
+     * 标签类型
+     */
+    private Integer type;
 }

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/11 10:15
+ */
+@Getter
+@Setter
+public class DeptIdVO {
+    @NotNull(message = "请输入科室id")
+    private Long deptId;
+}

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

@@ -18,4 +18,4 @@ public class DeptVitalVO {
     private Long deptId;
     @NotNull(message = "请输入查体标签ID")
     private List<DVDetailVO> dvDetailVOList;
-}
+}

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

@@ -36,7 +36,7 @@ public class DisclaimerInformationAllVO {
     /**
      * 排序号
      */
-    private String orderNo;
+    //private String orderNo;
 
     /**
      * 1：启动，0：不启用
@@ -51,5 +51,5 @@ public class DisclaimerInformationAllVO {
     /**
      * 备注
      */
-    private String remark;
+    //private String remark;
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import lombok.Getter;
@@ -17,4 +18,5 @@ public class DisclaimerInformationIdVO {
 
 	@NotNull(message = "请输入id")
 	private Long id;
+	
 }

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

@@ -17,7 +17,7 @@ import lombok.Setter;
 public class DisclaimerInformationTitleVO extends Page{
 
 	/**
-     * 归属名称
+     * 名称
      */
     private String title;
 }

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

@@ -0,0 +1,25 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/3/7 11:07
+ */
+@Getter
+@Setter
+public class GetQuestionIdsByTypeVO {
+    /**
+     * 标签id
+     */
+    private List<Long> questionIds;
+
+    /**
+     * 标签类型
+     */
+    private Integer questionType;
+}

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

@@ -3,6 +3,9 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 /**
  * @Description:
  * @author: wangyu
@@ -19,5 +22,17 @@ public class GetQuestionInfoVO {
     /**
      * 科室id
      */
+    @NotNull(message="科室id不能为空")
     private String deptId;
+
+    /**
+     * 需要去掉的标签id
+     */
+    private List<Long> noIds;
+
+    /**
+     * 归属类型
+     */
+    @NotNull(message="归属类型不能为空")
+    private Integer type;
 }

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

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/3/7 16:14
+ */
+@Getter
+@Setter
+public class GetQuestionUsualAndTypeVO {
+
+    /**
+     * 科室id
+     */
+    private List<Long> deptIds;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/11 9:51
+ */
+@Getter
+@Setter
+public class IdVO {
+    @NotNull(message = "请输入id")
+    private Long id;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/11 10:07
+ */
+@Getter
+@Setter
+public class IntroduceIdVO {
+    @NotNull(message = "请输入提示信息id")
+    private Long introduceId;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/11 10:01
+ */
+@Getter
+@Setter
+public class VitalIdVO {
+    @NotNull(message = "请输入查体标签id")
+    private Long vitalId;
+}

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.DeptShortDTO;
 import com.diagbot.dto.DeptVitalDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DeptVitalFacade;
+import com.diagbot.vo.DeptIdVO;
 import com.diagbot.vo.DeptVitalPageVO;
 import com.diagbot.vo.DeptVitalVO;
 import io.swagger.annotations.Api;
@@ -16,7 +17,6 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -67,8 +67,8 @@ public class DeptVitalController {
     @PostMapping("/delAllDeptVitalList")
     @SysLogger("delAllDeptVitalList")
     @Transactional
-    public RespDTO<Boolean> delAllDeptVitalList(@RequestParam("deptId") Long deptId) {
-        Boolean data = deptVitalFacade.delAllDeptVitalList(deptId);
+    public RespDTO<Boolean> delAllDeptVitalList(@RequestBody DeptIdVO deptIdVO) {
+        Boolean data = deptVitalFacade.delAllDeptVitalList(deptIdVO.getDeptId());
         return RespDTO.onSuc(data);
     }
 
@@ -76,8 +76,8 @@ public class DeptVitalController {
             notes = "deptId:科室ID，必填<br>")
     @PostMapping("/getModuleByDeptId")
     @SysLogger("getModuleByDeptId")
-    public RespDTO<DeptVitalDTO> getModuleByDeptId(@RequestParam("deptId") Long deptId) {
-        DeptVitalDTO data = deptVitalFacade.getModuleByDeptId(deptId);
+    public RespDTO<DeptVitalDTO> getModuleByDeptId(@RequestBody DeptIdVO deptIdVO) {
+        DeptVitalDTO data = deptVitalFacade.getModuleByDeptId(deptIdVO.getDeptId());
         return RespDTO.onSuc(data);
     }
 
@@ -110,8 +110,8 @@ public class DeptVitalController {
             notes = "deptId:科室ID，必填<br>")
     @PostMapping("/getDeptShortList_modify")
     @SysLogger("getDeptShortList_modify")
-    public RespDTO<DeptShortDTO> getDeptShortListModify(@RequestParam("deptId") Long deptId) {
-        List<DeptShortDTO> data = deptVitalFacade.getDeptShortLisModify(deptId);
+    public RespDTO<DeptShortDTO> getDeptShortListModify(@RequestBody DeptIdVO deptIdVO) {
+        List<DeptShortDTO> data = deptVitalFacade.getDeptShortLisModify(deptIdVO.getDeptId());
         return RespDTO.onSuc(data);
     }
-}
+}

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

@@ -1,6 +1,16 @@
 package com.diagbot.web;
 
 
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
@@ -9,17 +19,9 @@ 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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
 
 
 /**
@@ -36,13 +38,13 @@ public class DisclaimerInformationController {
     @Autowired
     DisclaimerInformationFacade disclaimerInformationFacade;
 
-    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @ApiOperation(value = "分页查询获取免责申明[by:wangfeng]", notes = "分页查询获取免责申明")
     @PostMapping("/getDisclaimerInformations")
     @SysLogger("getDisclaimerInformations")
     @Transactional
-    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationTitleVO disclaimerInformationTitleVO) {
+    public RespDTO<IPage<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationTitleVO disclaimerInformationTitleVO) {
 
-        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationTitleVO, disclaimerInformationTitleVO.getTitle());
+    	IPage<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationTitleVO, disclaimerInformationTitleVO.getTitle());
 
         return RespDTO.onSuc(data);
     }
@@ -95,9 +97,9 @@ public class DisclaimerInformationController {
     @PostMapping("/endDisclaimerInformations")
     @SysLogger("endDisclaimerInformations")
     @Transactional
-    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationEndVO) {
 
-        boolean res = disclaimerInformationFacade.endDisclaimerInformations(disclaimerInformationIdVO);
+        boolean res = disclaimerInformationFacade.endDisclaimerInformations(disclaimerInformationEndVO);
 
         return RespDTO.onSuc(res);
     }

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

@@ -5,7 +5,9 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.facade.IntroduceDetailFacade;
+import com.diagbot.vo.IdVO;
 import com.diagbot.vo.IntroduceDetailSingleVO;
+import com.diagbot.vo.IntroduceIdVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +15,6 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -38,8 +39,8 @@ public class IntroduceDetailController {
             notes = "introduceId: 提示信息id,必填")
     @PostMapping("/getByIntroduceId")
     @SysLogger("getByIntroduceId")
-    public RespDTO<List<IntroduceDetail>> getByIntroduceId(@RequestParam Long introduceId) {
-        List<IntroduceDetail> data = introduceDetailFacade.getByIntroduceId(introduceId);
+    public RespDTO<List<IntroduceDetail>> getByIntroduceId(@RequestBody IntroduceIdVO introduceIdVO) {
+        List<IntroduceDetail> data = introduceDetailFacade.getByIntroduceId(introduceIdVO.getIntroduceId());
         return RespDTO.onSuc(data);
     }
 
@@ -47,8 +48,8 @@ public class IntroduceDetailController {
             notes = "id: 提示信息明细id,必填")
     @PostMapping("/getById")
     @SysLogger("getById")
-    public RespDTO<IntroduceDetail> getById(@RequestParam Long id) {
-        IntroduceDetail data = introduceDetailFacade.getRecordById(id);
+    public RespDTO<IntroduceDetail> getById(@RequestBody IdVO idVO) {
+        IntroduceDetail data = introduceDetailFacade.getRecordById(idVO.getId());
         return RespDTO.onSuc(data);
     }
 
@@ -72,8 +73,8 @@ public class IntroduceDetailController {
     @PostMapping("/deleteRecord")
     @SysLogger("deleteRecord")
     @Transactional
-    public RespDTO<Boolean> deleteRecord(@RequestParam Long id) {
-        Boolean data = introduceDetailFacade.deleteRecord(id);
+    public RespDTO<Boolean> deleteRecord(@RequestBody IdVO idVO) {
+        Boolean data = introduceDetailFacade.deleteRecord(idVO.getId());
         return RespDTO.onSuc(data);
     }
 
@@ -82,8 +83,8 @@ public class IntroduceDetailController {
     @PostMapping("/deleteRecords")
     @SysLogger("deleteRecords")
     @Transactional
-    public RespDTO<Boolean> deleteRecords(@RequestParam Long[] ids) {
-        Boolean data = introduceDetailFacade.deleteRecords(ids);
+    public RespDTO<Boolean> deleteRecords(@RequestBody List<IdVO> idVOList) {
+        Boolean data = introduceDetailFacade.deleteRecords(idVOList);
         return RespDTO.onSuc(data);
     }
 }

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.QuestionShortDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.facade.IntroduceInfoFacade;
+import com.diagbot.vo.IdVO;
 import com.diagbot.vo.IntroducePageVO;
 import com.diagbot.vo.IntroduceVO;
 import io.swagger.annotations.Api;
@@ -17,7 +18,6 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -65,8 +65,8 @@ public class IntroduceInfoController {
     @PostMapping("/deleteRecord")
     @SysLogger("deleteRecord")
     @Transactional
-    public RespDTO<Boolean> deleteRecord(@RequestParam Long id) {
-        Boolean data = introduceInfoFacade.deleteRecord(id);
+    public RespDTO<Boolean> deleteRecord(@RequestBody IdVO idVO) {
+        Boolean data = introduceInfoFacade.deleteRecord(idVO.getId());
         return RespDTO.onSuc(data);
     }
 
@@ -75,7 +75,7 @@ public class IntroduceInfoController {
     @PostMapping("/deleteRecords")
     @SysLogger("deleteRecords")
     @Transactional
-    public RespDTO<Boolean> deleteRecords(@RequestParam Long[] ids) {
+    public RespDTO<Boolean> deleteRecords(@RequestBody List<IdVO> ids) {
         Boolean data = introduceInfoFacade.deleteRecords(ids);
         return RespDTO.onSuc(data);
     }
@@ -118,8 +118,8 @@ public class IntroduceInfoController {
             notes = "id:id，必填<br>")
     @PostMapping("/getIntroduceById")
     @SysLogger("getIntroduceById")
-    public RespDTO<IntroducePageDTO> getIntroduceById(@RequestParam Long id) {
-        IntroducePageDTO data = introduceInfoFacade.getIntroduceById(id);
+    public RespDTO<IntroducePageDTO> getIntroduceById(@RequestBody IdVO idVO) {
+        IntroducePageDTO data = introduceInfoFacade.getIntroduceById(idVO.getId());
         return RespDTO.onSuc(data);
     }
 

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

@@ -49,8 +49,7 @@ public class QuestionUsualController {
     private QuestionFacade questionFacade;
 
     @ApiOperation(value = "常用标签维护——添加和修改[by:wangyu]",
-            notes = "deptCode: 科室编号,必填<br>" +
-                    "hospitalCode: 医院编号，必填<br>" +
+            notes = "deptId: 科室id,必填<br>" +
                     "questionName: 症状名称，必填")
     @PostMapping("/addQuestionUsual")
     @SysLogger("addQuestionUsual")
@@ -61,7 +60,8 @@ public class QuestionUsualController {
     }
 
     @ApiOperation(value = "常用标签维护——删除[by:wangyu]",
-            notes = "id: 常用标签id,必填<br>")
+            notes = "deptId: 科室id,必填<br>" +
+                    "type: 标签类型,必填<br>")
     @PostMapping("/deleteQuestionUsual")
     @SysLogger("deleteQuestionUsual")
     @Transactional
@@ -81,7 +81,9 @@ public class QuestionUsualController {
 
     @ApiOperation(value = "常用标签维护——获取标签信息[by:wangyu]",
             notes = "tagName: 标签名称，非必填<br>" +
-                    "deptId: 科室id，如果是添加不用填，如果是修改页面必填<br>")
+                    "deptId: 科室id，如果是添加不用填，如果是修改页面必填<br>" +
+                    "noIds: 需要去掉的标签id，非必填<br>" +
+                    "type: 归属类型，必填")
     @PostMapping("/getQuestionInfo")
     @SysLogger("getQuestionInfo")
     public RespDTO<List<GetQuestionInfoDTO>> getQuestionInfo(@Valid @RequestBody GetQuestionInfoVO getQuestionInfoVO) {

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

@@ -1,17 +1,23 @@
 package com.diagbot.web;
 
 import com.diagbot.dto.FileDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.UploadFacade;
+import com.diagbot.util.FastJsonUtils;
+import com.diagbot.util.StringUtil;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 @RestController
 @Api(value = "文件上传API", tags = { "文件上传API" })
 @RequestMapping(value = "/file")
@@ -20,14 +26,23 @@ public class UploadController {
     @Autowired
     private UploadFacade uploadFacade;
 
-    @PostMapping("/uploadImage")
-    public RespDTO<FileDTO> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
-        return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
-    }
+    @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
+    @PostMapping(value = "/uploadImage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public String singleFileUpload(@RequestParam("upfile") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+        FileDTO fileDTO = uploadFacade.singleFileUpload(file);
+        String data = FastJsonUtils.getBeanToJson(fileDTO);
+        response.setContentType("text/plain;charset=UTF-8");
 
+        String callback = request.getParameter("callback");//客户端请求参数
+        if (callback != null && StringUtil.isNotBlank(callback)) {
+            data = callback + "(" + data + ")";
+        }
+        return data;
+    }
 
     @PostMapping("/deleteRemoteFile")
-    public RespDTO<Boolean> deleteRemoteFile(@RequestParam("path") String path) {
-        return RespDTO.onSuc(uploadFacade.deleteRemoteFile(path));
+    public String deleteRemoteFile(@RequestParam("path") String path) {
+        String data = FastJsonUtils.getBeanToJson(uploadFacade.deleteRemoteFile(path));
+        return data;
     }
 }

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

@@ -1,22 +1,29 @@
 package com.diagbot.web;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.facade.VersionDetailFacade;
 import com.diagbot.vo.VersionDetailIdVO;
 import com.diagbot.vo.VersionDetailVO;
 import com.diagbot.vo.VersionInfoAndDetailIdVO;
+import com.diagbot.vo.VersionInfoIdVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
 
 /**
  * @author wangfeng
@@ -64,4 +71,15 @@ public class VersionDetailController {
 
         return RespDTO.onSuc(res);
     }
+    @ApiOperation(value = "根据版本id获取版本详情信息[by:wangfeng]", notes = "根据版本id获取版本详情信息")
+    @PostMapping("/getDetailById")
+    @SysLogger("getDetailById")
+    @Transactional
+    public RespDTO<List<VersionDetailDTO>> getDetailById(@Valid @RequestBody VersionInfoIdVO versionInfoIdVO)  {
+    	List<Long> ids = new ArrayList<>();
+    	ids.add(versionInfoIdVO.getId());
+    	List<VersionDetailDTO> data = versionDetailFacade.getByIds(ids);
+
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.web;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionWrapperDTO;
@@ -38,9 +39,9 @@ public class VersionInfoController {
     @PostMapping("/getVersionInfoAlls")
     @SysLogger("getVersionInfoAlls")
     @Transactional
-    public RespDTO<List<VersionWrapperDTO>> getVersionInfoAlls(@RequestBody VersionWrapperNameVO versionWrapperNameVO) {
+    public RespDTO<IPage<VersionWrapperDTO>> getVersionInfoAlls(@RequestBody VersionWrapperNameVO versionWrapperNameVO) {
 
-        List<VersionWrapperDTO> data = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO, versionWrapperNameVO.getName());
+    	IPage<VersionWrapperDTO> data = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO, versionWrapperNameVO);
 
         return RespDTO.onSuc(data);
     }

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.QuestionShortDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VitalOrderDTO;
 import com.diagbot.facade.VitalOrderFacade;
+import com.diagbot.vo.VitalIdVO;
 import com.diagbot.vo.VitalOrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +15,6 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -70,8 +70,8 @@ public class VitalOrderController {
     @PostMapping("/deleteVitalOrder")
     @SysLogger("deleteVitalOrder")
     @Transactional
-    public RespDTO<Boolean> deleteVitalOrder(@RequestParam("vitalId") Long vitalId) {
-        Boolean data = vitalOrderFacade.deleteVitalOrder(vitalId);
+    public RespDTO<Boolean> deleteVitalOrder(@RequestBody VitalIdVO vitalIdVO) {
+        Boolean data = vitalOrderFacade.deleteVitalOrder(vitalIdVO.getVitalId());
         return RespDTO.onSuc(data);
     }
 
@@ -80,8 +80,8 @@ public class VitalOrderController {
     @PostMapping("/deleteVitalOrders")
     @SysLogger("deleteVitalOrders")
     @Transactional
-    public RespDTO<Boolean> deleteVitalOrders(@RequestParam("vitalIds") Long[] vitalIds) {
-        Boolean data = vitalOrderFacade.deleteVitalOrders(vitalIds);
+    public RespDTO<Boolean> deleteVitalOrders(@RequestBody List<VitalIdVO> vitalIdVOList) {
+        Boolean data = vitalOrderFacade.deleteVitalOrders(vitalIdVOList);
         return RespDTO.onSuc(data);
     }
 }

icssman-service/src/main/resources/fdfs_client.conf

@@ -1,7 +0,0 @@
-connect_timeout = 60
-network_timeout = 60
-charset = UTF-8
-http.tracker_http_port = 8080
-http.anti_steal_token = no
-
-tracker_server = 192.168.2.236:22122

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

@@ -15,11 +15,18 @@
     </resultMap>
 
     <select id="getAllDeptInfo" resultType="com.diagbot.dto.GetDeptInfoDTO">
-        SELECT * FROM `icss_dept_info` WHERE is_deleted = 'N'
-         <if test="name != null and name != ''">
-             AND `name` LIKE CONCAT('%',#{name},'%')
-         </if>
-        order by gmt_modified desc
+        SELECT
+        DISTINCT a.id,a.gmt_create,b.gmt_modified,b.creator,b.modifier,a.`name`,a.remark
+        FROM
+        `icss_dept_info` a
+        LEFT JOIN icss_question_usual b ON a.id = b.dept_id
+        WHERE
+        a.is_deleted = 'N' AND b.is_deleted = 'N'
+        <if test="name != null and name != ''">
+            AND a.`name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        ORDER BY
+        b.gmt_modified DESC
     </select>
 
     <select id="getDeptName" resultType="com.diagbot.dto.DeptInfoDTO">
@@ -36,7 +43,7 @@
 			    icss_question_usual b
 		      WHERE
 		        b.is_deleted = 'N'
-		        AND b.id IN (
+		        AND b.dept_id IN (
 				    SELECT
 					  c.id
 				    FROM

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

@@ -40,6 +40,7 @@
           <if test="deptVitalPageVO.deptName!=null and deptVitalPageVO.deptName!=''">
               AND a.name like CONCAT("%",#{deptVitalPageVO.deptName},"%")
           </if>
+        order by gmt_modified desc
     </select>
 
 </mapper>

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

@@ -35,6 +35,6 @@
 		<if test="disAll.title != null">
 		and title like concat('%',#{disAll.title},'%')
 		</if>
-		ORDER BY order_no
+		ORDER BY gmt_create DESC
 	</select>
 </mapper>

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

@@ -19,6 +19,7 @@
         <result column="control_type" property="controlType" />
         <result column="type" property="type" />
         <result column="sub_type" property="subType" />
+        <result column="item_type" property="itemType" />
         <result column="label_prefix" property="labelPrefix" />
         <result column="label_suffix" property="labelSuffix" />
         <result column="min_value" property="minValue" />
@@ -96,8 +97,8 @@
         `icss_question_info` a
         WHERE
         a.is_deleted = 'N'
-        AND a.type = '1'
         AND a.sub_type = '0'
+        AND a.type = #{type}
         <if test="deptId != null and deptId != ''">
             AND a.id NOT IN (
             SELECT
@@ -109,6 +110,12 @@
             AND b.dept_id = #{deptId}
             )
         </if>
+        <if test="noIds != null and noIds.size != 0">
+            AND a.id NOT IN
+            <foreach  collection="noIds" item="noId" open="("  separator=","  close=")">
+                #{noId}
+            </foreach>
+        </if>
         <if test="tagName != null and tagName != ''">
             AND a.tag_name like CONCAT('%', #{tagName}, '%')
         </if>

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

@@ -23,4 +23,17 @@
         </foreach>
     </select>
 
+    <select id="getQuestionUsualByDeptIds" resultType="com.diagbot.dto.GetQuestionUsualAndTypeDTO">
+        SELECT
+	      a.*,b.type
+        FROM
+	      `icss_question_usual` a
+        LEFT JOIN icss_question_info b ON a.question_id = b.id
+        WHERE
+	      a.is_deleted = 'N'
+        AND a.dept_id IN
+        <foreach item="deptId" collection="deptIds" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+    </select>
 </mapper>

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

@@ -15,5 +15,22 @@
         <result column="status" property="status" />
         <result column="remark" property="remark" />
     </resultMap>
-
+    
+ <select id="getVersionInfoAPage" resultType="com.diagbot.dto.VersionWrapperDTO">
+	SELECT
+	id as id,
+	gmt_create as gmtCreate,
+	modifier as modifierid,
+	name as name,
+	refresh_time as
+	refreshTime,
+	status as status,
+	remark as remark
+	FROM icss_version_info u
+	WHERE u.is_deleted = 'N' AND u.status = 1
+	<if test="versionWrapperNameVO.name != null">
+		AND u.name LIKE CONCAT('%', #{versionWrapperNameVO.name}, '%')
+	</if>
+	ORDER BY gmt_create DESC
+</select>
 </mapper>