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

icss-service/src/main/java/com/diagbot/dto/IntroduceDTO.java

@@ -1,20 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.entity.IntroduceInfo;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/16 10:32
- */
-@Getter
-@Setter
-public class IntroduceDTO extends IntroduceInfo {
-    private List<IntroduceDetail> introduceDetailList;
-    private String tagName;
-}

icss-service/src/main/java/com/diagbot/dto/IntroduceDetailDTO.java

@@ -1,16 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/21 14:13
- */
-@Getter
-@Setter
-public class IntroduceDetailDTO {
-    private String content;
-    private String text;
-}

icss-service/src/main/java/com/diagbot/dto/TreatmentDTO.java

@@ -1,17 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/17 13:33
- */
-@Getter
-@Setter
-public class TreatmentDTO {
-    private Map<String,Object> map;
-}

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

@@ -2,7 +2,6 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.ResponseData;
@@ -59,10 +58,6 @@ public class PushFacade {
     @Autowired
     private LisMappingFacade lisMappingFacade;
     @Autowired
-    private DisTypeFacade disTypeFacade;
-    @Autowired
-    private TranServiceClient tranServiceClient;
-    @Autowired
     private AiptServiceClient aiptServiceClient;
     @Autowired
     private AssembleFacade assembleFacade;
@@ -230,45 +225,6 @@ public class PushFacade {
         return data;
     }
 
-
-    /**
-     * 获取返回结果标签
-     *
-     * @param nameList
-     * @param pushVO
-     * @param type
-     * @return
-     */
-    public List<QuestionDTO> getTagList(List<String> nameList, PushVO pushVO, Integer type) {
-        List<QuestionDTO> questionDTOList = Lists.newLinkedList();
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                in("tag_name", nameList).
-                eq("type", type);
-        List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-        Map<String, QuestionInfo> questionMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
-        for (String name : nameList) {
-            QuestionDTO questionDTO = new QuestionDTO();
-            if (questionMap.get(name) != null) {
-                QuestionVO questionVO = new QuestionVO();
-                questionVO.setAge(pushVO.getAge());
-                questionVO.setSexType(pushVO.getSex());
-                questionVO.setId(questionMap.get(name).getId());
-                questionDTO = questionFacade.getById(questionVO);
-                if (questionDTO == null || questionDTO.getId() == null) {
-                    questionDTO = new QuestionDTO();
-                    questionDTO.setTagName(name);
-                    questionDTO.setName(name);
-                }
-            } else {
-                questionDTO.setTagName(name);
-                questionDTO.setName(name);
-            }
-            questionDTOList.add(questionDTO);
-        }
-        return questionDTOList;
-    }
-
     /**
      * 推理接口-快易检
      *

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

@@ -1,41 +1,23 @@
 package com.diagbot.facade;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.bean.AdverseReaction;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.DisTypeVO;
 import com.diagbot.client.bean.Medicition;
-import com.diagbot.client.bean.MedicitionClass;
-import com.diagbot.dto.IntroduceDetailDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.InquiryDrug;
 import com.diagbot.entity.InquiryInfo;
-import com.diagbot.entity.IntroduceDetail;
-import com.diagbot.entity.IntroduceMap;
-import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.DisTypeEnum;
-import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.FastJsonUtils;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.google.common.collect.Lists;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -47,12 +29,6 @@ public class TreatmentFacade {
     @Autowired
     QuestionFacade questionFacade;
     @Autowired
-    IntroduceDetailFacade introduceDetailFacade;
-    @Autowired
-    IntroduceMapFacade introduceMapFacade;
-    @Autowired
-    DisTypeFacade disTypeFacade;
-    @Autowired
     InquiryInfoFacade inquiryInfoFacade;
     @Autowired
     InquiryDrugFacade inquiryDrugFacade;

icss-service/src/main/java/com/diagbot/vo/IntroduceByQuestionVO.java

@@ -1,23 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:通过标签获取提示信息入参
- * @Author:zhaops
- * @time: 2018/11/16 10:29
- */
-@Getter
-@Setter
-public class IntroduceByQuestionVO {
-    private Long questionId;
-    private String tagName;
-    @NotNull(message = "请输入标签类型")
-    private Integer type;
-    @NotNull(message = "请输入展示位置")
-    private Integer position;
-}

icss-service/src/main/java/com/diagbot/vo/LisKYJVO.java

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/26 17:04
- */
-@Getter
-@Setter
-public class LisKYJVO {
-    private String name;//名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String multipleState;//定量状态 0-正常 1-升高 2-降低
-    private Double multipleValue;//倍数
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-}

icss-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,12 +1,8 @@
 package com.diagbot.vo;
 
-import com.diagbot.client.bean.AdverseReaction;
-import com.diagbot.client.bean.IndicationResult;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author:zhaops

icss-service/src/main/java/com/diagbot/web/TreatmentController.java

@@ -1,46 +0,0 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.TreatmentDTO;
-import com.diagbot.facade.TreatmentFacade;
-import com.diagbot.vo.TreatmentVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * @Description:治疗方案相关接口
- * @Author:zhaops
- * @time: 2018/12/17 11:42
- */
-@RestController
-@RequestMapping("/treatment")
-@Api(value = "治疗方案相关API", tags = { "治疗方案相关API" })
-@SuppressWarnings("unchecked")
-public class TreatmentController {
-    @Autowired
-    TreatmentFacade treatmentFacade;
-
-    @ApiOperation(value = "治疗方案[by:zhaops]",
-            notes = "symptom：症状<br>" +
-                    "other：其它史<br>" +
-                    "vital：查体<br>" +
-                    "lis：化验<br>" +
-                    "pacs：辅检<br>" +
-                    "dis：诊断<br>")
-    @PostMapping("/getTreatment")
-    @SysLogger("getTreatment")
-    @ApiIgnore
-    public RespDTO<TreatmentDTO> getTreatment(@RequestBody @Valid TreatmentVO treatmentVO) {
-        //TreatmentDTO data = treatmentFacade.getTreatment(treatmentVO);
-        return RespDTO.onSuc(null);
-    }
-}