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

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

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

@@ -11,8 +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 +48,4 @@ public enum IntroducePositionEnum implements KeyedNamed {
     public String getName() {
         return name;
     }
-}
+}

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

@@ -70,21 +70,23 @@ public class LisExcelResFacade {
 										itemName = getValue(row.getCell(1)).trim().replace(" ", "");
 										unit = getValue(row.getCell(2)).trim();
 										value = getValue(row.getCell(3)).trim();
-										max = getValue(row.getCell(4)).trim();
-										min = getValue(row.getCell(5)).trim();
+										min = getValue(row.getCell(4)).trim();
+										max = getValue(row.getCell(5)).trim();
 										time = getValue(row.getCell(6)).trim();
+										type = getValue(row.getCell(7)).trim();
 									} else {
 										mealName = null;
 										itemName = null;
 										unit = null;
 										value = null;
-										max = null;
 										min = null;
+										max = null;
 										time = null;
+										type = null;
 									}
 
 									if (StringUtil.isEmpty(mealName) && StringUtil.isEmpty(itemName)
-											&& StringUtil.isEmpty(value)) {
+											&& StringUtil.isEmpty(value)&& StringUtil.isEmpty(type)) {
 										continue;
 									}
 
@@ -93,11 +95,11 @@ public class LisExcelResFacade {
 									}
 
 									if (StringUtil.isEmpty(mealName) || StringUtil.isEmpty(itemName)
-											|| StringUtil.isEmpty(value)) {
+											|| StringUtil.isEmpty(value)|| StringUtil.isEmpty(type)) {
 										// throw new
 										// CommonException(CommonErrorCode.NOT_EXISTS,
 										// "第"+count+"行数据不规范,套餐名、项目名、结果三项必填;");
-										messages.add("第" + count + "行数据不规范,套餐名、项目名、结果三项必填;");
+										messages.add("第" + count + "行数据不规范,套餐名、项目名、结果、是否异常四项必填;");
 										continue;
 									}
 									LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
