Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

This commit is contained in:
LiJianZhao 2025-05-07 14:25:26 +08:00
commit 75d5734566
7 changed files with 338 additions and 205 deletions

View File

@ -31,11 +31,11 @@
<el-tooltip
class="box-item"
effect="dark"
:content="formatTime(item.createTime)||'-'"
:content="formatListTime(item.createTime)||'-'"
placement="bottom-start"
>
<span class="item_time">
{{ formatTime(item.createTime) || '-' }}
{{ formatListTime(item.createTime) || '-' }}
</span>
</el-tooltip>
<span :class="[item.status == 0 ?'status-active':'']">{{ item.status == 0 ? '未收' : '已收' }}</span>
@ -53,7 +53,7 @@
import {onMounted, ref} from "vue";
import {post} from "@/utils/request.ts";
import Panel from "@/components/common/Panel.vue";
import {formatTime} from "@/utils/dateUtils.ts";
import {formatListTime} from "@/utils/dateUtils.ts";
const curItem = ref<any>({});
const emit = defineEmits(['clickItem'])

View File

@ -1,5 +1,8 @@
<template>
<Mask :width="600" :height="500" :is-show="show" @close="show=false" :title="id?'患者编辑':'患者建档'">
<Mask :width="650" :height="580" :is-show="show" @close="show=false" :title="id?'患者编辑':'患者建档'"
:show-footer="true">
<template #default>
<el-scrollbar>
<div class="content">
<el-form
:model="ruleForm"
@ -9,10 +12,24 @@
>
<el-row>
<el-col :span="12">
<el-form-item label="号码" prop="phone">
<el-input v-model="ruleForm.phone" placeholder="输入电话号码"></el-input>
<el-form-item label="会员等级">
<el-select
v-model="ruleForm.levelId"
placeholder="等级"
size="default"
style="width: 100%"
>
<el-option
v-for="item in levelList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="name">
<el-input v-model="ruleForm.name" placeholder="输入真实姓名"></el-input>
@ -21,12 +38,48 @@
<el-col :span="12">
<el-form-item label="性别" prop="sex">
<el-radio-group v-model="ruleForm.sex">
<el-radio value="男"></el-radio>
<el-radio value="女"></el-radio>
<el-radio :value="1"></el-radio>
<el-radio :value="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年龄" prop="age">
<el-input v-model.number="ruleForm.age"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号" prop="phone">
<el-input v-model="ruleForm.phone" placeholder="输入电话号码"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证件类型" prop="certType">
<el-select
v-model="ruleForm.certType"
placeholder="证件类型"
size="default"
style="width: 100%"
>
<el-option
v-for="item in cardTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证件号" prop="certNo">
<el-input v-model="ruleForm.certNo" placeholder="证件号"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生日" prop="birthday">
@ -35,19 +88,26 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<el-input v-model="ruleForm.nation"></el-input>
<el-form-item label="民族">
<el-select
v-model="ruleForm.nation"
placeholder="民族选择"
size="default"
style="width: 100%"
>
<el-option
v-for="item in antysList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证件号码" prop="certNo">
<el-input v-model="ruleForm.certNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="来源" prop="source">
<el-form-item label="来源">
<el-select
v-model="ruleForm.source"
placeholder="来源选择"
@ -64,23 +124,33 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="地区" prop="area">
<el-form-item label="地区">
<SelectArea v-model="ruleForm.area" style="width: 100%"></SelectArea>
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-form-item label="详细地址">
<el-input v-model="ruleForm.address"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="ruleForm.remark"></el-input>
</el-form-item>
<div class="dialog-footer">
<el-form-item label="既往史">
<el-input v-model="ruleForm.beforeMedicalHistory"></el-input>
</el-form-item>
<el-form-item label="过敏史">
<el-input v-model="ruleForm.allergyHistory"></el-input>
</el-form-item>
</el-form>
</div>
</el-scrollbar>
</template>
<template #footer>
<div class="bottom">
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="submitForm">
保存
</el-button>
</div>
</el-form>
</div>
</template>
</Mask>
</template>
<script setup lang="ts">
@ -89,7 +159,10 @@ import {ElForm, ElFormItem, ElSelect, ElOption, ElRow, ElCol, ElRadioGroup, type
import SelectArea from "@/components/SelectArea.vue";
import {post} from "@/utils/request.ts";
import Mask from "@/components/common/Mask.vue";
import CloseBtn from "@/components/CloseBtn.vue";
import psnCertTypes from "@/assets/config/directory/psnCertTypes.json"
import antys from '@/assets/config/directory/antys.json'
const ruleFormRef = ref<FormInstance>()
const id = ref<any>(null)
const show = ref<boolean>(false)
@ -102,26 +175,12 @@ const close = () => {
}
// form
interface RuleForm {
exp: string
phone: string
name: string
sex: string
age: string
birthday: string
certNo: string
source: string
nation: string
area: string
address: string
remark: string
}
let ruleForm = ref<any>({
exp: 0,
phone: '',
name: '',
sex: '',
age: '',
age: null,
birthday: '',
certNo: '',
source: '',
@ -129,8 +188,13 @@ let ruleForm = ref<any>({
area: '',
address: '',
remark: '',
beforeMedicalHistory: '',
allergyHistory: '',
certType: '',
levelId: ''
})
const options = ref<any>([])
const antysList= ref<any>(Object.entries(antys).map(([id, name]) => ({id, name})))
const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
const options1 = [
{
value: '员工推荐',
@ -156,15 +220,14 @@ const options1 = [
const submitForm = async () => {
let formEl = ruleFormRef.value
if (!formEl) return
await formEl.validate((valid:any, fields:any) => {
await formEl.validate((valid: any) => {
if (valid) {
console.log(ruleForm.value)
if (ruleForm.value.id) {
post("vip/vip/update", {vipInfo:ruleForm.value}).then((res: any) => {
post("vip/vip/update", {vipInfo: ruleForm.value}).then(() => {
close()
})
} else {
post("vip/vip/create", {vipInfo:ruleForm.value}).then((res: any) => {
post("vip/vip/create", {vipInfo: ruleForm.value}).then(() => {
close()
})
}
@ -173,26 +236,30 @@ const submitForm = async () => {
})
}
const levelName = ref('')
const rules = {
exp: [
{required: true, message: '请选择患者等级', trigger: 'change'},
const rules = ref<any>({
name: [
{ required: true, message: '姓名不能为空', trigger: 'blur' }
],
phone: [
{required: true, message: '请输入手机号码', trigger: 'blur'},
],
name: [
{required: true, message: '请输入姓名', trigger: 'blur'},
{ required: true, message: '手机号不能为空', trigger: 'blur' }
],
sex: [
{required: true, message: '请选择性别', trigger: 'change'},
],
age: [
{required: true, message: '请输入年龄', trigger: 'blur'},
{ required: true, message: '性别不能为空', trigger: 'change' }
],
birthday: [
{required: true, message: '请选择生日', trigger: 'change'},
{ required: true, message: '请选择生日', trigger: 'change' }
],
}
certType: [
{ required: true, message: '请选择证件类型', trigger: 'change' }
],
certNo: [
{ required: true, message: '请输入证件号', trigger: 'blur' }
],
age: [
{ required: true, message: '年龄不能为空', trigger: 'blur'},
{ type: 'number', message: '年龄必须为数字', trigger: 'blur' }
],
})
const init = (_id: any) => {
id.value = _id
levelName.value = ''
@ -213,9 +280,10 @@ const init = (_id: any) => {
}
const levelList = ref<any>([])
const getLevelConfig = () => {
post("vip/vipLevel/list").then((res: any) => {
options.value = res
levelList.value = res
})
}
onMounted(() => {
@ -226,7 +294,6 @@ defineExpose({init})
<style scoped lang="scss">
.content {
padding: 20px;
margin-top: 30px;
}
.dialog-footer {
@ -234,4 +301,12 @@ defineExpose({init})
justify-content: flex-end;
}
.bottom {
height: 100%;
display: flex;
justify-content: flex-end;
padding: 20px;
align-items: center;
}
</style>

View File

@ -8,7 +8,7 @@
<div class="list-item-content">
<span class="disease-name">{{ item.diagnosisMedicalRecord.diagnosisSummary }}</span>
<span class="doctor">{{ item.registrationInfoVo.doctorName }}</span>
<span class="time">{{ item.createTime }}</span>
<span class="time">{{ formatListTime(item.createTime) }}</span>
</div>
</template>
<div>
@ -25,6 +25,7 @@ import Panel from '@/components/common/Panel.vue';
import DiseaseDetails from './DiseaseDetails.vue';
import {post} from "@/utils/request.ts";
import {ref} from "vue";
import {formatListTime} from "../../utils/dateUtils.ts";
const list = ref<any>([])
const init = (patientId: any) => {
post("medical/record/listByPatient",{patientId:patientId}).then((res: any) => {

View File

@ -21,17 +21,9 @@
</span>
<span class="item_name">{{ item.name }}</span>
<span>{{ item.gender }}</span>
<el-tooltip
class="box-item"
effect="dark"
:content="formatTime(item.createDatetime)||'-'"
placement="bottom-start"
>
<span class="item_time">
{{ formatTime(item.createDatetime) || '-' }}
{{ formatListTime(item.createDatetime) || '-' }}
</span>
</el-tooltip>
<span>01-01</span>
</li>
</ul>
</el-scrollbar>
@ -42,7 +34,7 @@
import {nextTick, onMounted, ref, watch} from "vue";
import Panel from "@/components/common/Panel.vue";
import {post} from "@/utils/request.ts";
import {formatTime} from "@/utils/dateUtils.ts";
import {formatListTime} from "@/utils/dateUtils.ts";
import {apiConfig} from "@/assets/config/apiConfig.ts";
import {ElMessageBox} from "element-plus";

View File

@ -18,7 +18,8 @@
<div style="font-size: 18px;font-weight: 500;color: #000">{{ itemInfo.name }}[{{ chrgitm_lv[itemInfo.chrgitmLv as keyof typeof chrgitm_lv || '-'] || '-' }}]</div>
<div>{{ item.unitPrice }}/{{item.unit }}</div>
</div>
<div>
<div style="display: flex;justify-content: space-between">
<div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-'}}</div>
<div> 医保码:{{item.itemSocialCode||'-'}}</div>
</div>
</div>

View File

@ -13,17 +13,17 @@ export const formatDate = (date: Date|string): any => {
return '-';
}
}
const year = dateDetail.getFullYear();
const month = String(dateDetail.getMonth() + 1).padStart(2, '0');
const day = String(dateDetail.getDate()).padStart(2, '0');
const hours = String(dateDetail.getHours()).padStart(2, '0');
const minutes = String(dateDetail.getMinutes()).padStart(2, '0');
const seconds = String(dateDetail.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
};
export const formatTime = (date: any) => {
export const formatListTime = (date: any) => {
let dateDetail: Date;
if (date instanceof Date) {
dateDetail = date;
@ -37,13 +37,23 @@ export const formatTime = (date: any) => {
console.error(`Invalid date type: ${typeof date}`);
return '-';
}
const year = dateDetail.getFullYear();
const month = String(dateDetail.getMonth() + 1).padStart(2, '0');
const day = String(dateDetail.getDate()).padStart(2, '0');
const hours = dateDetail.getHours();
const minutes = String(dateDetail.getMinutes()).padStart(2, '0');
const seconds = String(dateDetail.getSeconds()).padStart(2, '0');
const period = hours >= 12 ? '下午' : '上午';
const formattedHours = String(hours % 12 || 12).padStart(2, '0'); // 将24小时制转换为12小时制
const seconds = String(dateDetail.getSeconds()).padStart(2, '0');// 将24小时制转换为12小时制
//如果不是今年 返回年
if (dateDetail.getFullYear() !== new Date().getFullYear()) {
return `${year}`;
}
//如果是今天,返回时和分,如果不是今天,返回月和日
return `${period} ${formattedHours}:${minutes}:${seconds}`;
if (dateDetail.toDateString() === new Date().toDateString()) {
return `${hours}:${minutes}`;
} else {
return `${month}-${day}`;
}
}
@ -95,3 +105,4 @@ export const getDaysBetweenDates = (startDateStr: string, endDateStr: string): s
return days;
};

View File

@ -2,6 +2,7 @@
<div class="container-wrapper">
<div class="left">
<Panel title="患者列表">
<div class="panel-content" style="height: 100%;display: flex;flex-direction: column">
<div class="search">
<div class="input">
<el-input v-model="input3" style="width:100%;height: 100%" placeholder="搜索患者"
@ -15,34 +16,20 @@
</div>
<span class="btn" @click="openEdit(null)">患者建档</span>
</div>
<el-scrollbar @scroll="handleScroll" style="padding: 0 24px">
<ul class="content" style="overflow: hidden">
<div class="total">{{ totalCount || 0 }}</div>
<ul class="content">
<el-scrollbar style="padding: 24px 24px;height: 100%">
<li v-for="(item,i) in list" :key="item.id" :class="index==i?'active':''" @click="btn(item,i)">
<img class="image"
:src="'/static/images/member/' + (item.sex === '男' ? 'man' : 'women') + '.png'"
:src="'/static/images/member/' + (item.sex === 1 ? 'man' : 'women') + '.png'"
alt=""/>
<div class="name">{{ item.name || '-' }}</div>
<span class="age">{{ item.age ? item.age + '岁' : '-' }}</span>
<el-tooltip
class="box-item"
effect="dark"
:content="item.levelName"
placement="bottom-start"
>
<span class="level">{{ item.levelName || "-" }}</span>
</el-tooltip>
<el-tooltip
class="box-item"
effect="dark"
:content="item.createDatetime"
placement="bottom-start"
>
<span class="time" :class="index==i? 'time_active':''">{{ item.createDatetime || '-' }}</span>
</el-tooltip>
<span class="time">{{ formatListTime(item.lastVisitTime) }}</span>
</li>
</ul>
</el-scrollbar>
</ul>
</div>
</Panel>
</div>
<div class="right">
@ -50,14 +37,15 @@
<div class="detail">
<div class="detail-top">
<div class="detail-top-left">
<img class="image" src="/static/images/member/head.png" alt="">
<img class="image"
:src="listItem.sex==1?'/static/images/member/man.png':listItem.sex==2?'/static/images/member/women.png':'-'"
alt="">
<div class="detail-top-left-text">
<div class="detail-top-left-text-name">
<span style="margin-right: 16px">{{ listItem.name || '-' }}</span>
<el-tag type="success">{{ listItem.levelName || '-' }}</el-tag>
</div>
<div class="detail-top-left-text-phone">
<span>{{ listItem.sex || '-' }}</span>
<span class="age">{{ listItem.age ? listItem.age + '岁' : '-' }}</span>
<span>{{ listItem.phone || '-' }}</span>
</div>
@ -77,13 +65,19 @@
:column="3"
border
>
<el-descriptions-item label="出生日期">{{ listItem.birthday || "-" }}</el-descriptions-item>
<el-descriptions-item label="民族">{{ listItem.nation || "-" }}</el-descriptions-item>
<el-descriptions-item label="创建日期">{{ listItem.createDatetime || "-" }}</el-descriptions-item>
<el-descriptions-item label="身份证号码">{{ listItem.certNo || "-" }}</el-descriptions-item>
<el-descriptions-item label="积分"><span>{{ listItem.integralBalance || '-' }}</span>
<el-descriptions-item label="生日">{{ listItem.birthday || "-" }}</el-descriptions-item>
<el-descriptions-item label="民族">
{{ antysList.find((item: any) => item.id == listItem.nation)?.name || "-" }}
</el-descriptions-item>
<el-descriptions-item label="家庭地址">{{ listItem.address || "-" }}</el-descriptions-item>
<el-descriptions-item label="就诊时间">{{
formatListTime(listItem.lastVisitTime) || "-"
}}
</el-descriptions-item>
<el-descriptions-item label="证件类型"/>
<el-descriptions-item label="证件号码">{{ listItem.certNo || "-" }}</el-descriptions-item>
<el-descriptions-item label="积分"><span>{{ listItem.integralBalance }}</span>
</el-descriptions-item>
<el-descriptions-item label="地址">{{ listItem.area}}/{{ listItem.address || "-" }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ listItem.remark || "-" }}</el-descriptions-item>
</el-descriptions>
</div>
@ -161,7 +155,6 @@
<script setup lang="ts">
import {ref, onMounted, nextTick} from 'vue'
import {Search} from "@element-plus/icons-vue";
import {ElRow, ElCol, ElButton} from 'element-plus'
import {post} from "@/utils/request.ts";
import Mask from "@/components/common/Mask.vue";
import Grant from "@/components/member/memberProfile/Grant.vue";
@ -171,6 +164,9 @@ import OrderDetail from "@/components/retail/OrderDetail.vue";
import VipEdit from "@/components/member/memberProfile/VipEdit.vue";
import VipLevelEdit from "@/components/member/memberProfile/VipLevelEdit.vue";
import Panel from "@/components/common/Panel.vue";
import {formatListTime} from "@/utils/dateUtils.ts";
import antys from "@/assets/config/directory/antys.json"
import area from "@/assets/config/area.json"
const isGrant = ref(false)
@ -207,6 +203,7 @@ const openEdit = (id: any) => {
}
const list = ref<any>([]);
const totalCount = ref(0)
onMounted(() => {
init()
@ -219,6 +216,7 @@ const init = () => {
};
post("vip/vip/list", query).then((res: any) => {
list.value = res.list;
totalCount.value = res.total_count
listItem.value = res.list[0];
//
list.value.forEach((item: any) => {
@ -249,6 +247,7 @@ const closeExchange = () => {
const btn = (item: any, i: number) => {
index.value = i
listItem.value = item
listItem.value.area = findAreaName(listItem.value.area)
getChargeList(listItem.value.id)
}
//
@ -328,6 +327,32 @@ const openLevelEdit = (vip: any) => {
levelEditRef.value?.init(vip);
});
}
const antysList = ref<any>(Object.entries(antys).map(([id, name]) => ({id, name})))
//
interface Area {
name: string;
code: string;
city?: Area[];
area?: Area[];
}
//
const findAreaName = (code: string, areas: Area[]): string => {
for (const area of areas) {
if (area.code === code) {
return area.name;
}
if (area.city) {
const result = findAreaName(code, area.city);
if (result) return result;
}
if (area.area) {
const result = findAreaName(code, area.area);
if (result) return result;
}
}
return '-';
};
</script>
<style scoped lang="scss">
@use "@/assets/scss/base.scss";
@ -340,15 +365,15 @@ const openLevelEdit = (vip: any) => {
display: flex;
background: none;
padding: 0 24px;
height: 100%;
.left {
height: 100%;
width: 430px;
margin-right: 24px;
.search {
height: 66px;
height: 56px;
display: flex;
padding: 0 24px;
@ -376,6 +401,15 @@ const openLevelEdit = (vip: any) => {
}
}
.total {
margin-left: 24px;
height: 40px;
border-top: 1px solid #EBEEF5;
border-bottom: 1px solid #EBEEF5;
line-height: 40px;
margin-bottom: 10px;
}
.content {
flex: 1;
min-height: 0;
@ -391,6 +425,20 @@ const openLevelEdit = (vip: any) => {
color: #000000;
cursor: pointer;
&:first-child {
border-top-left-radius: 8px;
border-top-right-radius: 8px;
}
&:last-child {
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
&:hover {
background: rgba(#4D6DE4, 0.5);
}
.image {
width: 20px;
height: 20px;
@ -401,11 +449,6 @@ const openLevelEdit = (vip: any) => {
flex: 2;
}
.age {
flex: 1;
margin-right: 10px;
}
.level {
flex: 2;
margin-right: 20px;
@ -422,6 +465,24 @@ const openLevelEdit = (vip: any) => {
overflow: hidden;
text-overflow: ellipsis;
}
}
.active {
background: #4D6DE4;
color: #fff;
.name {
color: #fff;
}
.level {
color: #fff;
}
.time {
color: #fff;
}
}
}
}
@ -430,6 +491,7 @@ const openLevelEdit = (vip: any) => {
flex: 1;
display: flex;
flex-direction: column;
min-width: 0;
.right-top {
height: 304px;
@ -552,15 +614,6 @@ const openLevelEdit = (vip: any) => {
padding: 0;
}
.active {
color: #fff;
@include base.background-color
}
.time_active {
color: #000000 !important;
}
.col {
margin: 20px 0;