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

aipt-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -7,6 +7,8 @@ import com.diagbot.entity.Concept;
 import com.diagbot.entity.Lexicon;
 import com.diagbot.entity.wrapper.ConceptWrapper;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconRSTypeEnum;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -61,8 +63,10 @@ public class ConceptFacade extends ConceptServiceImpl {
         Lexicon lexicon = lexiconFacade.getOne(lexiconQueryWrapper);
         //获取标签内容
         ConceptWrapper conceptWrapper = new ConceptWrapper();
-        conceptWrapper.setEndAge(conceptUsualVO.getAge());//年龄
         conceptWrapper.setStartId(conceptUsualVO.getDeptId());//科室概念id
+        conceptWrapper.setStartType(LexiconTypeEnum.DEPARTMENT.getKey());
+        conceptWrapper.setRelationType(LexiconRSTypeEnum.ORDER_BY.getKey());
+        conceptWrapper.setEndAge(conceptUsualVO.getAge());//年龄
         conceptWrapper.setEndSex(conceptUsualVO.getSexType());//性别
         conceptWrapper.setEndType(Integer.parseInt(lexicon.getId().toString()));//标签类型
         List<ConceptWithOrderRes> concepts = this.getConceptWithOrder(conceptWrapper);

aipt-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConceptFacade;
 import com.diagbot.vo.ConceptUsualVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/concept")
+@Api(value = "常用标签API", tags = { "知识库标准化-常用标签API" })
+@SuppressWarnings("unchecked")
 public class ConceptController {
     @Autowired
     ConceptFacade conceptFacade;

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

@@ -15,15 +15,15 @@ public class ReadInquiryDrugDTO{
 	
 	
 	/**
-     * 药品标签id
-     */
-	@ApiModelProperty(value="药品标签id")
-    private Long questionId;
+	 * 药品概念id
+	 */
+    @ApiModelProperty(value="药品概念id")
+    private Long conceptId;
 
     /**
-     * 药品标签名
+     * 药品概念名称
      */
-	@ApiModelProperty(value="药品标签名")
-    private String tagName;
+    @ApiModelProperty(value="药品概念名称")
+    private String conceptName;
 	
 }

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

@@ -217,7 +217,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         InquiryInfo inquiryInfo = this.getOne(queryWrapper);
 
         if (inquiryInfo != null) {
-            readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
+            //readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
             BeanUtil.copyProperties(inquiryInfo, readInquiryDTO);
 
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();