@@ -109,6 +111,7 @@ public class LisExcelResFacade {
 									lisExcelWrapper.setMax(max);
 									lisExcelWrapper.setMin(min);
 									lisExcelWrapper.setTime(time);
+									lisExcelWrapper.setType(type);
 									lisExcelWrapperList.add(lisExcelWrapper);
 								} catch (Exception e) {
 									e.printStackTrace();

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

@@ -21,6 +21,8 @@ public class LisExcelWrapperVO {
 	private String min;
 	
 	private String time;
+	
+	private String type;
 
 	@Override
 	public String toString() {

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

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/12/12 16:24
+ */
+@Getter
+@Setter
+public class DeptShortDTO {
+    private Long id;
+    private String name;
+}

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

@@ -1,9 +1,10 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.QuestionInfo;
+import com.diagbot.entity.DeptInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -13,8 +14,10 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class DeptVitalDTO {
-    String deptId;
-    String deptName;
-    List<QuestionInfo> vitals;
+public class DeptVitalDTO extends DeptInfo {
+    private String operator;
+    private String operatorName;
+    private Date gmtOperate;
+    private List<QuestionShortDTO> vitals;
+    private List<QuestionShortDTO> unSelectedVitals;
 }

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

@@ -19,6 +19,6 @@ public class IntroducePageDTO extends IntroduceInfo {
     private String operatorName;
     private Date gmtOperate;
     private String tagName;
-    private List<QuestionIntroduceDTO> questionList;
-    private List<QuestionIntroduceDTO> unRelatedQuestionList;
+    private List<QuestionShortDTO> questionList;
+    private List<QuestionShortDTO> unRelatedQuestionList;
 }

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

@@ -10,7 +10,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QuestionIntroduceDTO {
+public class QuestionShortDTO {
     private Long id;
     private String tagName;
     private String name;

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

@@ -2,6 +2,13 @@ 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.DeptShortDTO;
+import com.diagbot.dto.DeptVitalDTO;
+import com.diagbot.dto.QuestionShortDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -10,9 +17,11 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.DeptVitalService;
 import com.diagbot.service.impl.DeptVitalServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DeptVitalPageVO;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +44,12 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
     @Autowired
     private QuestionInfoFacade questionInfoFacade;
     @Autowired
+    private DeptInfoFacade deptInfoFacade;
+    @Autowired
     @Qualifier("deptVitalServiceImpl")
     private DeptVitalService deptVitalService;
+    @Autowired
+    private UserServiceClient userServiceClient;
 
     /**
      * 保存查体模板
@@ -128,7 +141,17 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
      * @param deptId
      * @return
      */
-    public List<QuestionInfo> getVitalsByDeptId(Long deptId) {
+    public DeptVitalDTO getModuleByDeptId(Long deptId) {
+        DeptVitalDTO deptVitalDTO = new DeptVitalDTO();
+        DeptInfo deptInfo = deptInfoFacade.getById(deptId);
+        if (deptInfo == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "科室不存在");
+        } else if (deptInfo.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "科室已删除");
+        }
+        BeanUtil.copyProperties(deptInfo, deptVitalDTO);
+
+        //已关联查体
         QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
         deptVitalQueryWrapper.eq("dept_id", deptId).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
@@ -137,6 +160,132 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
                 .map(deptVitals -> deptVitals.getVitalId())
                 .collect(Collectors.toList());
         List<QuestionInfo> vitalList = Lists.newArrayList(questionInfoFacade.listByIds(vitalIds));
-        return vitalList;
+        List<QuestionShortDTO> vitals = Lists.newArrayList();
+        for (QuestionInfo questionInfo : vitalList) {
+            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
+            BeanUtil.copyProperties(questionInfo, questionShortDTO);
+            vitals.add(questionShortDTO);
+        }
+        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());
+        List<QuestionInfo> unSelectedVitalList = questionInfoFacade.list(unSelectedVitalQueryWrapper);
+        List<QuestionShortDTO> unSelectedVitals = Lists.newArrayList();
+        for (QuestionInfo questionInfo : unSelectedVitalList) {
+            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
+            BeanUtil.copyProperties(questionInfo, questionShortDTO);
+            unSelectedVitals.add(questionShortDTO);
+        }
+        deptVitalDTO.setUnSelectedVitals(unSelectedVitals);
+        return deptVitalDTO;
+    }
+
+
+    /**
+     * 获取科室模板分页信息
+     *
+     * @param deptVitalPageVO
+     * @return
+     */
+    public IPage<DeptVitalDTO> getDeptVitalPage(DeptVitalPageVO deptVitalPageVO) {
+        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+        deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                select("dept_id", "gmt_create", "creator", "gmt_modified", "modifier").
+                groupBy("dept_id", "gmt_create", "creator", "gmt_modified", "modifier");
+        List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
+        Map<Long, DeptVital> deptVitalMap = EntityUtil.makeEntityMap(deptVitalList, "deptId");
+        List<Long> deptIds = deptVitalList.stream().map(deptVital -> deptVital.getDeptId()).collect(Collectors.toList());
+
+        QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
+        deptInfoQueryWrapper.like("name", deptVitalPageVO.getDeptName()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
+                in("id", deptIds);
+        IPage<DeptVitalDTO> page = deptInfoFacade.page(deptVitalPageVO, deptInfoQueryWrapper);
+
+        List<DeptVitalDTO> deptVitalDTOListRet = Lists.newLinkedList();
+        List<DeptVitalDTO> deptVitalDTOList = page.getRecords();
+        for (DeptInfo deptInfo : deptVitalDTOList) {
+            DeptVitalDTO deptVitalDTO = new DeptVitalDTO();
+            BeanUtil.copyProperties(deptInfo, deptVitalDTO);
+            //取映射关系维护时间，不取科室维护时间
+            if (deptVitalMap.get(deptInfo.getId()) != null) {
+                DeptVital deptVital = deptVitalMap.get(deptInfo.getId());
+                deptVitalDTO.setGmtCreate(deptVital.getGmtCreate());
+                deptVitalDTO.setGmtModified(deptVital.getGmtModified());
+                deptVitalDTO.setCreator(deptVital.getCreator());
+                deptVitalDTO.setModifier(deptVital.getModifier());
+                deptVitalDTO.setGmtOperate(deptVitalDTO.getGmtModified());
+                deptVitalDTO.setOperator(deptVitalDTO.getModifier());
+            }
+            deptVitalDTOListRet.add(deptVitalDTO);
+        }
+        List<String> userIds = deptVitalDTOListRet.stream().map(deptVitalDTO -> deptVitalDTO.getModifier()).collect(Collectors.toList());
+        RespDTO<Map<String, String>> data = userServiceClient.getUserInfoByIds(userIds);
+        Map<String, String> userInfos = data.data;
+        for (DeptVitalDTO deptVitalDTO : deptVitalDTOListRet) {
+            if (userInfos.get(deptVitalDTO.getOperator()) != null) {
+                deptVitalDTO.setOperatorName(userInfos.get(deptVitalDTO.getOperator()));
+            }
+        }
+        page.setRecords(deptVitalDTOListRet);
+        return page;
+    }
+
+    /**
+     * 获取科室下拉列表
+     *
+     * @return
+     */
+    public List<DeptShortDTO> getDeptShortList(List<Long> deptIds) {
+        List<DeptShortDTO> deptShortDTOList = Lists.newLinkedList();
+        QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
+        deptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                notIn("id", deptIds);
+        List<DeptInfo> deptInfoList = deptInfoFacade.list(deptInfoQueryWrapper);
+        for (DeptInfo deptInfo : deptInfoList) {
+            DeptShortDTO deptShortDTO = new DeptShortDTO();
+            BeanUtil.copyProperties(deptInfo, deptShortDTO);
+            deptShortDTOList.add(deptShortDTO);
+        }
+        return deptShortDTOList;
+    }
+
+    /**
+     * 获取科室下拉列表-新增
+     *
+     * @return
+     */
+    public List<DeptShortDTO> getDeptShortLisCreate() {
+        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+        deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                select("dept_id").
+                groupBy("dept_id");
+        List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
+        List<Long> deptIds = deptVitalList.stream().map(deptVital -> deptVital.getDeptId()).collect(Collectors.toList());
+        return getDeptShortList(deptIds);
+    }
+
+    /**
+     * 获取科室下拉列表-修改
+     *
+     * @return
+     */
+    public List<DeptShortDTO> getDeptShortLisModify(Long expId) {
+        QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
+        deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                select("dept_id").
+                groupBy("dept_id");
+        List<DeptVital> deptVitalList = this.list(deptVitalQueryWrapper);
+        List<Long> deptIds = deptVitalList.stream().map(deptVital -> deptVital.getDeptId()).collect(Collectors.toList());
+        if (deptIds.contains(expId)) {
+            deptIds.remove(expId);
+            deptIds.size();
+        }
+        return getDeptShortList(deptIds);
     }
-}
+}

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

@@ -5,7 +5,7 @@ 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.QuestionShortDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -66,8 +67,12 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtModified(DateUtil.now());
         }
-        introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
-        introduceInfo.setGmtCreate(DateUtil.now());
+        Date now = DateUtil.now();
+        String userId = UserUtils.getCurrentPrincipleID();
+        introduceInfo.setCreator(userId);
+        introduceInfo.setGmtCreate(now);
+        introduceInfo.setModifier(userId);
+        introduceInfo.setGmtModified(now);
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
 
@@ -201,13 +206,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         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());
-            }
+            introducePageDTO.setOperator(introducePageDTO.getModifier());
+            introducePageDTO.setGmtOperate(introducePageDTO.getGmtModified());
         }
         List<String> userIds = records.stream().map(introduceList -> introduceList.getOperator()).collect(Collectors.toList());
         RespDTO<Map<String, String>> userInfos = userServiceClient.getUserInfoByIds(userIds);
