获取评估接口修改

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

@@ -0,0 +1,30 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2019/3/19 15:58
+ */
+@ApiModel(value="获取评估结果接口出参")
+@Getter
+@Setter
+public class GetEvaluationsDTO {
+	
+	/**
+     * 评估id
+     */
+	@ApiModelProperty(value="评估id")
+	private Long id;
+	
+	/**
+     * 评估页面html内容
+     */
+	@ApiModelProperty(value="评估页面html内容")
+    private String htmlContent;
+	
+}

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

@@ -1,5 +1,7 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -24,5 +26,16 @@ public class InquiryEvaluationFacade extends InquiryEvaluationServiceImpl {
         queryWrapper.eq("inquiry_id", inquiryId);
         this.remove(queryWrapper);
     }
+    
+    /**
+     * 根据问诊记录id获取评估结果
+     *
+     * @param inquiryId
+     */
+    public List<InquiryEvaluation> getEvaluationsByInquiryId(Long inquiryId) {
+        QueryWrapper<InquiryEvaluation> queryWrapper = new QueryWrapper<InquiryEvaluation>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        return this.list(queryWrapper);
+    }
 
 }

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.GetEvaluationsDTO;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -38,6 +39,7 @@ import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysVO;
@@ -327,5 +329,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         return getInquiryDetailDTO;
     }
+    
+    /**
+     * 获取评估结果
+     *
+     * @param getEvaluationsVO
+     * @return
+     */
+    public List<GetEvaluationsDTO> getEvaluations(GetEvaluationsVO getEvaluationsVO) {
+    	List<InquiryEvaluation> inquiryEvaluationList = inquiryEvaluationFacade.getEvaluationsByInquiryId(getEvaluationsVO.getInquiryId());
+        return BeanUtil.listCopyTo(inquiryEvaluationList, GetEvaluationsDTO.class);
+    }
 
 }

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

@@ -0,0 +1,27 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2019/3/19 15:58
+ */
+@ApiModel(value="获取评估结果接口传参")
+@Getter
+@Setter
+public class GetEvaluationsVO {
+
+	/**
+	 * 病历id
+	 */
+	@ApiModelProperty(value="病历id",required=true)
+	@NotNull(message="病历id必传")
+	private Long inquiryId;
+	
+}

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetEvaluationsDTO;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -20,6 +21,7 @@ import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysVO;
@@ -77,6 +79,13 @@ public class InquiryInfoController {
     public RespDTO<GetInquiryDetailDTO> getInquiryDetail(@Valid @RequestBody GetInquiryDetailVO getInquiryDetailVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getInquiryDetail(getInquiryDetailVO));
     }
+    
+    @ApiOperation(value = "获取评估结果[by:rengb]")
+    @PostMapping("/getEvaluations")
+    @SysLogger("getEvaluations")
+    public RespDTO<List<GetEvaluationsDTO>> getEvaluations(@Valid @RequestBody GetEvaluationsVO getEvaluationsVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.getEvaluations(getEvaluationsVO));
+    }
 
 
 }