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

docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

@@ -1,6 +1,7 @@
 use `sys-icss`;
 
 DROP TABLE IF EXISTS `icss_vital_order`;
+DROP TABLE IF EXISTS `icss_lis_unique`;
 -- 周铁钢
 -- ----------------------------
 -- Table structure for icss_dictionary_info

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

@@ -46,6 +46,7 @@ import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionIdsVO;
+import com.diagbot.vo.QuestionIndexSubVO;
 import com.diagbot.vo.QuestionIndexVO;
 import com.diagbot.vo.QuestionPageVO;
 import com.diagbot.vo.QuestionSaveVO;
@@ -622,6 +623,34 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return null;
     }
 
+    /**
+     * 根据主标签id 检索子标签
+     * @param questionIndexSubVO
+     * @return
+     */
+    public List<QuestionInfo> indexSub(QuestionIndexSubVO questionIndexSubVO) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("age", questionIndexSubVO.getAge());
+        paramMap.put("sexType", questionIndexSubVO.getSexType());
+        paramMap.put("tagName", questionIndexSubVO.getTagName());
+        paramMap.put("type", questionIndexSubVO.getType());
+        paramMap.put("controlType", questionIndexSubVO.getControlType());
+        paramMap.put("notIds", questionIndexSubVO.getNotIds());
+        paramMap.put("tagType", questionIndexSubVO.getTagType());
+        paramMap.put("existName", questionIndexSubVO.getExistName());
+        paramMap.put("notTagType", questionIndexSubVO.getNotTagType());
+        paramMap.put("notControlType", questionIndexSubVO.getNotControlType());
+
+        QueryWrapper<QuestionMapping> questionMappingQueryWrapper = new QueryWrapper<>();
+        questionMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("parent_question", questionIndexSubVO.getParentId());
+        List<QuestionMapping> questionMappingList = questionMappingFacade.list(questionMappingQueryWrapper);
+        if (ListUtil.isNotEmpty(questionMappingList)) {
+            List<Long> sonIds = questionMappingList.stream().map(questionMapping -> questionMapping.getSonQuestion()).collect(Collectors.toList());
+            paramMap.put("ids", sonIds);
+        }
+        List<QuestionInfo> res = this.index(paramMap);
+        return res;
+    }
 
     /**
      * 获取特殊标签（同伴|无）

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:检索标签子项
+ * @Author:zhaops
+ * @time: 2019/4/22 16:39
+ */
+@Getter
+@Setter
+public class QuestionIndexSubVO extends QuestionIndexVO {
+    @NotNull(message = "请输入父标签id")
+    private Long parentId;
+}

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

@@ -4,6 +4,7 @@ package com.diagbot.web;
 import java.util.List;
 import java.util.Map;
 
+import com.diagbot.vo.QuestionIndexSubVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,8 @@ import com.diagbot.vo.QuestionVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 标签基础表 前端控制器
@@ -86,6 +89,15 @@ public class QuestionInfoController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "子标签检索[by:zhaops]",
+            notes = "")
+    @PostMapping("/indexSub")
+    @SysLogger("indexSub")
+    public RespDTO<List<QuestionInfo>> indexSub(@RequestBody @Valid  QuestionIndexSubVO questionIndexSubVO) {
+        List<QuestionInfo> data = questionFacade.indexSub(questionIndexSubVO);
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "获取特殊标签（同伴|无）[by:zhoutg]",
             notes = "")
     @PostMapping("/getSpecial")

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

@@ -94,6 +94,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test=" ids != null and ids.size() > 0 ">
+            and id  in
+            <foreach  collection="ids" item="id" open="("  separator=","  close=")">
+                #{id}
+            </foreach>
+        </if>
         order by gmt_modified desc
     </select>