Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/dto/StaticKnowledgeDTO.java

@@ -42,9 +42,4 @@ public class StaticKnowledgeDTO {
      * 静态知识明细
      */
     private Map<String, List<StaticKnowledgeDetailDTO>> details;
-
-    /**
-     * 剂型
-     */
-    private String form;
 }

src/main/java/com/diagbot/dto/StaticKnowledgeHISDTO.java

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/9/27 17:29
+ */
+@Getter
+@Setter
+public class StaticKnowledgeHISDTO extends StaticKnowledgeDTO {
+    /**
+     * his名称
+     */
+    private String hisName;
+    /**
+     * his明细名称
+     */
+    private String hisDetailName;
+}

src/main/java/com/diagbot/facade/ConceptInfoFacade.java

@@ -10,6 +10,7 @@ import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeDetailDTO;
+import com.diagbot.dto.StaticKnowledgeHISDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.entity.ConceptInfo;
@@ -319,9 +320,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      * @param staticKnowledgeHISVO
      * @return
      */
-    public List<StaticKnowledgeDTO> getStaticKnowledgeForHIS(StaticKnowledgeHISVO staticKnowledgeHISVO) {
+    public List<StaticKnowledgeHISDTO> getStaticKnowledgeForHIS(StaticKnowledgeHISVO staticKnowledgeHISVO) {
 
-        List<StaticKnowledgeDTO> retList = Lists.newArrayList();
+        List<StaticKnowledgeHISDTO> retList = Lists.newArrayList();
         String typeName = StaticTypeEnum.getName(staticKnowledgeHISVO.getType());
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
         typeName = convertTypeName(typeName, 1, dicList);
@@ -335,7 +336,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         QueryWrapper<ConceptInfo> conceptInfoQueryWrapper = new QueryWrapper<>();
         conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("name", uniqueNameList)
-                .eq("status",StatusEnum.Enable.getKey())
+                .eq("status", StatusEnum.Enable.getKey())
                 .eq("type", typeName);
         List<ConceptInfo> conceptInfoList = this.list(conceptInfoQueryWrapper);
 
@@ -343,7 +344,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             return retList;
         }
 
-        retList = BeanUtil.listCopyTo(conceptInfoList, StaticKnowledgeDTO.class);
+        retList = BeanUtil.listCopyTo(conceptInfoList, StaticKnowledgeHISDTO.class);
         List<Long> conceptIdList = conceptInfoList.stream().map(i -> i.getId()).collect(Collectors.toList());
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -371,7 +372,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                 = BeanUtil.listCopyTo(conceptDetailList, StaticKnowledgeDetailDTO.class);
         Map<Long, List<StaticKnowledgeDetailDTO>> conceptMap
                 = EntityUtil.makeEntityListMap(detailList, "conceptId");
-        for (StaticKnowledgeDTO staticKnowledgeDTO : retList) {
+        for (StaticKnowledgeHISDTO staticKnowledgeDTO : retList) {
+            staticKnowledgeDTO.setHisName(staticKnowledgeHISVO.getHisName());
+            staticKnowledgeDTO.setHisName(staticKnowledgeHISVO.getHisDetailName());
             List<StaticKnowledgeDetailDTO> subDetailList = conceptMap.get(staticKnowledgeDTO.getId());
             if (ListUtil.isNotEmpty(subDetailList)) {
                 List<StaticKnowledgeDetailDTO> introduceList = subDetailList

src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -6,6 +6,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
+import com.diagbot.dto.StaticKnowledgeHISDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.facade.ConceptInfoFacade;
 import com.diagbot.vo.ChangeStatusVO;
@@ -83,8 +84,8 @@ public class ConceptInfoController {
                     "hisDetailName： HIS小项名称<br>")
     @PostMapping("/getStaticKnowledgeForHIS")
     @SysLogger("getStaticKnowledgeForHIS")
-    public RespDTO<List<StaticKnowledgeDTO>> getStaticKnowledgeForHIS(@Valid @RequestBody StaticKnowledgeHISVO staticKnowledgeHISVO) {
-        List<StaticKnowledgeDTO> data = conceptInfoFacade.getStaticKnowledgeForHIS(staticKnowledgeHISVO);
+    public RespDTO<List<StaticKnowledgeHISDTO>> getStaticKnowledgeForHIS(@Valid @RequestBody StaticKnowledgeHISVO staticKnowledgeHISVO) {
+        List<StaticKnowledgeHISDTO> data = conceptInfoFacade.getStaticKnowledgeForHIS(staticKnowledgeHISVO);
         return RespDTO.onSuc(data);
     }