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

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

@@ -73,6 +73,7 @@ public class LisExcelResFacade {
 										max = getValue(row.getCell(4)).trim();
 										min = getValue(row.getCell(5)).trim();
 										time = getValue(row.getCell(6)).trim();
+										type = getValue(row.getCell(7)).trim();
 									} else {
 										mealName = null;
 										itemName = null;
@@ -81,6 +82,7 @@ public class LisExcelResFacade {
 										max = null;
 										min = null;
 										time = null;
+										type = null;
 									}
 
 									if (StringUtil.isEmpty(mealName) && StringUtil.isEmpty(itemName)
@@ -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/GetQuestionInfoDTO.java

@@ -0,0 +1,25 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/12 13:20
+ */
+@Getter
+@Setter
+public class GetQuestionInfoDTO {
+
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 标签名
+     */
+    private String tagName;
+}

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -105,11 +105,9 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * 常用标签维护获取科室名称
      * @return
      */
-    public List<DeptInfo> getAllDeptInfo(){
-        QueryWrapper<DeptInfo> queryWrapper =new QueryWrapper();
-        queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
-        List<DeptInfo> deptInfoList = this.list(queryWrapper);
-        if (ListUtil.isEmpty(deptInfoList)){
+    public List<DeptInfoDTO> getAllDeptInfo(){
+        List<DeptInfoDTO> deptInfoList = this.getDeptName();
+        if(ListUtil.isEmpty(deptInfoList)){
             throw new CommonException(CommonErrorCode.FAIL,
                     "获取科室名称失败");
         }

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

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

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

@@ -12,9 +12,9 @@ import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.entity.IntroduceMap;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.IntroduceDetailServiceImpl;
+import com.diagbot.service.IntroduceDetailService;
+import com.diagbot.service.IntroduceMapService;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
-import com.diagbot.service.impl.IntroduceMapServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
@@ -24,6 +24,7 @@ import com.diagbot.vo.IntroducePageVO;
 import com.diagbot.vo.IntroduceVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -42,9 +43,11 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     @Autowired
     IntroduceDetailFacade introduceDetailFacade;
     @Autowired
-    IntroduceDetailServiceImpl introduceDetailServiceImpl;
+    @Qualifier("introduceDetailServiceImpl")
+    IntroduceDetailService introduceDetailService;
     @Autowired
-    IntroduceMapServiceImpl introduceMapServiceImpl;
+    @Qualifier("introduceMapServiceImpl")
+    IntroduceMapService introduceMapService;
     @Autowired
     UserServiceClient userServiceClient;
     @Autowired
@@ -97,7 +100,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceDetailList.add(detail);
         }
         //插入新的明细记录
-        introduceDetailServiceImpl.saveBatch(introduceDetailList);
+        introduceDetailService.saveBatch(introduceDetailList);
 
         //更新映射关系
         //删除已有映射关系
@@ -116,7 +119,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceMap.setIntroduceId(introduceInfo.getId());
             introduceMapList.add(introduceMap);
         }
-        introduceMapServiceImpl.saveBatch(introduceMapList);
+        introduceMapService.saveBatch(introduceMapList);
         return true;
     }
 

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

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

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

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

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

@@ -57,34 +57,38 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	 * 
 	 * @return
 	 */
-	public List<VersionWrapperDTO> getVersionInfoAll(Page page,String name) {
+	public List<VersionWrapperDTO> getVersionInfoAll(Page page, String name) {
 		// 查询最新的一条版本信息
 		QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey()).like("name",name)
-					.orderByDesc("refresh_time");	
-		
-		//List<VersionInfo> versionInfos =list(versionInfoQuery);// getOne(versionInfoQuery);
-		IPage<VersionInfo> queryUserInformation = page(page,versionInfoQuery);
-		
+		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.like("name", name).orderByDesc("refresh_time");
+
+		// List<VersionInfo> versionInfos =list(versionInfoQuery);//
+		// getOne(versionInfoQuery);
+		IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+
 		List<VersionInfo> versionInfos = queryUserInformation.getRecords();
-		
+
 		List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
-		/*List<String> modifierid = versionInfos.stream().map(ac->ac.getModifier()).collect(Collectors.toList());
-		RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-		Map<String, String> userNames = userNamesDTO.data;*/
+		/*
+		 * List<String> modifierid =
+		 * versionInfos.stream().map(ac->ac.getModifier()).collect(Collectors.
+		 * toList()); RespDTO<Map<String, String>> userNamesDTO =
+		 * userServiceClient.getUserInfoByIds(modifierid); Map<String, String>
+		 * userNames = userNamesDTO.data;
+		 */
 		List<String> modifierid = new ArrayList<>();
 		modifierid = versionInfos.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		
+
 		Map<String, String> userNames = new HashMap<>();
-		if(modifierid.size()>0){
-			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);	
-			 if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
-	                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-	                        "获取所有用户信息失败");
-	            }
+		if (modifierid.size() > 0) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (userNamesDTO == null || !"0".equals(userNamesDTO.code)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
 			userNames = userNamesDTO.data;
 		}
-	
+
 		// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
 		// System.out.println(detail.toString());
 		for (VersionInfo versionInfo : versionInfos) {
@@ -122,6 +126,15 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	}
 
 	public boolean saveVersionInfoAll(VersionInfoVO versionInfoVO) {
+		// 1.判断该版本号是否存在名字相同的数据
+		QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+		templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		VersionInfo dataInfo = getOne(templateInfoFand);
+		if (dataInfo != null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
+		}
+
+		//增加版本数据
 		VersionInfo versionInfo = new VersionInfo();
 		versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
 		versionInfo.setGmtCreate(DateUtil.now());
@@ -133,7 +146,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
 		} catch (ParseException e) {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-			//e.printStackTrace();
+			// e.printStackTrace();
 		}
 		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		versionInfo.setRemark(versionInfoVO.getRemark());
@@ -141,7 +154,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 		if (res) {
 			List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
 			List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
-			if(datas!=null && datas.size()>0){
+			if (datas != null && datas.size() > 0) {
 				for (VersionDetailVO data : datas) {
 					VersionDetail versionDetail = new VersionDetail();
 					versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
@@ -152,16 +165,17 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 					versionDetail.setOrderNo(data.getOrderNo());
 					versionDetail.setTitle(data.getTitle());
 					versionDetail.setVersionId(versionInfo.getId());
-					//System.out.println("========versionInfo.getId()======" + versionInfo.getId());
+					// System.out.println("========versionInfo.getId()======" +
+					// versionInfo.getId());
 					versionDetail.setRemark(data.getRemark());
 					versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 					dataNew.add(versionDetail);
 				}
 
-				res = versionDetailServiceImpl.saveBatch(dataNew);	
+				res = versionDetailServiceImpl.saveBatch(dataNew);
 			}
-			
-			//System.out.println(res);
+
+			// System.out.println(res);
 		}
 		return res;
 	}
@@ -184,15 +198,15 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 		versionInfo.setId(versionInfoVO.getId());// 模板id
 		versionInfo.setName(versionInfoVO.getName());// 模板名称
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		if(versionInfoVO.getRefreshTime() != null){
+		if (versionInfoVO.getRefreshTime() != null) {
 			try {
 				versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
 			} catch (ParseException e) {
 				throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-				//e.printStackTrace();
+				// e.printStackTrace();
 			}
 		}
-		
+
 		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		versionInfo.setRemark(versionInfoVO.getRemark());
 		versionInfo.setGmtModified(DateUtil.now());// 修改时间
@@ -213,8 +227,9 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	 */
 	public boolean cancelVersionInfoAll(VersionInfoIdVO versionInfoVO) {
 		UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
-		versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey()).set("is_deleted",
-				IsDeleteEnum.Y.getKey()).set("modifier",UserUtils.getCurrentPrincipleID()).set("gmt_modified",DateUtil.now());
+		versionInfoNew.in("id", versionInfoVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
 		return update(new VersionInfo(), versionInfoNew);
 	}
 

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

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

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

@@ -33,4 +33,10 @@ public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
      * @return
      */
     public List<DeptInfoDTO> getDeptInfos(@Param("deptCode") String deptCode,@Param("hospitalCode") String hospitalCode);
+
+    /**
+     * 获取科室名称
+     * @return
+     */
+    public List<DeptInfoDTO> getDeptName();
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.entity.QuestionInfo;
+import com.diagbot.vo.GetQuestionInfoVO;
 
 import java.util.List;
 import java.util.Map;
@@ -20,5 +22,11 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     public List<QuestionInfo> index(Map map);
 
+    /**
+     * 根据名称获取标签信息
+     * @param getQuestionInfoVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO  getQuestionInfoVO);
 
 }

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

@@ -32,4 +32,10 @@ public interface DeptInfoService extends IService<DeptInfo> {
      * @return
      */
     public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode);
+
+    /**
+     * 获取科室名称
+     * @return
+     */
+    public List<DeptInfoDTO> getDeptName();
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.entity.QuestionInfo;
+import com.diagbot.vo.GetQuestionInfoVO;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,6 +31,12 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
      */
     public void deleteByIds(Map map);
 
+    /**
+     * 根据名称获取标签信息
+     * @param getQuestionInfoVO
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO getQuestionInfoVO);
 
     /**
      * 检索

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

@@ -31,4 +31,9 @@ public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> i
     public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode) {
         return baseMapper.getDeptInfos(deptCode,hospitalCode);
     }
+
+    @Override
+    public List<DeptInfoDTO> getDeptName() {
+        return baseMapper.getDeptName();
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.mapper.QuestionInfoMapper;
 import com.diagbot.service.QuestionInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.GetQuestionInfoVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,6 +27,11 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         baseMapper.deleteByIds(map);
     }
 
+    @Override
+    public List<GetQuestionInfoDTO> getQuestiongInfoByName(GetQuestionInfoVO getQuestionInfoVO) {
+        return baseMapper.getQuestiongInfoByName(getQuestionInfoVO);
+    }
+
     @Override
     public List<QuestionInfo> index(Map map) {
         return baseMapper.index(map);

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

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/12 13:17
+ */
+@Getter
+@Setter
+public class GetQuestionInfoVO {
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 科室id
+     */
+    private String deptId;
+}

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

@@ -3,11 +3,14 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.facade.DeptInfoFacade;
+import com.diagbot.facade.QuestionInfoFacade;
 import com.diagbot.facade.QuestionUsualFacade;
+import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.QuestionUsualVO;
 import com.diagbot.vo.UpdateQuetionUsualVO;
 import io.swagger.annotations.Api;
@@ -40,6 +43,8 @@ public class QuestionUsualController {
     private QuestionUsualFacade questionUsualFacade;
     @Autowired
     private DeptInfoFacade deptInfoFacade;
+    @Autowired
+    private QuestionInfoFacade questionInfoFacade;
 
     @ApiOperation(value = "常用标签维护——添加[by:wangyu]",
             notes = "deptCode: 科室编号,必填<br>" +
@@ -88,8 +93,18 @@ public class QuestionUsualController {
             notes = "")
     @PostMapping("/getDeptName")
     @SysLogger("getDeptName")
-    public RespDTO<List<DeptInfo>> getDeptName() {
-        List<DeptInfo> data = deptInfoFacade.getAllDeptInfo();
+    public RespDTO<List<DeptInfoDTO>> getDeptName() {
+        List<DeptInfoDTO> data = deptInfoFacade.getAllDeptInfo();
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "常用标签维护——获取标签信息[by:wangyu]",
+            notes = "tagName: 标签名称，非必填<br>" +
+                    "deptId: 科室id，如果是添加不用填，如果是修改，必填<br>")
+    @PostMapping("/getQuestionInfo")
+    @SysLogger("getQuestionInfo")
+    public RespDTO<List<GetQuestionInfoDTO>> getQuestionInfo(@Valid @RequestBody GetQuestionInfoVO getQuestionInfoVO) {
+        List<GetQuestionInfoDTO> data = questionInfoFacade.getQuestiongInfosByName(getQuestionInfoVO);
         return RespDTO.onSuc(data);
     }
 }

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

@@ -28,4 +28,28 @@
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
         AND b.`code` = #{deptCode} AND b.hospital_code = #{hospitalCode}
     </select>
+
+    <select id="getDeptName" resultType="com.diagbot.dto.DeptInfoDTO">
+        SELECT
+	      *
+        FROM
+	      `icss_dept_info` a
+        WHERE
+          a.is_deleted = 'N'
+          AND a.id NOT IN (
+		      SELECT
+			    b.dept_id
+		      FROM
+			    icss_question_usual b
+		      WHERE
+		        b.is_deleted = 'N'
+		        AND b.id IN (
+				    SELECT
+					  c.id
+				    FROM
+					  `icss_dept_info` c
+				    WHERE c.is_deleted = 'N'
+			  )
+	      )
+    </select>
 </mapper>

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

@@ -77,4 +77,29 @@
             and type = #{type}
         </if>
     </select>
+
+    <select id="getQuestiongInfoByName" resultType="com.diagbot.dto.GetQuestionInfoDTO">
+        SELECT
+        a.*
+        FROM
+        `icss_question_info` a
+        WHERE
+        a.is_deleted = 'N'
+        AND a.type = '1'
+        AND a.sub_type = '0'
+        <if test="deptId != null and deptId != ''">
+            AND a.id NOT IN (
+            SELECT
+            b.question_id
+            FROM
+            `icss_question_usual` b
+            WHERE
+            b.is_deleted = 'N'
+            AND b.dept_id = #{deptId}
+            )
+        </if>
+        <if test="tagName != null and tagName != ''">
+            AND a.tag_name like CONCAT('%', #{tagName}, '%')
+        </if>
+    </select>
 </mapper>