Commit f8bc49ef authored by weishengfei's avatar weishengfei

feat(obstetric): 修改报告单功能

- 新增修改报告单接口 getDeleteReportImg
- 优化报告单列表获取逻辑,增加 babyId 参数
- 完善个人信息获取和传递,用于报告单相关功能
- 修复生产日历和详情页面的信息获取逻辑
- 优化产检提醒页面的提醒按钮显示逻辑
parent b8b21020
...@@ -58,10 +58,16 @@ export const getAdd = (data) => api.post('/c/maternityCheckup/add',data); ...@@ -58,10 +58,16 @@ export const getAdd = (data) => api.post('/c/maternityCheckup/add',data);
* @returns * @returns
*/ */
export const getReportList = () => api.get('/c/maternityCheckup/reportList'); export const getReportList = (data) => api.get('/c/maternityCheckup/reportList', data);
/** /**
* 保存订阅消息 * 保存订阅消息
* @returns * @returns
*/ */
export const getWxNotification = (data) => api.post('/c/wxNotification/save',data); export const getWxNotification = (data) => api.post('/c/wxNotification/save',data);
\ No newline at end of file
/**
* 修改报告单
* @returns
*/
export const getDeleteReportImg = (data) => api.post('/c/maternityCheckup/deleteReportImg',data);
\ No newline at end of file
...@@ -137,6 +137,7 @@ import { onLoad } from '@dcloudio/uni-app' ...@@ -137,6 +137,7 @@ import { onLoad } from '@dcloudio/uni-app'
import { import {
uploadImage uploadImage
} from "../../api/common.js"; } from "../../api/common.js";
import { import {
getAdd, getAdd,
getExaminationItems getExaminationItems
...@@ -144,6 +145,11 @@ import { ...@@ -144,6 +145,11 @@ import {
// 导入日期选择器组件 // 导入日期选择器组件
import DatePicker from '@/components/DatePicker.vue' import DatePicker from '@/components/DatePicker.vue'
import { useUserStore } from "@/stores/user";
// 获取用户信息
const userStore = useUserStore();
const babyId = ref(userStore.babyInfo?.content?.id)
// 默认产检时间 // 默认产检时间
const time = ref(''); const time = ref('');
...@@ -334,7 +340,8 @@ const onSave = throttleTap( async () => { ...@@ -334,7 +340,8 @@ const onSave = throttleTap( async () => {
const param = { const param = {
checkupDate: time.value, checkupDate: time.value,
checkupItems: ids, checkupItems: ids,
reportImages: bgdImgList.value reportImages: bgdImgList.value,
babyId: babyId.value
} }
console.log(param, '新增产检保存参数') console.log(param, '新增产检保存参数')
showLoading(); showLoading();
......
...@@ -95,6 +95,11 @@ import { ...@@ -95,6 +95,11 @@ import {
getDelete getDelete
} from '../../api/obstetric.js'; } from '../../api/obstetric.js';
import md from '../../md'; import md from '../../md';
import { useUserStore } from "@/stores/user";
// 获取用户信息
const userStore = useUserStore();
const babyId = ref(userStore.babyInfo?.content?.id)
// 控制查看更多图片 // 控制查看更多图片
const showMore = ref(false) const showMore = ref(false)
...@@ -166,7 +171,7 @@ const getDeleteFn = async (id) => { ...@@ -166,7 +171,7 @@ const getDeleteFn = async (id) => {
} }
// 获取报告单 // 获取报告单
const getReportListFn = async () => { const getReportListFn = async () => {
const { code, message, data, success } = await getReportList() const { code, message, data, success } = await getReportList({babyId: babyId.value})
console.log('报告单列表', code, message, data, success) console.log('报告单列表', code, message, data, success)
if (success) { if (success) {
listData.value = data listData.value = data
......
...@@ -107,6 +107,7 @@ import { ...@@ -107,6 +107,7 @@ import {
throttleTap throttleTap
} from '@/utils/index.js'; } from '@/utils/index.js';
import md from '../../md'; import md from '../../md';
import { useUserStore } from "@/stores/user";
import { import {
getInfo, getInfo,
getUpdate, getUpdate,
...@@ -118,6 +119,10 @@ const { ...@@ -118,6 +119,10 @@ const {
proxy proxy
} = getCurrentInstance(); } = getCurrentInstance();
const $baseUrl = proxy.$baseUrl; const $baseUrl = proxy.$baseUrl;
const userStore = useUserStore();
const babyId = ref(userStore.babyInfo?.content?.id)
const back_btn = ref('') const back_btn = ref('')
// 时间弹窗控制 // 时间弹窗控制
...@@ -270,7 +275,7 @@ const onEditTime = async () => { ...@@ -270,7 +275,7 @@ const onEditTime = async () => {
// 获取信息接口 // 获取信息接口
const getInfoFn = async () => { const getInfoFn = async () => {
// 获取信息 // 获取信息
const { code, success, message, data } = await getInfo() const { code, success, message, data } = await getInfo({babyId: babyId.value})
console.log('产检提醒首页获取信息', code, success, message, data) console.log('产检提醒首页获取信息', code, success, message, data)
if (success) { if (success) {
homeInfo.value = data homeInfo.value = data
......
...@@ -406,7 +406,7 @@ const onDetails = (item) => { ...@@ -406,7 +406,7 @@ const onDetails = (item) => {
const getInfoFn = async () => { const getInfoFn = async () => {
// 获取信息 // 获取信息
const {code,success, message, data } = await getInfo() const {code,success, message, data } = await getInfo({babyId: babyInfo.value?.content?.id})
console.log('日历页面获取信息', code, success, message, data) console.log('日历页面获取信息', code, success, message, data)
if (success) { if (success) {
// 保留 data 里面 checkupList 里面 status 等于 completed 的数据 // 保留 data 里面 checkupList 里面 status 等于 completed 的数据
......
...@@ -27,9 +27,10 @@ ...@@ -27,9 +27,10 @@
<image v-else :src="`${$baseUrl}chanjianTool/1001/icon25.png`"></image> <image v-else :src="`${$baseUrl}chanjianTool/1001/icon25.png`"></image>
完成检查 完成检查
</view> </view>
<view class="r-remind" @click="onRemind"> <!-- 提醒按钮 -->
<!-- <view class="r-remind" @click="onRemind">
<image :src="`${$baseUrl}chanjianTool/1001/icon26.png`"></image> <image :src="`${$baseUrl}chanjianTool/1001/icon26.png`"></image>
</view> </view> -->
</view> </view>
</view> </view>
...@@ -168,7 +169,8 @@ import { uploadImage } from '../../api/common.js' ...@@ -168,7 +169,8 @@ import { uploadImage } from '../../api/common.js'
import { import {
getDetail, getDetail,
getUpdate, getUpdate,
getWxNotification getWxNotification,
getDeleteReportImg
} from '../../api/obstetric.js'; } from '../../api/obstetric.js';
// 提醒选择器相关状态 // 提醒选择器相关状态
...@@ -341,9 +343,9 @@ const onImageDel = (id) => { ...@@ -341,9 +343,9 @@ const onImageDel = (id) => {
// 直接保存 // 直接保存
const params = { const params = {
id: editId.value, id: editId.value,
reportImages: bgdImgList.value keepImages: bgdImgList.value
} }
onEditTime(params) getDeleteReportImgFn(params)
} }
// 上传图片 // 上传图片
const onUpload = throttleTap(() => { const onUpload = throttleTap(() => {
...@@ -521,6 +523,20 @@ const onEditTime = async (params) => { ...@@ -521,6 +523,20 @@ const onEditTime = async (params) => {
}) })
} }
} }
// 修改报告单
const getDeleteReportImgFn = async (params) => {
console.log(params)
const { code, success, message } = await getDeleteReportImg(params)
if (success) {
// 重新获取信息
getDetailFn(editId.value)
} else {
uni.showToast({
title: message,
icon: 'none'
})
}
}
// 获取详情接口 // 获取详情接口
const getDetailFn = async (id) => { const getDetailFn = async (id) => {
// 获取信息 // 获取信息
......
...@@ -271,7 +271,7 @@ const handleToolClick = async (item) => { ...@@ -271,7 +271,7 @@ const handleToolClick = async (item) => {
}); });
// 跳转产检提醒页面判断 // 跳转产检提醒页面判断
const listData = userStore.babyInfo.allBabyBaseInfo || [] let listData = userStore.babyInfo.allBabyBaseInfo || []
if (item.title === "医生问诊") { if (item.title === "医生问诊") {
if (!cfgStatus.value.isRegister) return; if (!cfgStatus.value.isRegister) return;
...@@ -306,7 +306,7 @@ const handleToolClick = async (item) => { ...@@ -306,7 +306,7 @@ const handleToolClick = async (item) => {
}); });
} else if(item.title === "产检提醒"){ } else if(item.title === "产检提醒"){
if(listData.length > 0){ if(listData.length > 0){
const hasPregnancy = listData.some(item => item.typeName === "孕中") const hasPregnancy = listData.some(item => item.typeName === "孕中" && item.selected === true )
console.log(hasPregnancy, 'hasPregnancy') console.log(hasPregnancy, 'hasPregnancy')
if(hasPregnancy){ if(hasPregnancy){
jump({ type: item.link.type, url: item.link.url}); jump({ type: item.link.type, url: item.link.url});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment