病历回读修改

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

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import java.util.List;
 
 import com.diagbot.entity.InquiryDetail;
+import com.diagbot.entity.InquiryEvaluation;
+import com.diagbot.entity.InquiryScale;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,4 +42,16 @@ public class ReadInquiryDTO{
 	@ApiModelProperty(value="问诊记录用药明细")
 	private List<ReadInquiryDrugDTO> drugList;
 	
+	/**
+     * 问诊记录评估结果
+     */
+	@ApiModelProperty(value="问诊记录评估结果")
+	private InquiryEvaluation inquiryEvaluation;
+	
+	/**
+     * 问诊记录评估结果量表明细
+     */
+	@ApiModelProperty(value="问诊记录评估结果量表明细")
+	private List<InquiryScale> InquiryScaleList;
+	
 }

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

@@ -228,6 +228,14 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
             List<ReadInquiryDrugDTO> drugList = BeanUtil.listCopyTo(inquiryDrugList, ReadInquiryDrugDTO.class);
             readInquiryDTO.setDrugList(drugList);
+            
+            QueryWrapper<InquiryEvaluation> inquiryEvaluationQe = new QueryWrapper<>();
+            inquiryEvaluationQe.eq("inquiry_id", inquiryInfo.getId());
+            readInquiryDTO.setInquiryEvaluation(inquiryEvaluationFacade.getOne(inquiryEvaluationQe));
+            
+            QueryWrapper<InquiryScale> inquiryScaleQe = new QueryWrapper<>();
+            inquiryScaleQe.eq("inquiry_id", inquiryInfo.getId());
+            readInquiryDTO.setInquiryScaleList(inquiryScaleFacade.list(inquiryScaleQe));
         }
 
         return readInquiryDTO;