@@ -257,29 +257,29 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         questionInfoQueryWrapper.in("id", questionIds).eq("is_deleted", IsDeleteEnum.N.getKey());
         List<QuestionInfo> questionInfoList = questionInfoFacade.list(questionInfoQueryWrapper);
 
-        List<QuestionIntroduceDTO> questionIntroduceDTOList = Lists.newLinkedList();
+        List<QuestionShortDTO> questionShortDTOList = Lists.newLinkedList();
         String tagName = "";
         for (QuestionInfo questionInfo : questionInfoList) {
-            QuestionIntroduceDTO questionIntroduceDTO = new QuestionIntroduceDTO();
-            BeanUtil.copyProperties(questionInfo, questionIntroduceDTO);
-            questionIntroduceDTOList.add(questionIntroduceDTO);
+            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(questionIntroduceDTOList);
+        introducePageDTO.setQuestionList(questionShortDTOList);
 
         //未关联的标签
         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();
+        List<QuestionShortDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
         for (QuestionInfo questionInfo : unRelatedQuestionList) {
-            QuestionIntroduceDTO questionIntroduceDTO = new QuestionIntroduceDTO();
-            BeanUtil.copyProperties(questionInfo, questionIntroduceDTO);
-            unRelatedQuestionDTOList.add(questionIntroduceDTO);
+            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
+            BeanUtil.copyProperties(questionInfo, questionShortDTO);
+            unRelatedQuestionDTOList.add(questionShortDTO);
         }
         introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);
 
