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

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<>();