Merge branch 'dev/diagbotcloud20190918_vital' of http://192.168.2.236:10080/gaodm/diagbotcloud into dev/diagbotcloud20190918_vital

knowledgeman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -1,16 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-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.beans.factory.annotation.Qualifier;
-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;
@@ -34,6 +23,16 @@ import com.diagbot.vo.IndexConfigDiseaseIdVO;
 import com.diagbot.vo.IndexConfigDiseaseNameVO;
 import com.diagbot.vo.IndexConfigListVO;
 import com.diagbot.vo.IndexConfigVO;
+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.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -149,7 +148,8 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
      */
     public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
         boolean res = false;
-        if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+        if (indexConfigListVO != null
+                && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
             List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
             List<Long> conceptId = new ArrayList<>();
             for (IndexConfigVO e : indexConfigData) {
@@ -158,7 +158,9 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 
             QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
 
-            IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId()).in("concept_id", conceptId);
+            IndexConfigQuery
+                    .eq("disease_id", indexConfigListVO.getDiseaseId())
+                    .in("concept_id", conceptId);
             List<IndexConfig> dataUnique = list(IndexConfigQuery);
             if (ListUtil.isNotEmpty(dataUnique)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,

knowledgeman-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.service.ScaleContentService;
 import com.diagbot.service.impl.ScaleContentServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeleteScaleVO;
@@ -141,8 +142,11 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
                 || IsDeleteEnum.Y.getKey().equals(deleteScaleVO.getStatus()))) {
             throw new CommonException(CommonErrorCode.STATUS_IS_ERROR, "状态值错误【Y】或【N】");
         }
-        String person = UserUtils.getCurrentPrincipleID();
         List<Long> ids = deleteScaleVO.getIds();
+        if (ListUtil.isEmpty(ids)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "量表概念id不能为空");
+        }
+        String person = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
         this.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()
                 .in("concept_id", ids)

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

@@ -201,7 +201,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         checkExistMain(versionDetailres.getVersionId());
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
         versionDetailNew
-                .in("id", versionDetailIdVO.getId())
+                .eq("id", versionDetailIdVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())

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

@@ -252,7 +252,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         checkExist(versionInfoVO.getId());
         UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
         versionInfoNew
-                .in("id", versionInfoVO.getId())
+                .eq("id", versionInfoVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())