@@ -291,15 +291,15 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      *
      * @return
      */
-    public List<QuestionIntroduceDTO> getAllQuestionList() {
+    public List<QuestionShortDTO> getAllQuestionList() {
         QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
         unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<QuestionInfo> unRelatedQuestionList = questionInfoFacade.list(unRelatedQuestionWrapper);
-        List<QuestionIntroduceDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
+        List<QuestionShortDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
         for (QuestionInfo questionInfo : unRelatedQuestionList) {
-            QuestionIntroduceDTO questionIntroduceDTO = new QuestionIntroduceDTO();
-            BeanUtil.copyProperties(questionInfo, questionIntroduceDTO);
-            unRelatedQuestionDTOList.add(questionIntroduceDTO);
+            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
+            BeanUtil.copyProperties(questionInfo, questionShortDTO);
+            unRelatedQuestionDTOList.add(questionShortDTO);
         }
         return unRelatedQuestionDTOList;
     }

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

@@ -62,11 +62,11 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
             introduceMap.setType(introduceMapVO.getType());
             introduceMap.setCreator(UserUtils.getCurrentPrincipleID());
             introduceMap.setGmtCreate(DateUtil.now());
-        } else {
-            //已有关系更新时间
-            introduceMap.setGmtModified(DateUtil.now());
-            introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
         }
+        //已有关系更新时间
+        introduceMap.setGmtModified(DateUtil.now());
+        introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
+
         this.saveOrUpdate(introduceMap);
         return true;
     }

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

@@ -14,6 +14,8 @@ import com.diagbot.dto.GetRetrievalsByTagDTO;
 import com.diagbot.entity.Retrieval;
 import com.diagbot.entity.RetrievalMapping;
 import com.diagbot.service.impl.RetrievalServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddTagRetrievalVO;
 import com.diagbot.vo.DelRetrievalsByMapsVO;
 import com.diagbot.vo.GetRetrievalsByTagVO;
@@ -24,10 +26,10 @@ import com.diagbot.vo.GetRetrievalsByTagVO;
  * @time 2018年12月5日下午4:53:59
  */
 @Component
