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

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

@@ -86,7 +86,7 @@ public class LisExcelResFacade {
 									}
 
 									if (StringUtil.isEmpty(mealName) && StringUtil.isEmpty(itemName)
-											&& StringUtil.isEmpty(value)) {
+											&& StringUtil.isEmpty(value)&& StringUtil.isEmpty(type)) {
 										continue;
 									}
 
@@ -95,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();

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

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 常用枚举类
+ * @Author: wangyu
+ * @Date: 10:25 2018/12/13
+ */
+public enum UsualEnum implements KeyedNamed {
+    Disable(0, "不常用"),
+    Enable(1, "常用");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    UsualEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static UsualEnum getEnum(Integer key) {
+        for (UsualEnum item : UsualEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        UsualEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

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

@@ -212,28 +212,27 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         for (DeptInfo deptInfo : deptVitalDTOList) {
             DeptVitalDTO deptVitalDTO = new DeptVitalDTO();
             BeanUtil.copyProperties(deptInfo, deptVitalDTO);
+            //取映射关系维护时间，不取科室维护时间
             if (deptVitalMap.get(deptInfo.getId()) != null) {
                 DeptVital deptVital = deptVitalMap.get(deptInfo.getId());
-                if (deptVital.getGmtModified().after(deptVital.getGmtCreate())) {
-                    deptVitalDTO.setGmtOperate(deptVital.getGmtModified());
-                    deptVitalDTO.setOperator(deptVital.getModifier());
-                } else {
-                    deptVitalDTO.setGmtOperate(deptVital.getGmtCreate());
-                    deptVitalDTO.setOperator(deptVital.getCreator());
-                }
+                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.getOperator()).collect(Collectors.toList());
+        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(deptVitalDTO.getOperator());
+                deptVitalDTO.setOperatorName(userInfos.get(deptVitalDTO.getOperator()));
             }
         }
         page.setRecords(deptVitalDTOListRet);
-
         return page;
     }
 

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

@@ -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);

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

@@ -2,21 +2,21 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.UsualEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.QuestionUsualService;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
-import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.QuestionUsualVO;
 import com.diagbot.vo.UpdateQuetionUsualVO;
+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;
@@ -32,6 +32,9 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
     private QuestionInfoFacade questionInfoFacade ;
     @Autowired
     private DeptInfoFacade deptInfoFacade;
+    @Autowired
+    @Qualifier("questionUsualServiceImpl")
+    private QuestionUsualService questionUsualService;
 
     /**
      * 添加常用标签
@@ -39,29 +42,24 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean addQuestionUsual(QuestionUsualVO questionUsualVO) {
-        DeptInfoVO deptInfoVO =new DeptInfoVO();
-        QuestionInfo questionInfo =new QuestionInfo();
-        BeanUtil.copyProperties(questionUsualVO,deptInfoVO);
-        List<DeptInfoDTO> listRespDTO = deptInfoFacade.getDeptInfos(questionUsualVO.getDeptCode(),questionUsualVO.getHospitalCode());
-        if (ListUtil.isEmpty(listRespDTO)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取科室信息失败");
-        }
-        questionInfo.setName(questionUsualVO.getQuestionName());
-        QuestionInfo questionInfoRespDTO = questionInfoFacade.getQuestionInfos(questionInfo);
-        if (questionInfoRespDTO == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取标签信息失败");
-        }
+        List<QuestionUsual> questionUsualList = Lists.newArrayList();
         QuestionUsual questionUsual = new QuestionUsual();
-        questionUsual.setCreator(UserUtils.getCurrentPrincipleID());
-        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
-        questionUsual.setGmtCreate(DateUtil.now());
-        questionUsual.setQuestionId(questionInfoRespDTO.getId());
-        questionUsual.setDeptId(listRespDTO.get(0).getId());
-        Boolean flag = this.save(questionUsual);
+        String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        for (int i = 0; i<questionUsualVO.getQuestionId().size(); i++ ) {
+            questionUsual =new QuestionUsual();
+            questionUsual.setCreator(userId);
+            questionUsual.setModifier(userId);
+            questionUsual.setGmtCreate(DateUtil.now());
+            questionUsual.setGmtModified(DateUtil.now());
+            questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
+            questionUsual.setDeptId(questionUsualVO.getDeptId());
+            questionUsual.setOrderNo(Long.parseLong(String.valueOf(i+1)));
+            questionUsual.setUsual(String.valueOf(UsualEnum.Enable.getKey()));
+            questionUsualList.add(questionUsual);
+        }
+        Boolean flag = questionUsualService.saveBatch(questionUsualList);
         if(!flag){
-            throw new CommonException(CommonErrorCode.FAIL,
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED,
                     "常用症状添加失败");
         }
         return flag;

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

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -13,10 +14,8 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class QuestionUsualVO {
-    @NotNull(message = "请输入医院编号")
-    private String hospitalCode;
-    @NotNull(message = "请输入科室编号")
-    private String deptCode;
-    @NotNull(message = "请输入症状名称")
-    private String questionName;
+    @NotNull(message = "请输入科室id")
+    private Long deptId;
+    @NotNull(message = "请输入症状id")
+    private List<Long> questionId;
 }

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));
 	}