Browse Source

评估量表查询

rgb 6 years ago
parent
commit
024966215d

+ 26 - 0
icss-service/src/main/java/com/diagbot/dto/GetEvaluationScalesDTO.java

@@ -0,0 +1,26 @@
+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 GetEvaluationScalesDTO {
+	
+
+	/**
+     * 量表页面html内容
+     */
+	@ApiModelProperty(value="量表页面html内容")
+    private String htmlContent;
+	
+	
+}

+ 16 - 0
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.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
@@ -39,6 +40,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.GetEvaluationScalesVO;
 import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
@@ -340,5 +342,19 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     	List<InquiryEvaluation> inquiryEvaluationList = inquiryEvaluationFacade.getEvaluationsByInquiryId(getEvaluationsVO.getInquiryId());
         return BeanUtil.listCopyTo(inquiryEvaluationList, GetEvaluationsDTO.class);
     }
+    
+    /**
+     * 获取评估量表
+     *
+     * @param getEvaluationScalesVO
+     * @return
+     */
+    public List<GetEvaluationScalesDTO> getEvaluationScales(GetEvaluationScalesVO getEvaluationScalesVO) {
+    	QueryWrapper<InquiryScale> queryWrapper = new QueryWrapper<InquiryScale>();
+    	queryWrapper.eq("inquiry_id", getEvaluationScalesVO.getInquiryId());
+    	queryWrapper.eq("inquiry_evaluation_id", getEvaluationScalesVO.getInquiryEvaluationId());
+    	List<InquiryScale> inquiryScaleList =inquiryScaleFacade.list(queryWrapper);
+        return BeanUtil.listCopyTo(inquiryScaleList, GetEvaluationScalesDTO.class);
+    }
 
 }

+ 34 - 0
icss-service/src/main/java/com/diagbot/vo/GetEvaluationScalesVO.java

@@ -0,0 +1,34 @@
+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 GetEvaluationScalesVO {
+
+	/**
+	 * 问诊记录id
+	 */
+	@ApiModelProperty(value="问诊记录id",required=true)
+	@NotNull(message="问诊记录id必传")
+	private Long inquiryId;
+	
+    /**
+     * 问诊记录评估结果id
+     */
+	@ApiModelProperty(value="问诊记录评估结果id",required=true)
+	@NotNull(message="问诊记录评估结果id必传")
+    private Long inquiryEvaluationId;
+	
+}

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

@@ -18,10 +18,10 @@ import lombok.Setter;
 public class GetEvaluationsVO {
 
 	/**
-	 * 病历id
+	 * 问诊记录id
 	 */
-	@ApiModelProperty(value="病历id",required=true)
-	@NotNull(message="病历id必传")
+	@ApiModelProperty(value="问诊记录id",required=true)
+	@NotNull(message="问诊记录id必传")
 	private Long inquiryId;
 	
 }

+ 9 - 0
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.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
@@ -21,6 +22,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.GetEvaluationScalesVO;
 import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
@@ -86,6 +88,13 @@ public class InquiryInfoController {
     public RespDTO<List<GetEvaluationsDTO>> getEvaluations(@Valid @RequestBody GetEvaluationsVO getEvaluationsVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getEvaluations(getEvaluationsVO));
     }
+    
+    @ApiOperation(value = "获取评估量表接口[by:rengb]")
+    @PostMapping("/getEvaluationScales")
+    @SysLogger("getEvaluationScales")
+    public RespDTO<List<GetEvaluationScalesDTO>> getEvaluationScales(@Valid @RequestBody GetEvaluationScalesVO getEvaluationScalesVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.getEvaluationScales(getEvaluationScalesVO));
+    }
 
 
 }