-public class RetrievalFacede extends RetrievalServiceImpl {
+public class RetrievalFacade extends RetrievalServiceImpl {
 	
 	@Autowired
-	private RetrievalMappingFacede retrievalMappingFacede;
+	private RetrievalMappingFacade retrievalMappingFacade;
 	
 	/**
 	 * 根据标签获取同义词
@@ -45,7 +47,7 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 	 * @return
 	 */
 	public Boolean delRetrievalsByMaps(DelRetrievalsByMapsVO delRetrievalsByMapsVO){
-		retrievalMappingFacede.removeByIds(delRetrievalsByMapsVO.getRetrievalMappingIds());
+		retrievalMappingFacade.removeByIds(delRetrievalsByMapsVO.getRetrievalMappingIds());
 		return true;
 	}
 	
@@ -60,14 +62,17 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 		queryWrapper.eq("name", addTagRetrievalVO.getRetrievalName());
 		queryWrapper.eq("is_deleted", "N");
 		Retrieval retrieval = this.getOne(queryWrapper);
+		String userId = UserUtils.getCurrentPrincipleID();
 		if(retrieval==null){
 			retrieval = new Retrieval();
 			retrieval.setName(addTagRetrievalVO.getRetrievalName());
+			retrieval.setCreator(userId);
+			retrieval.setGmtCreate(DateUtil.now());
 		}else{
 			QueryWrapper<RetrievalMapping> queryWrapper2 = new QueryWrapper<RetrievalMapping>();
 			queryWrapper2.eq("retrieval_id", retrieval.getId());
 			queryWrapper2.eq("question_id", addTagRetrievalVO.getQuestionId());
-			retrievalMappingFacede.remove(queryWrapper2);
+			retrievalMappingFacade.remove(queryWrapper2);
 		}
 		
 		retrieval.setSpell(addTagRetrievalVO.getRetrievalSpell());
@@ -77,7 +82,9 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 		retrievalMapping.setQuestionId(addTagRetrievalVO.getQuestionId());
 		retrievalMapping.setRetrievalId(retrieval.getId());
 		retrievalMapping.setShowType(addTagRetrievalVO.getRetrievalType());
-		retrievalMappingFacede.save(retrievalMapping);
+		retrievalMapping.setCreator(userId);
+		retrievalMapping.setGmtCreate(DateUtil.now());
+		retrievalMappingFacade.save(retrievalMapping);
 		
 		addTagRetrievalDTO.setRetrievalId(retrieval.getId());
 		addTagRetrievalDTO.setRetrievalMappingId(retrievalMapping.getId());

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

@@ -13,7 +13,7 @@ import com.diagbot.service.impl.RetrievalMappingServiceImpl;
  * @time 2018年12月5日下午4:53:59
  */
 @Component
-public class RetrievalMappingFacede extends RetrievalMappingServiceImpl {
+public class RetrievalMappingFacade extends RetrievalMappingServiceImpl {
 
 	
 }

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

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

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

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/12/12 15:12
+ */
+@Getter
+@Setter
+public class DeptVitalPageVO extends Page {
+    String deptName;
+}

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

@@ -1,11 +1,13 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptShortDTO;
 import com.diagbot.dto.DeptVitalDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.DeptVitalFacade;
+import com.diagbot.vo.DeptVitalPageVO;
 import com.diagbot.vo.DeptVitalVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -70,10 +72,44 @@ public class DeptVitalController {
 
     @ApiOperation(value = "根据科室ID获取查体模板[by:zhaops]",
             notes = "deptId:科室ID，必填<br>")
-    @PostMapping("/getVitalsByDeptId")
-    @SysLogger("getVitalsByDeptId")
-    public RespDTO<List<QuestionInfo>> getVitalsByDeptId(@RequestParam("deptId") Long deptId) {
-        List<QuestionInfo> data = deptVitalFacade.getVitalsByDeptId(deptId);
+    @PostMapping("/getModuleByDeptId")
+    @SysLogger("getModuleByDeptId")
+    public RespDTO<DeptVitalDTO> getModuleByDeptId(@RequestParam("deptId") Long deptId) {
+        DeptVitalDTO data = deptVitalFacade.getModuleByDeptId(deptId);
+        return RespDTO.onSuc(data);
+    }
+
+    /**
+     * 分页查询查体模板，可带等于条件
+     *
+     * @param deptVitalPageVO
+     * @return
+     */
+    @ApiOperation(value = "分页查询查体模板，可带等于条件[by:zhaops]",
+            notes = "current:页码，必填<br>" +
+                    "size:每页显示条数，必填<br>" +
+                    "deptName:科室名称<br>")
+    @PostMapping("/getDeptVitalPage")
+    @SysLogger("getDeptVitalPage")
+    public RespDTO getDeptVitalPage(@RequestBody DeptVitalPageVO deptVitalPageVO) {
+        IPage<DeptVitalDTO> infoIPage = deptVitalFacade.getDeptVitalPage(deptVitalPageVO);
+        return RespDTO.onSuc(infoIPage);
+    }
+
+    @ApiOperation(value = "查询科室下拉列表-新增[by:zhaops]")
+    @PostMapping("/getDeptShortList_create")
+    @SysLogger("getDeptShortList_create")
+    public RespDTO<DeptShortDTO> getDeptShortListCreate() {
+        List<DeptShortDTO> data = deptVitalFacade.getDeptShortLisCreate();
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "查询科室下拉列表-修改[by:zhaops]",
+            notes = "deptId:科室ID，必填<br>")
+    @PostMapping("/getDeptShortList_modify")
+    @SysLogger("getDeptShortList_modify")
+    public RespDTO<DeptShortDTO> getDeptShortListModify(@RequestParam("deptId") Long deptId) {
+        List<DeptShortDTO> data = deptVitalFacade.getDeptShortLisModify(deptId);
         return RespDTO.onSuc(data);
     }
 }

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

@@ -4,7 +4,7 @@ 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.QuestionShortDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.facade.IntroduceInfoFacade;
@@ -124,8 +124,8 @@ public class IntroduceInfoController {
     @ApiOperation(value = "获取未关联标签列表-新增提示信息时[by:zhaops]")
     @PostMapping("/getAllQuestionList")
     @SysLogger("getAllQuestionList")
-    public RespDTO<QuestionIntroduceDTO> getUnRelatedQuestionList() {
-        List<QuestionIntroduceDTO> data = introduceInfoFacade.getAllQuestionList();
+    public RespDTO<QuestionShortDTO> getUnRelatedQuestionList() {
+        List<QuestionShortDTO> data = introduceInfoFacade.getAllQuestionList();
         return RespDTO.onSuc(data);
     }
 }

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

@@ -15,7 +15,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.AddTagRetrievalDTO;
 import com.diagbot.dto.GetRetrievalsByTagDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.RetrievalFacede;
+import com.diagbot.facade.RetrievalFacade;
 import com.diagbot.vo.AddTagRetrievalVO;
 import com.diagbot.vo.DelRetrievalsByMapsVO;
 import com.diagbot.vo.GetRetrievalsByTagVO;
@@ -38,13 +38,13 @@ import io.swagger.annotations.ApiOperation;
 public class RetrievalController {
 	
 	@Autowired
-	private RetrievalFacede retrievalFacede;
+	private RetrievalFacade retrievalFacade;
 	
     @ApiOperation(value = "根据标签获取同义词[by:rengb]")
 	@PostMapping("/getRetrievalsByTag")
 	@SysLogger("getRetrievalsByTag")
 	public RespDTO<List<GetRetrievalsByTagDTO>> getRetrievalsByTag(@Valid @RequestBody GetRetrievalsByTagVO getRetrievalsByTagVO) {
-		return RespDTO.onSuc(retrievalFacede.getRetrievalsByTag(getRetrievalsByTagVO));
+		return RespDTO.onSuc(retrievalFacade.getRetrievalsByTag(getRetrievalsByTagVO));
 	}
 	
 	
@@ -53,7 +53,7 @@ public class RetrievalController {
 	@SysLogger("delRetrievalsByMaps")
 	@Transactional
 	public RespDTO<List<Boolean>> delRetrievalsByMaps(@Valid @RequestBody DelRetrievalsByMapsVO delRetrievalsByMapsVO) {
-		return RespDTO.onSuc(retrievalFacede.delRetrievalsByMaps(delRetrievalsByMapsVO));
+		return RespDTO.onSuc(retrievalFacade.delRetrievalsByMaps(delRetrievalsByMapsVO));
 	}
 	
     @ApiOperation(value = "标签添加同义词[by:rengb]")
@@ -61,7 +61,7 @@ public class RetrievalController {
 	@SysLogger("addTagRetrieval")
 	@Transactional
 	public RespDTO<AddTagRetrievalDTO> addTagRetrieval(@Valid @RequestBody AddTagRetrievalVO addTagRetrievalVO) {
-		return RespDTO.onSuc(retrievalFacede.addTagRetrieval(addTagRetrievalVO));
+		return RespDTO.onSuc(retrievalFacade.addTagRetrieval(addTagRetrievalVO));
 	}