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

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

@@ -122,7 +122,7 @@ public class PushFacade {
         }
 
         //化验项映射,转公表
-        if (pushVO.getLis().size() > 0) {
+        if (ListUtil.isNotEmpty(pushVO.getLis())) {
             Map<String, Map<String, String>> lisConfigMap = lisMappingFacade.getLisMapping_NotEmptyItemName();
             Map<String, String> lisConfigWithEmptyItemNameMap = lisMappingFacade.getLisConfig_EmptyItemName();
             for (LisResultVO lisResultVO : pushVO.getLis()) {

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

@@ -27,8 +27,10 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -63,15 +65,17 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         //判断该科室是否添加过常用标签
         QuestionUsual questionUsual = new QuestionUsual();
         String userId = UserUtils.getCurrentPrincipleID();
+        Date now = DateUtil.now();
         List<QuestionUsual> questionUsualList = this.getQuestionUsualByQuestionId(questionUsualVO);
+        List<Long> questionIdList = questionUsualList.stream().map(questionUsual1 -> questionUsual1.getQuestionId()).collect(Collectors.toList());
         //如果添加过将原来的标签删除
         if (ListUtil.isNotEmpty(questionUsualList)) {
             UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper();
             updateWrapper.eq("dept_id", questionUsualVO.getDeptId())
-                    .in("question_id",questionUsualList)
+                    .in("question_id",questionIdList)
                     .set("is_deleted", IsDeleteEnum.Y.getKey())
                     .set("modifier", userId)
-                    .set("gmt_modified", DateUtil.now());
+                    .set("gmt_modified", now);
             this.update(new QuestionUsual(), updateWrapper);
         }
         //重新添加标签
@@ -79,8 +83,8 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             questionUsual = new QuestionUsual();
             questionUsual.setCreator(userId);
             questionUsual.setModifier(userId);
-            questionUsual.setGmtCreate(DateUtil.now());
-            questionUsual.setGmtModified(DateUtil.now());
+            questionUsual.setGmtCreate(now);
+            questionUsual.setGmtModified(now );
             questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
             questionUsual.setDeptId(questionUsualVO.getDeptId());
             questionUsual.setOrderNo(Long.parseLong(String.valueOf(i + 1)));