diff --git a/api/src/main/java/com/sv/api/controller/MemberHealthDocController.java b/api/src/main/java/com/sv/api/controller/MemberHealthDocController.java
new file mode 100644
index 0000000..210a07a
--- /dev/null
+++ b/api/src/main/java/com/sv/api/controller/MemberHealthDocController.java
@@ -0,0 +1,35 @@
+package com.sv.api.controller;
+
+import com.sv.service.common.MemberHealthDocService;
+import com.ydd.framework.core.common.Pagination;
+import com.ydd.framework.core.common.dto.ResponseDTO;
+import com.ydd.framework.core.controller.BaseApiController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * Controller - 用户健康报告
+ *
+ * @author limqhz
+ */
+@RestController
+public class MemberHealthDocController extends BaseApiController {
+
+ private final Logger logger = LoggerFactory.getLogger(MemberHealthDocController.class);
+
+ @Resource
+ private MemberHealthDocService memberHealthDocService;
+
+ /**
+ * 分页查询用户会员卡
+ */
+ @RequestMapping(value = "/member/health/docs", method = RequestMethod.POST)
+ public ResponseDTO findPage(Pagination pagination) {
+ return ResponseDTO.ok()
+ .setPagination(memberHealthDocService.findDocs(pagination,getMemberIdByAccessToken()));
+ }
+
+}
diff --git a/oms/oms-h5/src/views/member/health/add.vue b/oms/oms-h5/src/views/member/health/add.vue
index c321a61..db9b274 100644
--- a/oms/oms-h5/src/views/member/health/add.vue
+++ b/oms/oms-h5/src/views/member/health/add.vue
@@ -5,7 +5,7 @@
-
+
-
+
@@ -86,14 +86,14 @@ export default {
* 保存用户会员卡
*/
handleSave() {
- if (!this.form.docPath) {
- alert('请选择文件上传')
- return false
- }
this.$refs.form.validate(valid => {
if (!valid) {
return false
}
+ if (!this.form.docPath) {
+ alert('请选择文件上传')
+ return false
+ }
this.onSubmit = true
save(this.form).then(response => {
this.$router.go(-1)
diff --git a/oms/oms-h5/src/views/member/health/index.vue b/oms/oms-h5/src/views/member/health/index.vue
index 3dd7c3b..c9d9403 100644
--- a/oms/oms-h5/src/views/member/health/index.vue
+++ b/oms/oms-h5/src/views/member/health/index.vue
@@ -26,7 +26,7 @@
- {{scope.row.docType}}
+ {{scope.row.docType == '0' ? "健康报告" : "未知类型"}}
diff --git a/service/src/main/java/com/sv/mapper/HealthDocMapper.java b/service/src/main/java/com/sv/mapper/HealthDocMapper.java
index 2db21b4..aeb934f 100644
--- a/service/src/main/java/com/sv/mapper/HealthDocMapper.java
+++ b/service/src/main/java/com/sv/mapper/HealthDocMapper.java
@@ -1,6 +1,8 @@
package com.sv.mapper;
import com.sv.entity.HealthDoc;
+import org.apache.ibatis.annotations.Param;
+
import java.util.List;
public interface HealthDocMapper {
@@ -17,4 +19,6 @@ public interface HealthDocMapper {
int updateByPrimaryKey(HealthDoc record);
List findMemAll();
+
+ List findDocsByMemberId(@Param("memberId") Integer memberId);
}
diff --git a/service/src/main/java/com/sv/service/common/MemberHealthDocService.java b/service/src/main/java/com/sv/service/common/MemberHealthDocService.java
index 0ce947b..c6574d0 100644
--- a/service/src/main/java/com/sv/service/common/MemberHealthDocService.java
+++ b/service/src/main/java/com/sv/service/common/MemberHealthDocService.java
@@ -66,5 +66,18 @@ public class MemberHealthDocService extends MemberCardCommonService {
return pagination;
}
+ /**
+ * 小程序查询用户健康报告
+ * @param pagination 分页信息
+ * @return 分页结果
+ */
+ public Pagination findDocs(Pagination pagination,Integer memberId) {
+ PageHelper.startPage(pagination.getPage(), pagination.getPageSize());
+ PageHelper.orderBy("doc_date desc");
+ pagination.setQueryResult(healthDocMapper.findDocsByMemberId(memberId));
+ return pagination;
+ }
+
+
}
diff --git a/service/src/main/resources/mybatis/mapper/sv/HealthDocMapper.xml b/service/src/main/resources/mybatis/mapper/sv/HealthDocMapper.xml
index 86faf46..4120b43 100644
--- a/service/src/main/resources/mybatis/mapper/sv/HealthDocMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/HealthDocMapper.xml
@@ -34,6 +34,13 @@
where 1=1
+
+
delete from sv_health_docs
where id = #{id,jdbcType=INTEGER}
diff --git a/service/target/classes/tools/generatorConfig.xml b/service/target/classes/tools/generatorConfig.xml
new file mode 100644
index 0000000..8de40ba
--- /dev/null
+++ b/service/target/classes/tools/generatorConfig.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+