diff --git a/antis-ncc-admin/package-lock.json b/antis-ncc-admin/package-lock.json
index 1d46d6e..801aa4d 100644
--- a/antis-ncc-admin/package-lock.json
+++ b/antis-ncc-admin/package-lock.json
@@ -21699,7 +21699,7 @@
     },
     "node_modules/xlsx": {
       "version": "0.18.5",
-      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
       "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
       "dependencies": {
         "adler-32": "~1.3.0",
@@ -39759,7 +39759,7 @@
     },
     "xlsx": {
       "version": "0.18.5",
-      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
       "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
       "requires": {
         "adler-32": "~1.3.0",
diff --git a/antis-ncc-admin/src/views/lqHytkHytk/Form.vue b/antis-ncc-admin/src/views/lqHytkHytk/Form.vue
index c37b62d..7c06a38 100644
--- a/antis-ncc-admin/src/views/lqHytkHytk/Form.vue
+++ b/antis-ncc-admin/src/views/lqHytkHytk/Form.vue
@@ -1,104 +1,119 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="90%">
-		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
-					<el-col :span="8" v-if="false" >
-						<el-form-item label="退卡编号" prop="id">
-							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item label="门店" prop="md" required>
-							<el-select v-model="dataForm.md" placeholder="请选择" clearable :style='{"width":"100%"}' filterable @change="handleMdChange">
-								<el-option v-for="(item, index) in mdOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
+	<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="90%">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
+				:disabled="!!isDetail" :rules="rules">
+				<el-col :span="8" v-if="false">
+					<el-form-item label="退卡编号" prop="id">
+						<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="门店" prop="md" required>
+						<el-select v-model="dataForm.md" placeholder="请选择" clearable :style='{ "width": "100%" }'
+							filterable @change="handleMdChange">
+							<el-option v-for="(item, index) in mdOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
 					<el-form-item label="退卡时间" prop="tksj">
-						<el-date-picker v-model="dataForm.tksj" placeholder="请选择" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+						<el-date-picker v-model="dataForm.tksj" placeholder="请选择" clearable :style='{ "width": "100%" }'
+							type='date' format="yyyy-MM-dd" value-format="timestamp">
 						</el-date-picker>
 					</el-form-item>
 				</el-col>
-					<el-col :span="8" v-if="false">
-						<el-form-item label="门店编号" prop="mdbh">
-							<el-input v-model="dataForm.mdbh" placeholder="自动填充" clearable readonly :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8" v-if="false">
-						<el-form-item label="门店名称" prop="mdmc">
-							<el-input v-model="dataForm.mdmc" placeholder="自动填充" clearable readonly :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item label="会员" prop="hy" required>
-							<el-select v-model="dataForm.hy" placeholder="请选择" clearable :style='{"width":"100%"}' filterable @change="handleHyChange">
-								<el-option v-for="(item, index) in hyOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8" v-if="false">
-						<el-form-item label="会员姓名" prop="hymc">
-							<el-input v-model="dataForm.hymc" placeholder="自动填充" clearable readonly :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8" v-if="false">
-						<el-form-item label="会员账号" prop="hyzh">
-							<el-input v-model="dataForm.hyzh" placeholder="自动填充" clearable readonly :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item label="退款金额" prop="tkje">
-							<el-input v-model="dataForm.tkje" placeholder="自动计算" clearable readonly :style='{"width":"100%"}'>
-								<template slot="append">元</template>
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item label="手工费用" prop="sgfy">
-							<el-input v-model="dataForm.sgfy" placeholder="自动计算" clearable readonly :style='{"width":"100%"}'>
-								<template slot="append">元</template>
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="16"></el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="退卡品项" prop="tkpx">
-							<el-input v-model="dataForm.tkpx" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="dataForm.hy && pxOptions.length > 0">
-						<el-form-item label="会员剩余品项" label-width="100px">
-							<div class="member-remaining-items">
-								<div class="remaining-items-header">
-									<span class="items-title">会员剩余品项列表 ({{ pxOptions.length }} 个)</span>
-								</div>
-								<div class="remaining-items-list">
-									<div v-for="(item, index) in pxOptions" :key="index" class="remaining-item-row" :class="{ 'disabled': item.RemainingCount <= 0 }">
-										<div class="item-name">{{ item.fullName }}</div>
-										<div class="item-price">¥{{ item.ItemPrice || 0 }}</div>
-										<div class="item-quantity" :class="{ 'zero': item.RemainingCount <= 0 }">
-											剩余: {{ item.RemainingCount || 0 }}
-										</div>
-										<div class="item-source">{{ item.sourceType || '购买' }}</div>
+				<el-col :span="8" v-if="false">
+					<el-form-item label="门店编号" prop="mdbh">
+						<el-input v-model="dataForm.mdbh" placeholder="自动填充" clearable readonly
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8" v-if="false">
+					<el-form-item label="门店名称" prop="mdmc">
+						<el-input v-model="dataForm.mdmc" placeholder="自动填充" clearable readonly
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="会员" prop="hy" required>
+						<el-select v-model="dataForm.hy" placeholder="请选择" clearable :style='{ "width": "100%" }'
+							filterable @change="handleHyChange">
+							<el-option v-for="(item, index) in hyOptions" :key="index" :label="item.fullName"
+								:value="item.id"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8" v-if="false">
+					<el-form-item label="会员姓名" prop="hymc">
+						<el-input v-model="dataForm.hymc" placeholder="自动填充" clearable readonly
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8" v-if="false">
+					<el-form-item label="会员账号" prop="hyzh">
+						<el-input v-model="dataForm.hyzh" placeholder="自动填充" clearable readonly
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="退款金额" prop="tkje">
+						<el-input v-model="dataForm.tkje" placeholder="自动计算" clearable readonly
+							:style='{ "width": "100%" }'>
+							<template slot="append">元</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="手工费用" prop="sgfy">
+						<el-input v-model="dataForm.sgfy" placeholder="自动计算" clearable readonly
+							:style='{ "width": "100%" }'>
+							<template slot="append">元</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="16"></el-col>
+				<el-col :span="24" v-if="false">
+					<el-form-item label="退卡品项" prop="tkpx">
+						<el-input v-model="dataForm.tkpx" placeholder="请输入" clearable :style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="dataForm.hy && pxOptions.length > 0">
+					<el-form-item label="会员剩余品项" label-width="100px">
+						<div class="member-remaining-items">
+							<div class="remaining-items-header">
+								<span class="items-title">会员剩余品项列表 ({{ pxOptions.length }} 个)</span>
+							</div>
+							<div class="remaining-items-list">
+								<div v-for="(item, index) in pxOptions" :key="index" class="remaining-item-row"
+									:class="{ 'disabled': item.RemainingCount <= 0 }">
+									<div class="item-name">{{ item.fullName }}</div>
+									<div class="item-price">¥{{ item.ItemPrice || 0 }}</div>
+									<div class="item-quantity" :class="{ 'zero': item.RemainingCount <= 0 }">
+										剩余: {{ item.RemainingCount || 0 }}
 									</div>
+									<div class="item-source">{{ item.sourceType || '购买' }}</div>
 								</div>
 							</div>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
+						</div>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
 					<el-form-item label-width="0">
 						<div class="table-header">
 							<span class="table-title">品项明细</span>
-							<el-button v-if="!dataForm.id" type="warning" size="mini" icon="el-icon-plus" @click="addHandleLqXhPxmxEntityList()">新增品项</el-button>
+							<el-button v-if="!dataForm.id" type="warning" size="mini" icon="el-icon-plus"
+								@click="addHandleLqXhPxmxEntityList()">新增品项</el-button>
 						</div>
-						
+
 						<!-- 品项列表 -->
 						<div class="px-list-container">
 							<div v-for="(px, pxIndex) in dataForm.lqHytkMxList" :key="pxIndex" class="px-item">
@@ -106,16 +121,20 @@
 								<div class="px-basic-info">
 									<div class="px-item-header">
 										<span class="px-item-title">品项明细</span>
-										<el-button v-if="!dataForm.id"size="mini" type="danger" icon="el-icon-delete" @click="handleDelLqXhPxmxEntityList(pxIndex)">删除</el-button>
+										<el-button v-if="!dataForm.id" size="mini" type="danger" icon="el-icon-delete"
+											@click="handleDelLqXhPxmxEntityList(pxIndex)">删除</el-button>
 									</div>
-									
+
 									<!-- 品项选择 -->
 									<div class="px-select-row">
-										<el-select v-model="px.pxid" placeholder="请选择品项" clearable filterable @change="handlePxChange(pxIndex, px)" style="width: 200px;">
-											<el-option v-for="(item, index) in pxOptions" :key="index" :label="item.fullName+'(剩余: '+(item.RemainingCount || 0)+',类型：'+item.sourceType+')'" :value="item.pxid" :disabled="item.disabled"></el-option>
+										<el-select v-model="px.pxid" placeholder="请选择品项" clearable filterable
+											@change="handlePxChange(pxIndex, px)" style="width: 200px;">
+											<el-option v-for="(item, index) in pxOptions" :key="index"
+												:label="item.fullName + '(剩余: ' + (item.RemainingCount || 0) + ',类型：' + item.sourceType + ')'"
+												:value="item.pxid" :disabled="item.disabled"></el-option>
 										</el-select>
 									</div>
-									
+
 									<!-- 品项详细信息 -->
 									<div class="px-detail-info" v-if="px.px">
 										<div class="px-detail-row">
@@ -149,13 +168,17 @@
 											</div>
 											<div class="px-detail-item">
 												<span class="px-detail-label">总业绩：</span>
-												<span class="px-detail-value">{{ (px.projectNumber || 1) * (px.pxjg || 0) }}</span>
+												<span class="px-detail-value">{{ (px.projectNumber || 1) * (px.pxjg ||
+													0) }}</span>
 											</div>
 										</div>
-										
+
 										<!-- 消费数量输入 -->
 										<div class="px-consumption-row">
-											<el-input-number v-model="px.projectNumber" :min="1" :max="getRemainingCount(px)" placeholder="消费数量" size="mini" style="width: 120px;" @change="onPxProjectNumberChange(pxIndex, $event)"></el-input-number>
+											<el-input-number v-model="px.projectNumber" :min="1"
+												:max="getRemainingCount(px)" placeholder="消费数量" size="mini"
+												style="width: 120px;"
+												@change="onPxProjectNumberChange(pxIndex, $event)"></el-input-number>
 										</div>
 									</div>
 								</div>
@@ -164,36 +187,48 @@
 								<div class="px-staff-section">
 									<div class="px-staff-header">
 										<span class="px-staff-title">健康师业绩</span>
-										<el-button v-if="!dataForm.id" size="mini" type="success" icon="el-icon-plus" @click="addPxJks(pxIndex)">添加健康师</el-button>
+										<el-button v-if="!dataForm.id" size="mini" type="success" icon="el-icon-plus"
+											@click="addPxJks(pxIndex)">添加健康师</el-button>
 									</div>
 									<div class="px-staff-list">
-										<div v-for="(jks, jksIndex) in px.lqHytkJksyjList" :key="jksIndex" class="px-staff-row">
+										<div v-for="(jks, jksIndex) in px.lqHytkJksyjList" :key="jksIndex"
+											class="px-staff-row">
 											<div class="px-staff-item">
 												<div class="px-staff-fields">
 													<div class="px-staff-field">
 														<label>健康师</label>
-														<el-select v-model="jks.jks" placeholder="选择健康师" clearable filterable size="mini" style="width: 200px;" @change="handleJksChange(pxIndex, jksIndex, jks)">
-															<el-option v-for="(item, index) in jksOptions" :key="index" :label="item.fullName" :value="item.id"></el-option>
+														<el-select v-model="jks.jks" placeholder="选择健康师" clearable
+															filterable size="mini" style="width: 200px;"
+															@change="handleJksChange(pxIndex, jksIndex, jks)">
+															<el-option v-for="(item, index) in jksOptions" :key="index"
+																:label="item.fullName" :value="item.id"></el-option>
 														</el-select>
 													</div>
 													<div class="px-staff-field">
 														<label>业绩</label>
-														<el-input v-model="jks.jksyj" placeholder="请输入业绩" size="mini" style="width: 120px;" @input="formatPxStaffNumber(pxIndex, jksIndex, 'jksyj', 'lqHytkJksyjList')">
+														<el-input v-model="jks.jksyj" placeholder="请输入业绩" size="mini"
+															style="width: 120px;"
+															@input="formatPxStaffNumber(pxIndex, jksIndex, 'jksyj', 'lqHytkJksyjList')">
 															<template slot="append">元</template>
 														</el-input>
 													</div>
 													<div class="px-staff-field" v-show="false">
 														<label>手工费</label>
-														<el-input v-model="jks.laborCost" placeholder="手工费" size="mini" style="width: 120px;" @input="formatPxStaffNumber(pxIndex, jksIndex, 'laborCost', 'lqHytkJksyjList')">
+														<el-input v-model="jks.laborCost" placeholder="手工费" size="mini"
+															style="width: 120px;"
+															@input="formatPxStaffNumber(pxIndex, jksIndex, 'laborCost', 'lqHytkJksyjList')">
 															<template slot="append">元</template>
 														</el-input>
 													</div>
 													<div class="px-staff-field">
 														<label>次数</label>
-														<el-input-number v-model="jks.kdpxNumber" :min="1" :max="999" placeholder="次数" size="mini" style="width: 120px;" @change="onJksNumberChange(pxIndex, jksIndex, $event)"></el-input-number>
+														<el-input-number v-model="jks.kdpxNumber" :min="1" :max="999"
+															placeholder="次数" size="mini" style="width: 120px;"
+															@change="onJksNumberChange(pxIndex, jksIndex, $event)"></el-input-number>
 													</div>
 													<div class="px-staff-field" v-if="!dataForm.id">
-														<el-button size="mini" type="danger" icon="el-icon-delete" @click="removePxJks(pxIndex, jksIndex)">删除</el-button>
+														<el-button size="mini" type="danger" icon="el-icon-delete"
+															@click="removePxJks(pxIndex, jksIndex)">删除</el-button>
 													</div>
 												</div>
 											</div>
@@ -202,46 +237,60 @@
 								</div>
 
 								<!-- 科技部老师业绩区域 - 仅当品项类型为科美时显示 -->
-								<div class="px-staff-section" v-if="px.qt2 === '科美'" :key="'kjb-' + pxIndex + '-' + px.qt2">
+								<div class="px-staff-section" v-if="px.qt2 === '科美'"
+									:key="'kjb-' + pxIndex + '-' + px.qt2">
 									<div class="px-staff-header">
 										<span class="px-staff-title">科技部老师业绩</span>
-										<el-button v-if="!dataForm.id" size="mini" type="success" icon="el-icon-plus" @click="addPxKjb(pxIndex)">添加科技部老师</el-button>
+										<el-button v-if="!dataForm.id" size="mini" type="success" icon="el-icon-plus"
+											@click="addPxKjb(pxIndex)">添加科技部老师</el-button>
 									</div>
 									<div class="px-staff-list">
-										<div v-for="(kjb, kjbIndex) in px.lqHytkKjbsyjList" :key="kjbIndex" class="px-staff-row">
+										<div v-for="(kjb, kjbIndex) in px.lqHytkKjbsyjList" :key="kjbIndex"
+											class="px-staff-row">
 											<div class="px-staff-item">
 												<div class="px-staff-fields">
 													<div class="px-staff-field">
 														<label>科技部老师</label>
-														<el-select v-model="kjb.kjbls" placeholder="选择科技部老师" clearable filterable size="mini" style="width: 200px;" @change="handleKjbChange(pxIndex, kjbIndex, kjb)">
-															<el-option v-for="(item, index) in kjbOptions" :key="index" :label="item.fullName" :value="item.id"></el-option>
+														<el-select v-model="kjb.kjbls" placeholder="选择科技部老师" clearable
+															filterable size="mini" style="width: 200px;"
+															@change="handleKjbChange(pxIndex, kjbIndex, kjb)">
+															<el-option v-for="(item, index) in kjbOptions" :key="index"
+																:label="item.fullName" :value="item.id"></el-option>
 														</el-select>
 													</div>
 													<div class="px-staff-field">
 														<label>业绩</label>
-														<el-input v-model="kjb.kjblsyj" placeholder="请输入业绩" size="mini" style="width: 120px;" @input="formatPxStaffNumber(pxIndex, kjbIndex, 'kjblsyj', 'lqHytkKjbsyjList')">
+														<el-input v-model="kjb.kjblsyj" placeholder="请输入业绩" size="mini"
+															style="width: 120px;"
+															@input="formatPxStaffNumber(pxIndex, kjbIndex, 'kjblsyj', 'lqHytkKjbsyjList')">
 															<template slot="append">元</template>
 														</el-input>
 													</div>
-													<div class="px-staff-field" v-show="false" style="justify-content: space-around;padding-bottom: 30rpx;">
+													<div class="px-staff-field" v-show="false"
+														style="justify-content: space-around;padding-bottom: 30rpx;">
 														<label>手工费</label>
-														<el-input v-model="kjb.laborCost" placeholder="手工费" size="mini" style="width: 120px;" @input="formatPxStaffNumber(pxIndex, kjbIndex, 'laborCost', 'lqHytkKjbsyjList')">
+														<el-input v-model="kjb.laborCost" placeholder="手工费" size="mini"
+															style="width: 120px;"
+															@input="formatPxStaffNumber(pxIndex, kjbIndex, 'laborCost', 'lqHytkKjbsyjList')">
 															<template slot="append">元</template>
 														</el-input>
 													</div>
 													<div class="px-staff-field">
 														<label>次数</label>
-														<el-input-number v-model="kjb.hdpxNumber" :min="1" :max="999" placeholder="次数" size="mini" style="width: 120px;" @change="onKjbNumberChange(pxIndex, kjbIndex, $event)"></el-input-number>
+														<el-input-number v-model="kjb.hdpxNumber" :min="1" :max="999"
+															placeholder="次数" size="mini" style="width: 120px;"
+															@change="onKjbNumberChange(pxIndex, kjbIndex, $event)"></el-input-number>
 													</div>
 													<div class="px-staff-field" v-if="!dataForm.id">
-														<el-button size="mini" type="danger" icon="el-icon-delete" @click="removePxKjb(pxIndex, kjbIndex)">删除</el-button>
+														<el-button size="mini" type="danger" icon="el-icon-delete"
+															@click="removePxKjb(pxIndex, kjbIndex)">删除</el-button>
 													</div>
 												</div>
 											</div>
 										</div>
 									</div>
 								</div>
-								
+
 								<!-- 非科美品项提示 -->
 								<div class="px-staff-section" v-if="px.qt2 && px.qt2 !== '科美'">
 									<div class="px-staff-header">
@@ -257,18 +306,19 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-						<el-form-item label="备注" prop="bz">
-							<el-input v-model="dataForm.bz" placeholder="请输入" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="上传文件" prop="fileUrl">
-							<NCC-UploadImg v-model="dataForm.fileUrl" :fileSize="30" sizeUnit="MB" :limit="9" >
-							</NCC-UploadImg>
-						</el-form-item>
-					</el-col>
-				</el-form>
+					<el-form-item label="备注" prop="bz">
+						<el-input v-model="dataForm.bz" placeholder="请输入" show-word-limit :style='{ "width": "100%" }'
+							type='textarea' :autosize='{ "minRows": 4, "maxRows": 4 }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="上传文件" prop="fileUrl">
+						<NCC-UploadImg v-model="dataForm.fileUrl" :fileSize="30" sizeUnit="MB" :limit="9">
+						</NCC-UploadImg>
+					</el-form-item>
+				</el-col>
+			</el-form>
 		</el-row>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="visible = false">取 消</el-button>
@@ -277,291 +327,291 @@
 	</el-dialog>
 </template>
 <script>
-	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
-	import { getInfo } from '@/api/user'
-	export default {
-		components: {},
-		props: [],
-		data() {
-			return {
-				loading: false,
-				visible: false,
-				isDetail: false,
-				dataForm: {
-					id:'',
-					id:undefined,
-					md:undefined,
-					mdbh:undefined,
-					mdmc:undefined,
-					hy:undefined,
-					hymc:undefined,
-					hyzh:undefined,
-					tkje:undefined,
-					sgfy:undefined,
-					bz:undefined,
-					tkpx:undefined,
-					tksj:new Date(),
-					tkr:undefined,
-					fileUrl:undefined,
-					lqHytkJksyjList:[],
-					lqHytkKjbsyjList:[],
-					lqHytkMxList:[],
-				},
-				rules: {
-					md: [
-						{ required: true, message: '请选择门店', trigger: 'change' }
-					],
-					hy: [
-						{ required: true, message: '请选择会员', trigger: 'change' }
-					]
-				},
-				mdOptions : [],
-				hyOptions : [],
-				pxOptions : [],
-				jksOptions:[],
-				kjbOptions:[],
+import request from '@/utils/request'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { previewDataInterface } from '@/api/systemData/dataInterface'
+import { getInfo } from '@/api/user'
+export default {
+	components: {},
+	props: [],
+	data() {
+		return {
+			loading: false,
+			visible: false,
+			isDetail: false,
+			dataForm: {
+				id: '',
+				id: undefined,
+				md: undefined,
+				mdbh: undefined,
+				mdmc: undefined,
+				hy: undefined,
+				hymc: undefined,
+				hyzh: undefined,
+				tkje: undefined,
+				sgfy: undefined,
+				bz: undefined,
+				tkpx: undefined,
+				tksj: new Date(),
+				tkr: undefined,
+				fileUrl: undefined,
+				lqHytkJksyjList: [],
+				lqHytkKjbsyjList: [],
+				lqHytkMxList: [],
+			},
+			rules: {
+				md: [
+					{ required: true, message: '请选择门店', trigger: 'change' }
+				],
+				hy: [
+					{ required: true, message: '请选择会员', trigger: 'change' }
+				]
+			},
+			mdOptions: [],
+			hyOptions: [],
+			pxOptions: [],
+			jksOptions: [],
+			kjbOptions: [],
+		}
+	},
+	computed: {},
+	watch: {},
+	created() {
+		// 门店数据在loadStoreDataAndSetDefault中加载，避免重复
+		this.gethyOptions();
+		this.getpxOptions();
+	},
+	mounted() {
+	},
+	methods: {
+		// 门店选择变化处理
+		handleMdChange(val) {
+			const selectedMd = this.mdOptions.find(item => item.id === val);
+			if (selectedMd) {
+				this.dataForm.mdbh = selectedMd.mdbh || selectedMd.id;
+				this.dataForm.mdmc = selectedMd.fullName;
+				console.log('选择门店:', selectedMd);
+			} else {
+				this.dataForm.mdbh = '';
+				this.dataForm.mdmc = '';
 			}
 		},
-		computed: {},
-        watch: {},
-        created() {
-			// 门店数据在loadStoreDataAndSetDefault中加载，避免重复
-			this.gethyOptions();
-			this.getpxOptions();
+		// 会员选择变化处理
+		handleHyChange(val) {
+			const selectedHy = this.hyOptions.find(item => item.id === val);
+			if (selectedHy) {
+				this.dataForm.hyzh = selectedHy.hyzh || selectedHy.id;
+				this.dataForm.hymc = selectedHy.fullName;
+				console.log('选择会员:', selectedHy);
+
+				// 清空已选择的品项列表
+				this.dataForm.lqHytkMxList = [];
+
+				// 选择会员后，获取该会员的剩余品项
+				this.getpxOptions();
+			} else {
+				this.dataForm.hyzh = '';
+				this.dataForm.hymc = '';
+				this.pxOptions = []; // 清空品项选项
+				this.dataForm.lqHytkMxList = []; // 清空已选择的品项列表
+
+				// 重新计算总金额和总手工费
+				this.calculateTotalAmount();
+				this.calculateTotalLaborCost();
+			}
 		},
-		mounted() {
-        },
-		methods: {
-			// 门店选择变化处理
-			handleMdChange(val) {
-				const selectedMd = this.mdOptions.find(item => item.id === val);
-				if (selectedMd) {
-					this.dataForm.mdbh = selectedMd.mdbh || selectedMd.id;
-					this.dataForm.mdmc = selectedMd.fullName;
-					console.log('选择门店:', selectedMd);
-				} else {
-					this.dataForm.mdbh = '';
-					this.dataForm.mdmc = '';
-				}
-			},
-			// 会员选择变化处理
-			handleHyChange(val) {
-				const selectedHy = this.hyOptions.find(item => item.id === val);
-				if (selectedHy) {
-					this.dataForm.hyzh = selectedHy.hyzh || selectedHy.id;
-					this.dataForm.hymc = selectedHy.fullName;
-					console.log('选择会员:', selectedHy);
-					
-					// 清空已选择的品项列表
-					this.dataForm.lqHytkMxList = [];
-					
-					// 选择会员后，获取该会员的剩余品项
-					this.getpxOptions();
-				} else {
-					this.dataForm.hyzh = '';
-					this.dataForm.hymc = '';
-					this.pxOptions = []; // 清空品项选项
-					this.dataForm.lqHytkMxList = []; // 清空已选择的品项列表
-					
-					// 重新计算总金额和总手工费
-					this.calculateTotalAmount();
-					this.calculateTotalLaborCost();
-				}
-			},
-			// 品项选择变化处理
-			handlePxChange(index, row) {
-				if (row.pxid) {
-					const selectedPx = this.pxOptions.find(item => item.pxid === row.pxid);
-					if (selectedPx) {
-						request({
-							url: `/api/Extend/LqXmzl/${selectedPx.id}`,
-							method: 'GET',
-						}).then((res) => {
-							let qt2 = res.data.qt2 || "";
-							let sgf = res.data.sgf || 0;
-							row.px = selectedPx.id;
-							row.pxmc = selectedPx.fullName;
-							row.pxjg = selectedPx.ItemPrice || 0;
-							row.qt2 = qt2 || "";
-							row.yxf = selectedPx.ConsumedCount || 0; // 已消费
-							row.zgm = selectedPx.TotalPurchased || 1; // 总购买
-							row.ly = selectedPx.sourceType || "购买"; // 来源
-							row.projectNumber = 1; // 默认消费数量为1
-							row.sgf = sgf;
-							
-							// 品项切换时，清空所有人员列表
-							row.lqHytkJksyjList = []; // 清空健康师列表
-							row.lqHytkKjbsyjList = []; // 清空科技部老师列表
-							
-							console.log('选择品项:', selectedPx.fullName, 'qt2:', selectedPx.qt2, '剩余数量:', selectedPx.RemainingCount, '手工费:', sgf);
-							
-							// 重新计算总金额和总手工费
-							this.calculateTotalAmount();
-							this.calculateTotalLaborCost();
-						})
-					}
-				} else {
-					// 清空品项时，重置所有相关字段
-					row.pxmc = '';
-					row.pxjg = 0;
-					row.qt2 = '';
-					row.yxf = 0;
-					row.zgm = 1;
-					row.ly = '购买';
-					row.projectNumber = 1;
-					row.sgf = 0; // 清空手工费
-					row.lqHytkJksyjList = []; // 清空健康师列表
-					row.lqHytkKjbsyjList = []; // 清空科技部老师列表
-					
-					// 重新计算总金额和总手工费
-					this.calculateTotalAmount();
-					this.calculateTotalLaborCost();
-				}
-			},
-			getmdOptions(){
-				previewDataInterface('730960205902251269').then(res => {
-					this.mdOptions = res.data
-				});
-			},
-			gethyOptions(){
-				previewDataInterface('730998109110273285').then(res => {
-					this.hyOptions = res.data
-				});
-			},
-			// 获取品项选项（从会员剩余品项API获取）
-			async getpxOptions() {
-				if (!this.dataForm.hy) {
-					console.warn("请先选择会员");
-					this.pxOptions = [];
-					return;
+		// 品项选择变化处理
+		handlePxChange(index, row) {
+			if (row.pxid) {
+				const selectedPx = this.pxOptions.find(item => item.pxid === row.pxid);
+				if (selectedPx) {
+					request({
+						url: `/api/Extend/LqXmzl/${selectedPx.id}`,
+						method: 'GET',
+					}).then((res) => {
+						let qt2 = res.data.qt2 || "";
+						let sgf = res.data.sgf || 0;
+						row.px = selectedPx.id;
+						row.pxmc = selectedPx.fullName;
+						row.pxjg = selectedPx.ItemPrice || 0;
+						row.qt2 = qt2 || "";
+						row.yxf = selectedPx.ConsumedCount || 0; // 已消费
+						row.zgm = selectedPx.TotalPurchased || 1; // 总购买
+						row.ly = selectedPx.sourceType || "购买"; // 来源
+						row.projectNumber = 1; // 默认消费数量为1
+						row.sgf = sgf;
+
+						// 品项切换时，清空所有人员列表
+						row.lqHytkJksyjList = []; // 清空健康师列表
+						row.lqHytkKjbsyjList = []; // 清空科技部老师列表
+
+						console.log('选择品项:', selectedPx.fullName, 'qt2:', selectedPx.qt2, '剩余数量:', selectedPx.RemainingCount, '手工费:', sgf);
+
+						// 重新计算总金额和总手工费
+						this.calculateTotalAmount();
+						this.calculateTotalLaborCost();
+					})
 				}
+			} else {
+				// 清空品项时，重置所有相关字段
+				row.pxmc = '';
+				row.pxjg = 0;
+				row.qt2 = '';
+				row.yxf = 0;
+				row.zgm = 1;
+				row.ly = '购买';
+				row.projectNumber = 1;
+				row.sgf = 0; // 清空手工费
+				row.lqHytkJksyjList = []; // 清空健康师列表
+				row.lqHytkKjbsyjList = []; // 清空科技部老师列表
 
-				try {
-					const response = await request({
-						url: `/api/Extend/lqkhxx/GetMemberRemainingItems?memberId=${this.dataForm.hy}`,
-						method: 'GET',
-					});
+				// 重新计算总金额和总手工费
+				this.calculateTotalAmount();
+				this.calculateTotalLaborCost();
+			}
+		},
+		getmdOptions() {
+			previewDataInterface('730960205902251269').then(res => {
+				this.mdOptions = res.data
+			});
+		},
+		gethyOptions() {
+			previewDataInterface('730998109110273285').then(res => {
+				this.hyOptions = res.data
+			});
+		},
+		// 获取品项选项（从会员剩余品项API获取）
+		async getpxOptions() {
+			if (!this.dataForm.hy) {
+				console.warn("请先选择会员");
+				this.pxOptions = [];
+				return;
+			}
 
-					if (response.code == 200 && response.data && response.data.RemainingItems) {
-						this.pxOptions = response.data.RemainingItems.map(item => ({
-							fullName: item.ItemName,
-							id: item.ItemId,
-							value: item.ItemId,
-							label: item.ItemName,
-							px: item.ItemId,
-							pxmc: item.ItemName,
-							pxjg: item.ItemPrice || 0,
-							qt2: item.qt2 || "",
-							RemainingCount: item.RemainingCount || 0,
-							ItemPrice: item.ItemPrice || 0,
-							sgf: 0,
-							sourceType: item.SourceType || "购买",
-							TotalPurchased: item.TotalPurchased || 0,
-							ConsumedCount: item.ConsumedCount || 0,
-							pxid: item.ItemId+','+item.SourceType
-						}));
-						console.log('获取会员剩余品项成功:', this.pxOptions);
-					} else {
-						console.warn("获取会员剩余品项失败，使用默认数据");
-						this.pxOptions = [];
-					}
-				} catch (error) {
-					console.error("获取会员剩余品项出错:", error);
-					this.pxOptions = [];
-				}
-			},
-			// 获取健康师选项
-			getjksOptions() {
-				request({
-					url: `/api/Extend/user?page=1&pageSize=1000&mdid=${this.dataForm.md}&gw=健康师`,
-					method: 'GET',
-				}).then((res) => {
-					if (res.code == 200 && res.data.list.length > 0) {
-						this.jksOptions = res.data.list.map(item => ({
-							fullName: item.realName || item.name || item.userName,
-							id: item.id,
-							value: item.id,
-							label: item.realName || item.name || item.userName,
-							jks: item.id,
-							jksxm: item.realName || item.name || item.userName,
-							jkszh: item.mobilePhone || item.account || item.userName
-						}));
-					} else {
-						this.jksOptions = [];
-					}
-				})
-			},
-			// 获取科技部老师选项
-			async getkjbOptions() {
-				await this.getKjbOptionsByOrganizeId();
-			},
-			// 根据门店ID获取科技部组织ID，再获取科技部老师列表
-			async getKjbOptionsByOrganizeId() {
-				const userResponse = await request({
-					url: `/api/Extend/user?page=1&pageSize=1000&gw=科技老师`,
+			try {
+				const response = await request({
+					url: `/api/Extend/lqkhxx/GetMemberRemainingItems?memberId=${this.dataForm.hy}`,
 					method: 'GET',
 				});
-				
-				if (userResponse.code == 200 && userResponse.data && userResponse.data.list.length > 0) {
-					this.kjbOptions = userResponse.data.list.map(item => ({
+
+				if (response.code == 200 && response.data && response.data.RemainingItems) {
+					this.pxOptions = response.data.RemainingItems.map(item => ({
+						fullName: item.ItemName,
+						id: item.ItemId,
+						value: item.ItemId,
+						label: item.ItemName,
+						px: item.ItemId,
+						pxmc: item.ItemName,
+						pxjg: item.ItemPrice || 0,
+						qt2: item.qt2 || "",
+						RemainingCount: item.RemainingCount || 0,
+						ItemPrice: item.ItemPrice || 0,
+						sgf: 0,
+						sourceType: item.SourceType || "购买",
+						TotalPurchased: item.TotalPurchased || 0,
+						ConsumedCount: item.ConsumedCount || 0,
+						pxid: item.ItemId + ',' + item.SourceType
+					}));
+					console.log('获取会员剩余品项成功:', this.pxOptions);
+				} else {
+					console.warn("获取会员剩余品项失败，使用默认数据");
+					this.pxOptions = [];
+				}
+			} catch (error) {
+				console.error("获取会员剩余品项出错:", error);
+				this.pxOptions = [];
+			}
+		},
+		// 获取健康师选项
+		getjksOptions() {
+			request({
+				url: `/api/Extend/user?page=1&pageSize=1000&mdid=${this.dataForm.md}&gw=健康师`,
+				method: 'GET',
+			}).then((res) => {
+				if (res.code == 200 && res.data.list.length > 0) {
+					this.jksOptions = res.data.list.map(item => ({
 						fullName: item.realName || item.name || item.userName,
 						id: item.id,
 						value: item.id,
 						label: item.realName || item.name || item.userName,
-						kjbls: item.id,
-						kjblsxm: item.realName || item.name || item.userName,
-						kjblszh: item.mobilePhone || item.account || item.userName
+						jks: item.id,
+						jksxm: item.realName || item.name || item.userName,
+						jkszh: item.mobilePhone || item.account || item.userName
 					}));
-					console.log('科技部老师列表:', this.kjbOptions);
 				} else {
-					console.warn('获取科技部老师列表失败');
-					this.kjbOptions = [];
+					this.jksOptions = [];
 				}
-			},
-			// 品项健康师选择
-			handleJksChange(pxIndex, jksIndex, row) {
-				console.log('品项健康师选择:', row);
-				if (row.jks) {
-					// 根据选择的健康师ID获取用户信息
-					const selectedJks = this.jksOptions.find(item => item.id === row.jks);
-					if (selectedJks) {
-						// 填充姓名和账号
-						row.jksxm = selectedJks.fullName;
-						row.jkszh = selectedJks.userName || selectedJks.account || selectedJks.id;
-						
-						// 获取金三角信息
-						this.getJsjInfoByUserId(row.jks, (jsjId, jsjName) => {
-							row.jsjName = jsjName;
-							row.jsjId = jsjId;
-						});
-					}
-				} else {
-					// 清空相关字段
-					row.jksxm = '';
-					row.jkszh = '';
-					row.jsjId = '';
+			})
+		},
+		// 获取科技部老师选项
+		async getkjbOptions() {
+			await this.getKjbOptionsByOrganizeId();
+		},
+		// 根据门店ID获取科技部组织ID，再获取科技部老师列表
+		async getKjbOptionsByOrganizeId() {
+			const userResponse = await request({
+				url: `/api/Extend/user?page=1&pageSize=1000&gw=科技老师`,
+				method: 'GET',
+			});
+
+			if (userResponse.code == 200 && userResponse.data && userResponse.data.list.length > 0) {
+				this.kjbOptions = userResponse.data.list.map(item => ({
+					fullName: item.realName || item.name || item.userName,
+					id: item.id,
+					value: item.id,
+					label: item.realName || item.name || item.userName,
+					kjbls: item.id,
+					kjblsxm: item.realName || item.name || item.userName,
+					kjblszh: item.mobilePhone || item.account || item.userName
+				}));
+				console.log('科技部老师列表:', this.kjbOptions);
+			} else {
+				console.warn('获取科技部老师列表失败');
+				this.kjbOptions = [];
+			}
+		},
+		// 品项健康师选择
+		handleJksChange(pxIndex, jksIndex, row) {
+			console.log('品项健康师选择:', row);
+			if (row.jks) {
+				// 根据选择的健康师ID获取用户信息
+				const selectedJks = this.jksOptions.find(item => item.id === row.jks);
+				if (selectedJks) {
+					// 填充姓名和账号
+					row.jksxm = selectedJks.fullName;
+					row.jkszh = selectedJks.userName || selectedJks.account || selectedJks.id;
+
+					// 获取金三角信息
+					this.getJsjInfoByUserId(row.jks, (jsjId, jsjName) => {
+						row.jsjName = jsjName;
+						row.jsjId = jsjId;
+					});
 				}
-			},
-			// 品项科技部老师选择
-			handleKjbChange(pxIndex, kjbIndex, row) {
-				console.log('品项科技部老师选择:', row);
-				if (row.kjbls) {
-					// 根据选择的科技部老师ID获取用户信息
-					const selectedKjb = this.kjbOptions.find(item => item.id === row.kjbls);
-					if (selectedKjb) {
-						// 填充姓名和账号
-						row.kjblsxm = selectedKjb.fullName;
-						row.kjblszh = selectedKjb.userName || selectedKjb.account || selectedKjb.id;
-					}
-				} else {
-					// 清空相关字段
-					row.kjblsxm = '';
-					row.kjblszh = '';
+			} else {
+				// 清空相关字段
+				row.jksxm = '';
+				row.jkszh = '';
+				row.jsjId = '';
+			}
+		},
+		// 品项科技部老师选择
+		handleKjbChange(pxIndex, kjbIndex, row) {
+			console.log('品项科技部老师选择:', row);
+			if (row.kjbls) {
+				// 根据选择的科技部老师ID获取用户信息
+				const selectedKjb = this.kjbOptions.find(item => item.id === row.kjbls);
+				if (selectedKjb) {
+					// 填充姓名和账号
+					row.kjblsxm = selectedKjb.fullName;
+					row.kjblszh = selectedKjb.userName || selectedKjb.account || selectedKjb.id;
 				}
-			},
-					// 格式化日期方法
+			} else {
+				// 清空相关字段
+				row.kjblsxm = '';
+				row.kjblszh = '';
+			}
+		},
+		// 格式化日期方法
 		formatDate(date, format) {
 			if (!date) return '';
 			const d = new Date(date);
@@ -571,7 +621,7 @@
 			const hours = String(d.getHours()).padStart(2, '0');
 			const minutes = String(d.getMinutes()).padStart(2, '0');
 			const seconds = String(d.getSeconds()).padStart(2, '0');
-			
+
 			return format
 				.replace('yyyy', year)
 				.replace('MM', month)
@@ -580,629 +630,629 @@
 				.replace('mm', minutes)
 				.replace('ss', seconds);
 		},
-			// 根据用户ID获取金三角信息
-			getJsjInfoByUserId(userId, callback) {
-				let date = new Date(this.dataForm.tksj);
-				let formattedDate = this.formatDate(date, 'yyyy-MM-dd HH:mm:ss');
-				console.log('formattedDate:', formattedDate);
-				request({
-					url: `/api/Extend/lqycsdjsj/GetJsjInfoByUserMonth?UserId=${userId}&DateTime=${formattedDate}`,
-					method: 'GET',
-				}).then((res) => {
-					if (res.code === 200 && res.data) {
-						// 假设返回的数据结构中有jsj_id字段
-						const jsjId = res.data.jsjId;
-						const jsjName = res.data.jsjName;
-
-						if (callback) {
-							callback(jsjId, jsjName);
-						}
-						console.log('获取金三角信息成功:', res.data);
-					} else {
-						console.warn('获取金三角信息失败:', res.msg);
-						if (callback) {
-							callback('');
-						}
+		// 根据用户ID获取金三角信息
+		getJsjInfoByUserId(userId, callback) {
+			let date = new Date(this.dataForm.tksj);
+			let formattedDate = this.formatDate(date, 'yyyy-MM-dd HH:mm:ss');
+			console.log('formattedDate:', formattedDate);
+			request({
+				url: `/api/Extend/lqycsdjsj/GetJsjInfoByUserMonth?UserId=${userId}&DateTime=${formattedDate}`,
+				method: 'GET',
+			}).then((res) => {
+				if (res.code === 200 && res.data) {
+					// 假设返回的数据结构中有jsj_id字段
+					const jsjId = res.data.jsjId;
+					const jsjName = res.data.jsjName;
+
+					if (callback) {
+						callback(jsjId, jsjName);
 					}
-				}).catch((err) => {
-					console.error('获取金三角信息出错:', err);
+					console.log('获取金三角信息成功:', res.data);
+				} else {
+					console.warn('获取金三角信息失败:', res.msg);
 					if (callback) {
 						callback('');
 					}
-				});
-			},
-			// 品项内人员业绩数字格式化
-			formatPxStaffNumber(pxIndex, staffIndex, field, listName) {
-				const targetList = this.dataForm.lqHytkMxList[pxIndex][listName];
-				if (targetList && targetList[staffIndex] && targetList[staffIndex][field] !== undefined) {
-					let value = targetList[staffIndex][field].toString().replace(/,/g, '');
-					
-					if (!/^\d*\.?\d*$/.test(value)) {
-						value = value.replace(/[^\d.]/g, '');
-					}
-					
-					targetList[staffIndex][field] = value;
 				}
-			},
-			// 获取品项剩余数量
-			getRemainingCount(px) {
-				if (px.px) {
-					const selectedPx = this.pxOptions.find(item => item.id === px.px);
-					if (selectedPx) {
-						return selectedPx.RemainingCount || 0;
-					}
+			}).catch((err) => {
+				console.error('获取金三角信息出错:', err);
+				if (callback) {
+					callback('');
 				}
-				return (px.zgm || 1) - (px.yxf || 0);
-			},
-			// 消费数量变化处理
-			onProjectNumberChange() {
-				// 重新计算总金额和总手工费
-				this.calculateTotalAmount();
-				this.calculateTotalLaborCost();
-			},
-			// 品项消费数量变化处理（带参数）
-			onPxProjectNumberChange(pxIndex, projectNumber) {
-				// 更新品项的消费数量
-				this.dataForm.lqHytkMxList[pxIndex].projectNumber = projectNumber;
-				
-				// 获取当前品项的手工费
-				const currentPx = this.dataForm.lqHytkMxList[pxIndex];
-				const laborCost = currentPx.sgf || 0;
-				
-				// 更新该品项下所有人员的手工费
-				this.updatePxStaffLaborCost(pxIndex, laborCost);
-				
-				// 重新计算总金额和总手工费
-				this.calculateTotalAmount();
-				this.calculateTotalLaborCost();
-			},
-			// 更新品项下所有人员的手工费
-			updatePxStaffLaborCost(pxIndex, newLaborCost) {
-				const currentPx = this.dataForm.lqHytkMxList[pxIndex];
-				console.log('更新品项手工费:', {
-					pxIndex,
-					newLaborCost,
-					pxName: currentPx.pxmc,
-					hasJks: currentPx.lqHytkJksyjList && currentPx.lqHytkJksyjList.length > 0,
-					hasKjb: currentPx.lqHytkKjbsyjList && currentPx.lqHytkKjbsyjList.length > 0
-				});
-				
-				// 更新健康师的手工费 = 品项手工费 × 健康师次数
-				if (currentPx.lqHytkJksyjList && currentPx.lqHytkJksyjList.length > 0) {
-					currentPx.lqHytkJksyjList.forEach((jks, index) => {
-						const jksLaborCost = newLaborCost * (jks.kdpxNumber || 1);
-						console.log(`更新健康师${index}手工费:`, jks.laborCost, '->', jksLaborCost, `(${newLaborCost} × ${jks.kdpxNumber || 1})`);
-						// 使用Vue.set确保响应式更新
-						this.$set(jks, 'laborCost', jksLaborCost);
-					});
+			});
+		},
+		// 品项内人员业绩数字格式化
+		formatPxStaffNumber(pxIndex, staffIndex, field, listName) {
+			const targetList = this.dataForm.lqHytkMxList[pxIndex][listName];
+			if (targetList && targetList[staffIndex] && targetList[staffIndex][field] !== undefined) {
+				let value = targetList[staffIndex][field].toString().replace(/,/g, '');
+
+				if (!/^\d*\.?\d*$/.test(value)) {
+					value = value.replace(/[^\d.]/g, '');
 				}
-				
-				// 更新科技部老师的手工费 = 品项手工费 × 科技部老师次数
-				if (currentPx.lqHytkKjbsyjList && currentPx.lqHytkKjbsyjList.length > 0) {
-					currentPx.lqHytkKjbsyjList.forEach((kjb, index) => {
-						const kjbLaborCost = newLaborCost * (kjb.hdpxNumber || 1);
-						console.log(`更新科技部老师${index}手工费:`, kjb.laborCost, '->', kjbLaborCost, `(${newLaborCost} × ${kjb.hdpxNumber || 1})`);
-						// 使用Vue.set确保响应式更新
-						this.$set(kjb, 'laborCost', kjbLaborCost);
-					});
+
+				targetList[staffIndex][field] = value;
+			}
+		},
+		// 获取品项剩余数量
+		getRemainingCount(px) {
+			if (px.px) {
+				const selectedPx = this.pxOptions.find(item => item.id === px.px);
+				if (selectedPx) {
+					return selectedPx.RemainingCount || 0;
 				}
-			},
-			// 健康师次数变化处理
-			onJksNumberChange(pxIndex, jksIndex, newNumber) {
-				const currentPx = this.dataForm.lqHytkMxList[pxIndex];
-				const jks = currentPx.lqHytkJksyjList[jksIndex];
-				
-				// 更新健康师的次数
-				this.$set(jks, 'kdpxNumber', newNumber);
-				
-				// 重新计算该健康师的手工费 = 品项手工费 × 健康师次数
-				const pxLaborCost = currentPx.sgf || 0;
-				const newJksLaborCost = pxLaborCost * newNumber;
-				this.$set(jks, 'laborCost', newJksLaborCost);
-				
-				// 重新计算总金额和总手工费
-				this.calculateTotalAmount();
-				this.calculateTotalLaborCost();
-				
-				console.log('健康师次数变化:', {
-					pxIndex,
-					jksIndex,
-					newNumber,
-					jksName: jks.jksxm,
-					pxLaborCost,
-					newJksLaborCost,
-					formula: `${pxLaborCost} × ${newNumber} = ${newJksLaborCost}`
-				});
-			},
-			// 科技部老师次数变化处理
-			onKjbNumberChange(pxIndex, kjbIndex, newNumber) {
-				const currentPx = this.dataForm.lqHytkMxList[pxIndex];
-				const kjb = currentPx.lqHytkKjbsyjList[kjbIndex];
-				
-				// 更新科技部老师的次数
-				this.$set(kjb, 'hdpxNumber', newNumber);
-				
-				// 重新计算该科技部老师的手工费 = 品项手工费 × 科技部老师次数
-				const pxLaborCost = currentPx.sgf || 0;
-				const newKjbLaborCost = pxLaborCost * newNumber;
-				this.$set(kjb, 'laborCost', newKjbLaborCost);
-				
-				// 重新计算总金额和总手工费
-				this.calculateTotalAmount();
-				this.calculateTotalLaborCost();
-				
-				console.log('科技部老师次数变化:', {
-					pxIndex,
-					kjbIndex,
-					newNumber,
-					kjbName: kjb.kjblsxm,
-					pxLaborCost,
-					newKjbLaborCost,
-					formula: `${pxLaborCost} × ${newNumber} = ${newKjbLaborCost}`
+			}
+			return (px.zgm || 1) - (px.yxf || 0);
+		},
+		// 消费数量变化处理
+		onProjectNumberChange() {
+			// 重新计算总金额和总手工费
+			this.calculateTotalAmount();
+			this.calculateTotalLaborCost();
+		},
+		// 品项消费数量变化处理（带参数）
+		onPxProjectNumberChange(pxIndex, projectNumber) {
+			// 更新品项的消费数量
+			this.dataForm.lqHytkMxList[pxIndex].projectNumber = projectNumber;
+
+			// 获取当前品项的手工费
+			const currentPx = this.dataForm.lqHytkMxList[pxIndex];
+			const laborCost = currentPx.sgf || 0;
+
+			// 更新该品项下所有人员的手工费
+			this.updatePxStaffLaborCost(pxIndex, laborCost);
+
+			// 重新计算总金额和总手工费
+			this.calculateTotalAmount();
+			this.calculateTotalLaborCost();
+		},
+		// 更新品项下所有人员的手工费
+		updatePxStaffLaborCost(pxIndex, newLaborCost) {
+			const currentPx = this.dataForm.lqHytkMxList[pxIndex];
+			console.log('更新品项手工费:', {
+				pxIndex,
+				newLaborCost,
+				pxName: currentPx.pxmc,
+				hasJks: currentPx.lqHytkJksyjList && currentPx.lqHytkJksyjList.length > 0,
+				hasKjb: currentPx.lqHytkKjbsyjList && currentPx.lqHytkKjbsyjList.length > 0
+			});
+
+			// 更新健康师的手工费 = 品项手工费 × 健康师次数
+			if (currentPx.lqHytkJksyjList && currentPx.lqHytkJksyjList.length > 0) {
+				currentPx.lqHytkJksyjList.forEach((jks, index) => {
+					const jksLaborCost = newLaborCost * (jks.kdpxNumber || 1);
+					console.log(`更新健康师${index}手工费:`, jks.laborCost, '->', jksLaborCost, `(${newLaborCost} × ${jks.kdpxNumber || 1})`);
+					// 使用Vue.set确保响应式更新
+					this.$set(jks, 'laborCost', jksLaborCost);
 				});
-			},
-			// 计算总退款金额
-			calculateTotalAmount() {
-				let totalAmount = 0;
-				this.dataForm.lqHytkMxList.forEach(px => {
-					if (px.px && px.pxjg && px.projectNumber) {
-						totalAmount += parseFloat(px.pxjg) * parseInt(px.projectNumber);
-					}
+			}
+
+			// 更新科技部老师的手工费 = 品项手工费 × 科技部老师次数
+			if (currentPx.lqHytkKjbsyjList && currentPx.lqHytkKjbsyjList.length > 0) {
+				currentPx.lqHytkKjbsyjList.forEach((kjb, index) => {
+					const kjbLaborCost = newLaborCost * (kjb.hdpxNumber || 1);
+					console.log(`更新科技部老师${index}手工费:`, kjb.laborCost, '->', kjbLaborCost, `(${newLaborCost} × ${kjb.hdpxNumber || 1})`);
+					// 使用Vue.set确保响应式更新
+					this.$set(kjb, 'laborCost', kjbLaborCost);
 				});
-				this.dataForm.tkje = totalAmount.toFixed(2);
-			},
-			// 计算总手工费
-			calculateTotalLaborCost() {
-				let totalLaborCost = 0;
-				this.dataForm.lqHytkMxList.forEach(px => {
-					// 只计算品项的手工费 = 品项单次手工费 × 品项消费次数
-					if (px.sgf && px.projectNumber) {
-						totalLaborCost += parseFloat(px.sgf) * parseInt(px.projectNumber);
+			}
+		},
+		// 健康师次数变化处理
+		onJksNumberChange(pxIndex, jksIndex, newNumber) {
+			const currentPx = this.dataForm.lqHytkMxList[pxIndex];
+			const jks = currentPx.lqHytkJksyjList[jksIndex];
+
+			// 更新健康师的次数
+			this.$set(jks, 'kdpxNumber', newNumber);
+
+			// 重新计算该健康师的手工费 = 品项手工费 × 健康师次数
+			const pxLaborCost = currentPx.sgf || 0;
+			const newJksLaborCost = pxLaborCost * newNumber;
+			this.$set(jks, 'laborCost', newJksLaborCost);
+
+			// 重新计算总金额和总手工费
+			this.calculateTotalAmount();
+			this.calculateTotalLaborCost();
+
+			console.log('健康师次数变化:', {
+				pxIndex,
+				jksIndex,
+				newNumber,
+				jksName: jks.jksxm,
+				pxLaborCost,
+				newJksLaborCost,
+				formula: `${pxLaborCost} × ${newNumber} = ${newJksLaborCost}`
+			});
+		},
+		// 科技部老师次数变化处理
+		onKjbNumberChange(pxIndex, kjbIndex, newNumber) {
+			const currentPx = this.dataForm.lqHytkMxList[pxIndex];
+			const kjb = currentPx.lqHytkKjbsyjList[kjbIndex];
+
+			// 更新科技部老师的次数
+			this.$set(kjb, 'hdpxNumber', newNumber);
+
+			// 重新计算该科技部老师的手工费 = 品项手工费 × 科技部老师次数
+			const pxLaborCost = currentPx.sgf || 0;
+			const newKjbLaborCost = pxLaborCost * newNumber;
+			this.$set(kjb, 'laborCost', newKjbLaborCost);
+
+			// 重新计算总金额和总手工费
+			this.calculateTotalAmount();
+			this.calculateTotalLaborCost();
+
+			console.log('科技部老师次数变化:', {
+				pxIndex,
+				kjbIndex,
+				newNumber,
+				kjbName: kjb.kjblsxm,
+				pxLaborCost,
+				newKjbLaborCost,
+				formula: `${pxLaborCost} × ${newNumber} = ${newKjbLaborCost}`
+			});
+		},
+		// 计算总退款金额
+		calculateTotalAmount() {
+			let totalAmount = 0;
+			this.dataForm.lqHytkMxList.forEach(px => {
+				if (px.px && px.pxjg && px.projectNumber) {
+					totalAmount += parseFloat(px.pxjg) * parseInt(px.projectNumber);
+				}
+			});
+			this.dataForm.tkje = totalAmount.toFixed(2);
+		},
+		// 计算总手工费
+		calculateTotalLaborCost() {
+			let totalLaborCost = 0;
+			this.dataForm.lqHytkMxList.forEach(px => {
+				// 只计算品项的手工费 = 品项单次手工费 × 品项消费次数
+				if (px.sgf && px.projectNumber) {
+					totalLaborCost += parseFloat(px.sgf) * parseInt(px.projectNumber);
+				}
+			});
+			this.dataForm.sgfy = totalLaborCost.toFixed(2);
+			console.log('计算总手工费（仅品项）:', totalLaborCost, '各品项手工费:', this.dataForm.lqHytkMxList.map(px => ({
+				name: px.pxmc,
+				sgf: px.sgf,
+				projectNumber: px.projectNumber,
+				total: parseFloat(px.sgf || 0) * parseInt(px.projectNumber || 0)
+			})));
+		},
+		goBack() {
+			this.$emit('refresh')
+		},
+		init(id, isDetail) {
+			this.dataForm.id = id || 0;
+			this.visible = true;
+			this.isDetail = isDetail || false;
+			this.$nextTick(() => {
+				this.$refs['elForm'].resetFields();
+				if (this.dataForm.id) {
+					request({
+						url: '/api/Extend/LqHytkHytk/' + this.dataForm.id,
+						method: 'get'
+					}).then(res => {
+						this.dataForm = res.data;
+						this.dataForm.fileUrl = this.dataForm.fileUrl ? JSON.parse(this.dataForm.fileUrl) : [];
+					})
+				} else {
+					// 新建时自动设置当前用户门店
+					this.loadStoreDataAndSetDefault();
+					// 加载健康师和科技部老师选项
+					this.getjksOptions();
+					this.getkjbOptions();
+					// 初始化时计算总金额和总手工费
+					this.calculateTotalAmount();
+					this.calculateTotalLaborCost();
+				}
+			})
+		},
+		dataFormSubmit() {
+
+			this.$refs['elForm'].validate((valid) => {
+				if (valid) {
+					// 验证品项数据
+					if (!this.validatePxList()) {
+						return;
 					}
-				});
-				this.dataForm.sgfy = totalLaborCost.toFixed(2);
-				console.log('计算总手工费（仅品项）:', totalLaborCost, '各品项手工费:', this.dataForm.lqHytkMxList.map(px => ({
-					name: px.pxmc,
-					sgf: px.sgf,
-					projectNumber: px.projectNumber,
-					total: parseFloat(px.sgf || 0) * parseInt(px.projectNumber || 0)
-				})));
-			},
-			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
+
+					// 处理提交格式
+					this.processFormData();
+					console.log(this.dataForm)
+					// return
+
+					this.dataForm.fileUrl = JSON.stringify(this.dataForm.fileUrl);
+					if (!this.dataForm.id) {
 						request({
-							url: '/api/Extend/LqHytkHytk/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-							this.dataForm.fileUrl = this.dataForm.fileUrl?JSON.parse(this.dataForm.fileUrl):[];
+							url: `/api/Extend/LqHytkHytk`,
+							method: 'post',
+							data: this.dataForm,
+						}).then((res) => {
+							this.$message({
+								message: res.msg,
+								type: 'success',
+								duration: 1000,
+								onClose: () => {
+									this.visible = false,
+										this.$emit('refresh', true)
+								}
+							})
 						})
 					} else {
-						// 新建时自动设置当前用户门店
-						this.loadStoreDataAndSetDefault();
-						// 加载健康师和科技部老师选项
-						this.getjksOptions();
-						this.getkjbOptions();
-						// 初始化时计算总金额和总手工费
-						this.calculateTotalAmount();
-						this.calculateTotalLaborCost();
+						request({
+							url: '/api/Extend/LqHytkHytk/' + this.dataForm.id,
+							method: 'PUT',
+							data: this.dataForm
+						}).then((res) => {
+							this.$message({
+								message: res.msg,
+								type: 'success',
+								duration: 1000,
+								onClose: () => {
+									this.visible = false
+									this.$emit('refresh', true)
+								}
+							})
+						})
 					}
-				})
-			},
-			dataFormSubmit() {
-			
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-						// 验证品项数据
-						if (!this.validatePxList()) {
-							return;
-						}
+				}
+			})
+		},
+		// 品项相关方法
+		addHandleLqXhPxmxEntityList() {
+			let item = {
+				id: undefined,
+				glkdbh: undefined,
+				px: undefined,
+				pxmc: undefined,
+				pxjg: undefined,
+				xfzs: undefined,
+				yxf: 0, // 已消费
+				zgm: 1, // 总购买
+				ly: '购买', // 来源
+				projectNumber: 1, // 消费数量
+				qt2: undefined, // 品项类型
+				lqHytkJksyjList: [], // 健康师业绩列表
+				lqHytkKjbsyjList: [], // 科技部老师业绩列表
+			}
+			this.dataForm.lqHytkMxList.push(item);
+			// 重新计算总金额和总手工费
+			this.calculateTotalAmount();
+			this.calculateTotalLaborCost();
+		},
+		handleDelLqXhPxmxEntityList(index) {
+			this.dataForm.lqHytkMxList.splice(index, 1);
+			// 重新计算总金额和总手工费
+			this.calculateTotalAmount();
+			this.calculateTotalLaborCost();
+		},
+		validatePxList() {
+			const pxList = this.dataForm.lqHytkMxList;
 
-						// 处理提交格式
-						this.processFormData();
-						console.log(this.dataForm)
-						// return
-
-						this.dataForm.fileUrl = JSON.stringify(this.dataForm.fileUrl);
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/LqHytkHytk`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/api/Extend/LqHytkHytk/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
-			},
-			// 品项相关方法
-			addHandleLqXhPxmxEntityList() {
-				let item = {
-					id: undefined,
-					glkdbh: undefined,
-					px: undefined,
-					pxmc: undefined,
-					pxjg: undefined,
-					xfzs: undefined,
-					yxf: 0, // 已消费
-					zgm: 1, // 总购买
-					ly: '购买', // 来源
-					projectNumber: 1, // 消费数量
-					qt2: undefined, // 品项类型
-					lqHytkJksyjList: [], // 健康师业绩列表
-					lqHytkKjbsyjList: [], // 科技部老师业绩列表
+			// 1. 验证是否有品项
+			if (!pxList || pxList.length === 0) {
+				this.$message.error('请至少添加一个品项');
+				return false;
+			}
+
+			// 2. 验证每个品项的信息
+			for (let i = 0; i < pxList.length; i++) {
+				const px = pxList[i];
+
+				// 验证品项基本信息
+				if (!px.px || !px.pxmc) {
+					this.$message.error(`第${i + 1}个品项信息不完整，请重新选择`);
+					return false;
 				}
-				this.dataForm.lqHytkMxList.push(item);
-				// 重新计算总金额和总手工费
-				this.calculateTotalAmount();
-				this.calculateTotalLaborCost();
-			},
-			handleDelLqXhPxmxEntityList(index) {
-				this.dataForm.lqHytkMxList.splice(index, 1);
-				// 重新计算总金额和总手工费
-				this.calculateTotalAmount();
-				this.calculateTotalLaborCost();
-			},
-			validatePxList(){
-				const pxList = this.dataForm.lqHytkMxList;
-				
-				// 1. 验证是否有品项
-				if (!pxList || pxList.length === 0) {
-					this.$message.error('请至少添加一个品项');
+				if (!px.pxjg || parseFloat(px.pxjg) <= 0) {
+					this.$message.error(`第${i + 1}个品项的价格必须大于0`);
 					return false;
 				}
-				
-				// 2. 验证每个品项的信息
-				for (let i = 0; i < pxList.length; i++) {
-					const px = pxList[i];
-					
-					// 验证品项基本信息
-					if (!px.px || !px.pxmc) {
-						this.$message.error(`第${i + 1}个品项信息不完整，请重新选择`);
+
+				// 验证退卡次数不能超过剩余次数
+				if (px.RemainingCount && px.projectNumber > px.RemainingCount) {
+					this.$message.error(`第${i + 1}个品项的退卡次数(${px.projectNumber})不能超过剩余次数(${px.RemainingCount})`);
+					return false;
+				}
+
+				// 验证健康师
+				if (!px.lqHytkJksyjList || px.lqHytkJksyjList.length === 0) {
+					this.$message.error(`第${i + 1}个品项必须至少选择一个健康师`);
+					return false;
+				}
+
+				// 计算健康师业绩总和
+				let jksTotalYj = 0;
+				let jksTotalLaborCost = 0;
+				let jksTotalNumber = 0;
+
+				for (let j = 0; j < px.lqHytkJksyjList.length; j++) {
+					const jks = px.lqHytkJksyjList[j];
+
+					// 验证健康师是否选择
+					if (!jks.jks || !jks.jksxm) {
+						this.$message.error(`第${i + 1}个品项的第${j + 1}个健康师必须选择`);
 						return false;
 					}
-					if (!px.pxjg || parseFloat(px.pxjg) <= 0) {
-						this.$message.error(`第${i + 1}个品项的价格必须大于0`);
+
+					// 验证健康师业绩必须填写
+					if (!jks.jksyj || jks.jksyj.trim() === "") {
+						this.$message.error(`第${i + 1}个品项的第${j + 1}个健康师业绩必须填写`);
 						return false;
 					}
-					
-					// 验证退卡次数不能超过剩余次数
-					if (px.RemainingCount && px.projectNumber > px.RemainingCount) {
-						this.$message.error(`第${i + 1}个品项的退卡次数(${px.projectNumber})不能超过剩余次数(${px.RemainingCount})`);
+
+					// 验证业绩为数字
+					const yj = parseFloat(jks.jksyj);
+					if (isNaN(yj) || yj < 0) {
+						this.$message.error(`第${i + 1}个品项的第${j + 1}个健康师业绩必须为有效数字`);
 						return false;
 					}
-					
-					// 验证健康师
-					if (!px.lqHytkJksyjList || px.lqHytkJksyjList.length === 0) {
-						this.$message.error(`第${i + 1}个品项必须至少选择一个健康师`);
+
+					jksTotalYj += yj;
+					jksTotalLaborCost += parseFloat(jks.laborCost) || 0;
+					jksTotalNumber += parseInt(jks.kdpxNumber) || 0;
+				}
+
+				// 验证健康师业绩总和等于品项金额
+				const pxTotalAmount = px.pxjg * px.projectNumber;
+				if (Math.abs(jksTotalYj - pxTotalAmount) > 0.01) {
+					this.$message.error(`第${i + 1}个品项的健康师业绩总和(${jksTotalYj.toFixed(2)})必须等于品项金额(${pxTotalAmount.toFixed(2)})`);
+					return false;
+				}
+
+				// 验证健康师手工费总和等于品项手工费
+				const pxTotalLaborCost = (px.sgf || 0) * px.projectNumber;
+				if (Math.abs(jksTotalLaborCost - pxTotalLaborCost) > 0.01) {
+					this.$message.error(`第${i + 1}个品项的健康师手工费总和(${jksTotalLaborCost.toFixed(2)})必须等于品项手工费(${pxTotalLaborCost.toFixed(2)})`);
+					return false;
+				}
+
+				// 验证健康师次数总和等于品项次数
+				if (jksTotalNumber !== px.projectNumber) {
+					this.$message.error(`第${i + 1}个品项的健康师次数总和(${jksTotalNumber})必须等于品项次数(${px.projectNumber})`);
+					return false;
+				}
+
+				// 如果是科美品项，验证科技部老师
+				if (px.qt2 === '科美') {
+					if (!px.lqHytkKjbsyjList || px.lqHytkKjbsyjList.length === 0) {
+						this.$message.error(`第${i + 1}个品项是科美品项，必须至少选择一个科技部老师`);
 						return false;
 					}
-					
-					// 计算健康师业绩总和
-					let jksTotalYj = 0;
-					let jksTotalLaborCost = 0;
-					let jksTotalNumber = 0;
-					
-					for (let j = 0; j < px.lqHytkJksyjList.length; j++) {
-						const jks = px.lqHytkJksyjList[j];
-						
-						// 验证健康师是否选择
-						if (!jks.jks || !jks.jksxm) {
-							this.$message.error(`第${i + 1}个品项的第${j + 1}个健康师必须选择`);
+
+					// 计算科技部老师业绩总和
+					let kjbTotalYj = 0;
+					let kjbTotalLaborCost = 0;
+					let kjbTotalNumber = 0;
+
+					for (let k = 0; k < px.lqHytkKjbsyjList.length; k++) {
+						const kjb = px.lqHytkKjbsyjList[k];
+
+						// 验证科技部老师是否选择
+						if (!kjb.kjbls || !kjb.kjblsxm) {
+							this.$message.error(`第${i + 1}个品项的第${k + 1}个科技部老师必须选择`);
 							return false;
 						}
-						
-						// 验证健康师业绩必须填写
-						if (!jks.jksyj || jks.jksyj.trim() === "") {
-							this.$message.error(`第${i + 1}个品项的第${j + 1}个健康师业绩必须填写`);
+
+						// 验证科技部老师业绩必须填写
+						if (!kjb.kjblsyj || kjb.kjblsyj.trim() === "") {
+							this.$message.error(`第${i + 1}个品项的第${k + 1}个科技部老师业绩必须填写`);
 							return false;
 						}
-						
+
 						// 验证业绩为数字
-						const yj = parseFloat(jks.jksyj);
+						const yj = parseFloat(kjb.kjblsyj);
 						if (isNaN(yj) || yj < 0) {
-							this.$message.error(`第${i + 1}个品项的第${j + 1}个健康师业绩必须为有效数字`);
+							this.$message.error(`第${i + 1}个品项的第${k + 1}个科技部老师业绩必须为有效数字`);
 							return false;
 						}
-						
-						jksTotalYj += yj;
-						jksTotalLaborCost += parseFloat(jks.laborCost) || 0;
-						jksTotalNumber += parseInt(jks.kdpxNumber) || 0;
+
+						kjbTotalYj += yj;
+						kjbTotalLaborCost += parseFloat(kjb.laborCost) || 0;
+						kjbTotalNumber += parseInt(kjb.hdpxNumber) || 0;
 					}
-					
-					// 验证健康师业绩总和等于品项金额
-					const pxTotalAmount = px.pxjg * px.projectNumber;
-					if (Math.abs(jksTotalYj - pxTotalAmount) > 0.01) {
-						this.$message.error(`第${i + 1}个品项的健康师业绩总和(${jksTotalYj.toFixed(2)})必须等于品项金额(${pxTotalAmount.toFixed(2)})`);
+
+					// 验证科技部老师业绩总和等于品项金额
+					if (Math.abs(kjbTotalYj - pxTotalAmount) > 0.01) {
+						this.$message.error(`第${i + 1}个品项的科技部老师业绩总和(${kjbTotalYj.toFixed(2)})必须等于品项金额(${pxTotalAmount.toFixed(2)})`);
 						return false;
 					}
-					
-					// 验证健康师手工费总和等于品项手工费
-					const pxTotalLaborCost = (px.sgf || 0) * px.projectNumber;
-					if (Math.abs(jksTotalLaborCost - pxTotalLaborCost) > 0.01) {
-						this.$message.error(`第${i + 1}个品项的健康师手工费总和(${jksTotalLaborCost.toFixed(2)})必须等于品项手工费(${pxTotalLaborCost.toFixed(2)})`);
+
+					// 验证科技部老师手工费总和等于品项手工费
+					if (Math.abs(kjbTotalLaborCost - pxTotalLaborCost) > 0.01) {
+						this.$message.error(`第${i + 1}个品项的科技部老师手工费总和(${kjbTotalLaborCost.toFixed(2)})必须等于品项手工费(${pxTotalLaborCost.toFixed(2)})`);
 						return false;
 					}
-					
-					// 验证健康师次数总和等于品项次数
-					if (jksTotalNumber !== px.projectNumber) {
-						this.$message.error(`第${i + 1}个品项的健康师次数总和(${jksTotalNumber})必须等于品项次数(${px.projectNumber})`);
+
+					// 验证科技部老师次数总和等于品项次数
+					if (kjbTotalNumber !== px.projectNumber) {
+						this.$message.error(`第${i + 1}个品项的科技部老师次数总和(${kjbTotalNumber})必须等于品项次数(${px.projectNumber})`);
 						return false;
 					}
-					
-					// 如果是科美品项，验证科技部老师
-					if (px.qt2 === '科美') {
-						if (!px.lqHytkKjbsyjList || px.lqHytkKjbsyjList.length === 0) {
-							this.$message.error(`第${i + 1}个品项是科美品项，必须至少选择一个科技部老师`);
-							return false;
-						}
-						
-						// 计算科技部老师业绩总和
-						let kjbTotalYj = 0;
-						let kjbTotalLaborCost = 0;
-						let kjbTotalNumber = 0;
-						
-						for (let k = 0; k < px.lqHytkKjbsyjList.length; k++) {
-							const kjb = px.lqHytkKjbsyjList[k];
-							
-							// 验证科技部老师是否选择
-							if (!kjb.kjbls || !kjb.kjblsxm) {
-								this.$message.error(`第${i + 1}个品项的第${k + 1}个科技部老师必须选择`);
-								return false;
-							}
-							
-							// 验证科技部老师业绩必须填写
-							if (!kjb.kjblsyj || kjb.kjblsyj.trim() === "") {
-								this.$message.error(`第${i + 1}个品项的第${k + 1}个科技部老师业绩必须填写`);
-								return false;
-							}
-							
-							// 验证业绩为数字
-							const yj = parseFloat(kjb.kjblsyj);
-							if (isNaN(yj) || yj < 0) {
-								this.$message.error(`第${i + 1}个品项的第${k + 1}个科技部老师业绩必须为有效数字`);
-								return false;
-							}
-							
-							kjbTotalYj += yj;
-							kjbTotalLaborCost += parseFloat(kjb.laborCost) || 0;
-							kjbTotalNumber += parseInt(kjb.hdpxNumber) || 0;
-						}
-						
-						// 验证科技部老师业绩总和等于品项金额
-						if (Math.abs(kjbTotalYj - pxTotalAmount) > 0.01) {
-							this.$message.error(`第${i + 1}个品项的科技部老师业绩总和(${kjbTotalYj.toFixed(2)})必须等于品项金额(${pxTotalAmount.toFixed(2)})`);
-							return false;
-						}
-						
-						// 验证科技部老师手工费总和等于品项手工费
-						if (Math.abs(kjbTotalLaborCost - pxTotalLaborCost) > 0.01) {
-							this.$message.error(`第${i + 1}个品项的科技部老师手工费总和(${kjbTotalLaborCost.toFixed(2)})必须等于品项手工费(${pxTotalLaborCost.toFixed(2)})`);
-							return false;
-						}
-						
-						// 验证科技部老师次数总和等于品项次数
-						if (kjbTotalNumber !== px.projectNumber) {
-							this.$message.error(`第${i + 1}个品项的科技部老师次数总和(${kjbTotalNumber})必须等于品项次数(${px.projectNumber})`);
-							return false;
-						}
-					}
-				}
-				
-				return true;
-			},
-			// 处理表单数据
-			processFormData() {
-				// 检查是否有科美品项
-				const hasKemei = this.dataForm.lqHytkMxList.some(px => px.qt2 === '科美');
-				
-				// 设置是否有科技部
-				this.dataForm.sfykjb = hasKemei ? "是" : "否";
-				
-				// 处理品项列表，转换为指定格式
-				this.dataForm.lqHytkMxList = this.dataForm.lqHytkMxList.map(px => {
-					// 计算退卡金额和总价
-					const tkje = parseFloat(px.pxjg) * parseInt(px.projectNumber) || 0;
-					const f_TotalPrice = tkje;
-					
-					// 处理健康师列表
-					const lqHytkJksyjList = (px.lqHytkJksyjList || []).map(jks => ({
-						jks: jks.jks || '',
-						jksxm: jks.jksxm || '',
-						jkszh: jks.jkszh || '',
-						jksyj: parseFloat(jks.jksyj) || 0,
-						f_jsjid: jks.jsjId || '',
-						f_tkpxid: px.px || '',
-						f_LaborCost: parseFloat(jks.laborCost) || 0,
-						f_tkpxNumber: parseInt(px.projectNumber) || 0
-					}));
-					
-					// 处理科技部老师列表
-					const lqHytkKjbsyjList = (px.lqHytkKjbsyjList || []).map(kjb => ({
-						kjbls: kjb.kjbls || '',
-						kjblsxm: kjb.kjblsxm || '',
-						kjblszh: kjb.kjblszh || '',
-						kjblsyj: parseFloat(kjb.kjblsyj) || 0,
-						f_tkpxid: px.px || '',
-						f_LaborCost: parseFloat(kjb.laborCost) || 0,
-						f_tkpxNumber: parseInt(px.projectNumber) || 0
-					}));
-					
-					return {
-						px: px.px || '',
-						pxmc: px.pxmc || '',
-						pxjg: parseFloat(px.pxjg) || 0,
-						tkje: tkje,
-						f_ProjectNumber: parseInt(px.projectNumber) || 0,
-						f_SourceType: px.qt2 || '',
-						f_TotalPrice: f_TotalPrice,
-						lqHytkJksyjList: lqHytkJksyjList,
-						lqHytkKjbsyjList: lqHytkKjbsyjList
-					};
-				});
-			},
-			// 品项健康师相关方法
-			addPxJks(pxIndex) {
-				if (!this.dataForm.lqHytkMxList[pxIndex].lqHytkJksyjList) {
-					this.$set(this.dataForm.lqHytkMxList[pxIndex], 'lqHytkJksyjList', []);
-				}
-				// 获取当前品项的手工费
-				const currentPx = this.dataForm.lqHytkMxList[pxIndex];
-				const pxLaborCost = currentPx.sgf || 0;
-				const defaultNumber = 1;
-				const laborCost = pxLaborCost * defaultNumber; // 品项手工费 × 次数
-				
-				let item = {
-					"jks": "",
-					"jksxm": "",
-					"jkszh": "",
-					"jksyj": "",
-					"jsjId": "",
-					"laborCost": laborCost, // 品项手工费 × 次数
-					"kdpxNumber": defaultNumber // 默认次数为1
 				}
-				this.dataForm.lqHytkMxList[pxIndex].lqHytkJksyjList.push(item);
-				console.log('添加健康师:', {
-					pxLaborCost,
-					defaultNumber,
-					laborCost,
-					formula: `${pxLaborCost} × ${defaultNumber} = ${laborCost}`
-				});
-			},
-			removePxJks(pxIndex, jksIndex) {
-				this.dataForm.lqHytkMxList[pxIndex].lqHytkJksyjList.splice(jksIndex, 1);
-			},
-			// 品项科技部老师相关方法
-			addPxKjb(pxIndex) {
-				if (!this.dataForm.lqHytkMxList[pxIndex].lqHytkKjbsyjList) {
-					this.$set(this.dataForm.lqHytkMxList[pxIndex], 'lqHytkKjbsyjList', []);
-				}
-				// 获取当前品项的手工费
-				const currentPx = this.dataForm.lqHytkMxList[pxIndex];
-				const pxLaborCost = currentPx.sgf || 0;
-				const defaultNumber = 1;
-				const laborCost = pxLaborCost * defaultNumber; // 品项手工费 × 次数
-				
-				let item = {
-					"kjbls": "",
-					"kjblsyj": "",
-					"kjblsxm": "",
-					"kjblszh": "",
-					"laborCost": laborCost, // 品项手工费 × 次数
-					"hdpxNumber": defaultNumber // 默认次数为1
-				}
-				this.dataForm.lqHytkMxList[pxIndex].lqHytkKjbsyjList.push(item);
-				console.log('添加科技部老师:', {
-					pxLaborCost,
-					defaultNumber,
-					laborCost,
-					formula: `${pxLaborCost} × ${defaultNumber} = ${laborCost}`
-				});
-			},
-			removePxKjb(pxIndex, kjbIndex) {
-				this.dataForm.lqHytkMxList[pxIndex].lqHytkKjbsyjList.splice(kjbIndex, 1);
-			},
-			// 加载门店数据并设置默认门店
-			loadStoreDataAndSetDefault() {
-				console.log('开始加载门店数据和用户信息...');
-				// 先加载门店数据
-				this.loadStoreDataPromise().then(() => {
-					// 门店数据加载完成后，获取用户信息
-					return this.getCurrentUserStorePromise();
-				}).then((userData) => {
-					if (userData && userData.mdid) {
-						const userStoreId = userData.mdid;
-						console.log('用户门店ID:', userStoreId);
-						console.log('门店选项列表:', this.mdOptions);
-
-						// 检查用户门店ID是否在门店列表中
-						const matchingStore = this.mdOptions.find(store => store.id === userStoreId);
-						if (matchingStore) {
-							this.dataForm.md = userStoreId;
-							this.dataForm.mdmc = matchingStore.fullName;
-							this.dataForm.mdbh = matchingStore.id;
-							console.log('找到匹配的门店，设置默认门店ID:', userStoreId);
-							console.log('匹配的门店信息:', matchingStore);
-						} else {
-							console.warn('用户门店ID在门店列表中未找到匹配项');
-							console.log('用户门店ID:', userStoreId);
-							console.log('可用门店ID列表:', this.mdOptions.map(s => s.id));
-						}
-					} else {
-						console.warn('用户数据中没有门店ID，无法设置默认值');
-					}
-					
-					// 加载健康师和科技部老师选项
-					this.getjksOptions();
-					this.getkjbOptions();
-				}).catch(err => {
-					console.error('加载数据失败:', err);
-				});
-			},
-			// 加载门店数据
-			loadStoreDataPromise() {
-				// 使用原来的数据接口方式
-				return previewDataInterface('730960205902251269').then(res => {
-					console.log('门店API原始响应:', res);
-					if (res.data && res.data.length > 0) {
-						this.mdOptions = res.data;
-						console.log('门店数据加载成功:', this.mdOptions);
-						return res.data;
+			}
+
+			return true;
+		},
+		// 处理表单数据
+		processFormData() {
+			// 检查是否有科美品项
+			const hasKemei = this.dataForm.lqHytkMxList.some(px => px.qt2 === '科美');
+
+			// 设置是否有科技部
+			this.dataForm.sfykjb = hasKemei ? "是" : "否";
+
+			// 处理品项列表，转换为指定格式
+			this.dataForm.lqHytkMxList = this.dataForm.lqHytkMxList.map(px => {
+				// 计算退卡金额和总价
+				const tkje = parseFloat(px.pxjg) * parseInt(px.projectNumber) || 0;
+				const f_TotalPrice = tkje;
+
+				// 处理健康师列表
+				const lqHytkJksyjList = (px.lqHytkJksyjList || []).map(jks => ({
+					jks: jks.jks || '',
+					jksxm: jks.jksxm || '',
+					jkszh: jks.jkszh || '',
+					jksyj: parseFloat(jks.jksyj) || 0,
+					f_jsjid: jks.jsjId || '',
+					f_tkpxid: px.px || '',
+					f_LaborCost: parseFloat(jks.laborCost) || 0,
+					f_tkpxNumber: parseInt(px.projectNumber) || 0
+				}));
+
+				// 处理科技部老师列表
+				const lqHytkKjbsyjList = (px.lqHytkKjbsyjList || []).map(kjb => ({
+					kjbls: kjb.kjbls || '',
+					kjblsxm: kjb.kjblsxm || '',
+					kjblszh: kjb.kjblszh || '',
+					kjblsyj: parseFloat(kjb.kjblsyj) || 0,
+					f_tkpxid: px.px || '',
+					f_LaborCost: parseFloat(kjb.laborCost) || 0,
+					f_tkpxNumber: parseInt(px.projectNumber) || 0
+				}));
+
+				return {
+					px: px.px || '',
+					pxmc: px.pxmc || '',
+					pxjg: parseFloat(px.pxjg) || 0,
+					tkje: tkje,
+					f_ProjectNumber: parseInt(px.projectNumber) || 0,
+					f_SourceType: px.qt2 || '',
+					f_TotalPrice: f_TotalPrice,
+					lqHytkJksyjList: lqHytkJksyjList,
+					lqHytkKjbsyjList: lqHytkKjbsyjList
+				};
+			});
+		},
+		// 品项健康师相关方法
+		addPxJks(pxIndex) {
+			if (!this.dataForm.lqHytkMxList[pxIndex].lqHytkJksyjList) {
+				this.$set(this.dataForm.lqHytkMxList[pxIndex], 'lqHytkJksyjList', []);
+			}
+			// 获取当前品项的手工费
+			const currentPx = this.dataForm.lqHytkMxList[pxIndex];
+			const pxLaborCost = currentPx.sgf || 0;
+			const defaultNumber = 1;
+			const laborCost = pxLaborCost * defaultNumber; // 品项手工费 × 次数
+
+			let item = {
+				"jks": "",
+				"jksxm": "",
+				"jkszh": "",
+				"jksyj": "",
+				"jsjId": "",
+				"laborCost": laborCost, // 品项手工费 × 次数
+				"kdpxNumber": defaultNumber // 默认次数为1
+			}
+			this.dataForm.lqHytkMxList[pxIndex].lqHytkJksyjList.push(item);
+			console.log('添加健康师:', {
+				pxLaborCost,
+				defaultNumber,
+				laborCost,
+				formula: `${pxLaborCost} × ${defaultNumber} = ${laborCost}`
+			});
+		},
+		removePxJks(pxIndex, jksIndex) {
+			this.dataForm.lqHytkMxList[pxIndex].lqHytkJksyjList.splice(jksIndex, 1);
+		},
+		// 品项科技部老师相关方法
+		addPxKjb(pxIndex) {
+			if (!this.dataForm.lqHytkMxList[pxIndex].lqHytkKjbsyjList) {
+				this.$set(this.dataForm.lqHytkMxList[pxIndex], 'lqHytkKjbsyjList', []);
+			}
+			// 获取当前品项的手工费
+			const currentPx = this.dataForm.lqHytkMxList[pxIndex];
+			const pxLaborCost = currentPx.sgf || 0;
+			const defaultNumber = 1;
+			const laborCost = pxLaborCost * defaultNumber; // 品项手工费 × 次数
+
+			let item = {
+				"kjbls": "",
+				"kjblsyj": "",
+				"kjblsxm": "",
+				"kjblszh": "",
+				"laborCost": laborCost, // 品项手工费 × 次数
+				"hdpxNumber": defaultNumber // 默认次数为1
+			}
+			this.dataForm.lqHytkMxList[pxIndex].lqHytkKjbsyjList.push(item);
+			console.log('添加科技部老师:', {
+				pxLaborCost,
+				defaultNumber,
+				laborCost,
+				formula: `${pxLaborCost} × ${defaultNumber} = ${laborCost}`
+			});
+		},
+		removePxKjb(pxIndex, kjbIndex) {
+			this.dataForm.lqHytkMxList[pxIndex].lqHytkKjbsyjList.splice(kjbIndex, 1);
+		},
+		// 加载门店数据并设置默认门店
+		loadStoreDataAndSetDefault() {
+			console.log('开始加载门店数据和用户信息...');
+			// 先加载门店数据
+			this.loadStoreDataPromise().then(() => {
+				// 门店数据加载完成后，获取用户信息
+				return this.getCurrentUserStorePromise();
+			}).then((userData) => {
+				if (userData && userData.mdid) {
+					const userStoreId = userData.mdid;
+					console.log('用户门店ID:', userStoreId);
+					console.log('门店选项列表:', this.mdOptions);
+
+					// 检查用户门店ID是否在门店列表中
+					const matchingStore = this.mdOptions.find(store => store.id === userStoreId);
+					if (matchingStore) {
+						this.dataForm.md = userStoreId;
+						this.dataForm.mdmc = matchingStore.fullName;
+						this.dataForm.mdbh = matchingStore.id;
+						console.log('找到匹配的门店，设置默认门店ID:', userStoreId);
+						console.log('匹配的门店信息:', matchingStore);
 					} else {
-						console.warn('门店数据为空');
-						return [];
+						console.warn('用户门店ID在门店列表中未找到匹配项');
+						console.log('用户门店ID:', userStoreId);
+						console.log('可用门店ID列表:', this.mdOptions.map(s => s.id));
 					}
-				}).catch(err => {
-					console.error('门店数据加载失败:', err);
+				} else {
+					console.warn('用户数据中没有门店ID，无法设置默认值');
+				}
+
+				// 加载健康师和科技部老师选项
+				this.getjksOptions();
+				this.getkjbOptions();
+			}).catch(err => {
+				console.error('加载数据失败:', err);
+			});
+		},
+		// 加载门店数据
+		loadStoreDataPromise() {
+			// 使用原来的数据接口方式
+			return previewDataInterface('730960205902251269').then(res => {
+				console.log('门店API原始响应:', res);
+				if (res.data && res.data.length > 0) {
+					this.mdOptions = res.data;
+					console.log('门店数据加载成功:', this.mdOptions);
+					return res.data;
+				} else {
+					console.warn('门店数据为空');
 					return [];
+				}
+			}).catch(err => {
+				console.error('门店数据加载失败:', err);
+				return [];
+			});
+		},
+		// 获取当前用户门店信息
+		getCurrentUserStorePromise() {
+			return new Promise((resolve, reject) => {
+				getInfo().then(res => {
+					resolve(res.data.userInfo);
+				}).catch(err => {
+					console.error('获取当前用户信息失败:', err);
+					reject(err);
 				});
-			},
-			// 获取当前用户门店信息
-			getCurrentUserStorePromise() {
-				return new Promise((resolve, reject) => {
-					getInfo().then(res => {
-						resolve(res.data.userInfo);
-					}).catch(err => {
-						console.error('获取当前用户信息失败:', err);
-						reject(err);
-					});
-				});
-			},
-		}
+			});
+		},
 	}
+}
 </script>
 
 <style scoped>
@@ -1577,18 +1627,18 @@
 		width: 100%;
 		min-width: auto;
 	}
-	
+
 	.remaining-item-row {
 		flex-wrap: wrap;
 		gap: 8px;
 	}
-	
+
 	.item-name {
 		width: 100%;
 		margin-right: 0;
 		margin-bottom: 4px;
 	}
-	
+
 	.item-price,
 	.item-quantity,
 	.item-source {
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs
index 27b9c2b..f1de2ac 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListOutput.cs
@@ -95,5 +95,20 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// 门店名称
         /// </summary>
         public string StoreName { get; set; }
+
+        /// <summary>
+        /// 时间期间（开单日期，用于时间范围筛选）
+        /// </summary>
+        public DateTime? TimePeriod { get; set; }
+
+        /// <summary>
+        /// 开单类型（购买、赠送、体验等）
+        /// </summary>
+        public string BillingType { get; set; }
+
+        /// <summary>
+        /// 合作机构
+        /// </summary>
+        public string CooperationInstitution { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordSummaryQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordSummaryQueryInput.cs
index 253cef3..d54b066 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordSummaryQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/BillingRecordSummaryQueryInput.cs
@@ -27,5 +27,29 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// </summary>
         [Display(Name = "结束时间", Description = "查询开单记录的结束时间")]
         public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 品项分类
+        /// </summary>
+        [Display(Name = "品项分类", Description = "筛选品项分类")]
+        public string ItemCategory { get; set; }
+
+        /// <summary>
+        /// 品项ID
+        /// </summary>
+        [Display(Name = "品项ID", Description = "筛选品项ID")]
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 健康师ID
+        /// </summary>
+        [Display(Name = "健康师ID", Description = "筛选健康师ID")]
+        public string HealthCoachId { get; set; }
+
+        /// <summary>
+        /// 客户ID（会员ID）
+        /// </summary>
+        [Display(Name = "客户ID", Description = "筛选客户ID")]
+        public string MemberId { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/HealthCoachStatisticsOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/HealthCoachStatisticsOutput.cs
index 7a59134..9afc45a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/HealthCoachStatisticsOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/HealthCoachStatisticsOutput.cs
@@ -94,5 +94,20 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 退卡金额 - 统计该健康师在指定时间周期内的退卡业绩总金额
         /// </summary>
         public decimal refundAmount { get; set; }
+
+        /// <summary>
+        /// 手工费 - 统计该健康师在指定时间周期内消耗时的手工费总金额
+        /// </summary>
+        public decimal laborCost { get; set; }
+
+        /// <summary>
+        /// 原始手工费 - 统计该健康师在指定时间周期内消耗时的原始手工费总金额
+        /// </summary>
+        public decimal originalLaborCost { get; set; }
+
+        /// <summary>
+        /// 加班手工费 - 统计该健康师在指定时间周期内消耗时的加班手工费总金额
+        /// </summary>
+        public decimal overtimeLaborCost { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/HealthCoachSalaryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/HealthCoachSalaryInput.cs
new file mode 100644
index 0000000..b613cc6
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/HealthCoachSalaryInput.cs
@@ -0,0 +1,31 @@
+using NCC.Common.Filter;
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqSalary
+{
+    /// <summary>
+    /// 健康师工资查询参数
+    /// </summary>
+    public class HealthCoachSalaryInput : PageInputBase
+    {
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int Year { get; set; }
+
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public int Month { get; set; }
+
+        /// <summary>
+        /// 门店ID（可选，用于筛选特定门店）
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 健康师姓名/账号（可选，用于模糊搜索）
+        /// </summary>
+        public string Keyword { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/HealthCoachSalaryOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/HealthCoachSalaryOutput.cs
new file mode 100644
index 0000000..652896e
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/HealthCoachSalaryOutput.cs
@@ -0,0 +1,115 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqSalary
+{
+    /// <summary>
+    /// 健康师工资输出
+    /// </summary>
+    public class HealthCoachSalaryOutput
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 员工姓名
+        /// </summary>
+        public string EmployeeName { get; set; }
+
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string Position { get; set; }
+
+        /// <summary>
+        /// 金三角战队
+        /// </summary>
+        public string GoldTriangleTeam { get; set; }
+
+        /// <summary>
+        /// 总业绩
+        /// </summary>
+        public decimal TotalPerformance { get; set; }
+
+        /// <summary>
+        /// 基础业绩
+        /// </summary>
+        public decimal BasePerformance { get; set; }
+
+        /// <summary>
+        /// 合作业绩
+        /// </summary>
+        public decimal CooperationPerformance { get; set; }
+
+        /// <summary>
+        /// 奖励业绩
+        /// </summary>
+        public decimal RewardPerformance { get; set; }
+
+        /// <summary>
+        /// 消耗
+        /// </summary>
+        public decimal Consumption { get; set; }
+
+        /// <summary>
+        /// 项目数
+        /// </summary>
+        public decimal ProjectCount { get; set; }
+
+        /// <summary>
+        /// 到店人头
+        /// </summary>
+        public decimal CustomerCount { get; set; }
+
+        /// <summary>
+        /// 在店天数
+        /// </summary>
+        public decimal WorkingDays { get; set; }
+
+        /// <summary>
+        /// 健康师底薪
+        /// </summary>
+        public decimal HealthCoachBaseSalary { get; set; }
+
+        /// <summary>
+        /// 提成合计
+        /// </summary>
+        public decimal TotalCommission { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal HandworkFee { get; set; }
+
+        /// <summary>
+        /// 补贴合计
+        /// </summary>
+        public decimal TotalSubsidy { get; set; }
+
+        /// <summary>
+        /// 扣款合计
+        /// </summary>
+        public decimal TotalDeduction { get; set; }
+
+        /// <summary>
+        /// 实发工资
+        /// </summary>
+        public decimal ActualSalary { get; set; }
+
+        /// <summary>
+        /// 是否锁定
+        /// </summary>
+        public int IsLocked { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs
index f9deb51..a433bd6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_jksyj/LqHytkJksyjEntity.cs
@@ -137,5 +137,11 @@ namespace NCC.Extend.Entitys.lq_hytk_jksyj
         /// </summary>
         [SugarColumn(ColumnName = "F_ItemName")]
         public string ItemName { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs
index e03767c..949d03e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_kjbsyj/LqHytkKjbsyjEntity.cs
@@ -132,5 +132,11 @@ namespace NCC.Extend.Entitys.lq_hytk_kjbsyj
         /// </summary>
         [SugarColumn(ColumnName = "F_ItemName")]
         public string ItemName { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs
index 1d90d14..06b8317 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_mx/LqHytkMxEntity.cs
@@ -120,5 +120,11 @@ namespace NCC.Extend.Entitys.lq_hytk_mx
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
         public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode();
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs
index dcc15ee..62095b3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_jksyj/LqKdJksyjEntity.cs
@@ -100,5 +100,11 @@ namespace NCC.Extend.Entitys.lq_kd_jksyj
         /// </summary>
         [SugarColumn(ColumnName = "F_ItemName")]
         public string ItemName { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kjbsyj/LqKdKjbsyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kjbsyj/LqKdKjbsyjEntity.cs
index 50bf738..4f736fb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kjbsyj/LqKdKjbsyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kjbsyj/LqKdKjbsyjEntity.cs
@@ -100,5 +100,11 @@ namespace NCC.Extend.Entitys.lq_kd_kjbsyj
         /// </summary>
         [SugarColumn(ColumnName = "F_ItemName")]
         public string ItemName { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
index e7d26c8..924121c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
@@ -113,5 +113,11 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx
         /// </summary>
         [SugarColumn(ColumnName = "F_ActivityId")]
         public string ActivityId { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs
index 9614487..0f2d487 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs
@@ -148,5 +148,11 @@ namespace NCC.Extend.Entitys.lq_xh_jksyj
         /// </summary>
         [SugarColumn(ColumnName = "F_ItemName")]
         public string ItemName { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs
index 2a5064e..7d9588e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs
@@ -130,5 +130,11 @@ namespace NCC.Extend.Entitys.lq_xh_kjbsyj
         /// </summary>
         [SugarColumn(ColumnName = "F_ItemName")]
         public string ItemName { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs
index 77a2fd2..d2f3217 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs
@@ -106,5 +106,11 @@ namespace NCC.Extend.Entitys.lq_xh_pxmx
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
         public int? IsEffective { get; set; } = 1;
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yjmxb/LqYjmxbEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yjmxb/LqYjmxbEntity.cs
index 25a63a1..eb4da12 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yjmxb/LqYjmxbEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_yjmxb/LqYjmxbEntity.cs
@@ -112,6 +112,12 @@ namespace NCC.Extend.Entitys.lq_yjmxb
         /// </summary>
         [SugarColumn(ColumnName = "zyj")]        
         public string Zyj { get; set; }
+
+        /// <summary>
+        /// 业绩类型
+        /// </summary>
+        [SugarColumn(ColumnName = "F_PerformanceType")]
+        public string PerformanceType { get; set; }
         
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceSummaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceSummaryService.cs
index 26fac40..b17c064 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceSummaryService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqAttendanceSummaryService.cs
@@ -374,6 +374,169 @@ namespace NCC.Extend
         }
         #endregion
 
+        #region 生成健康师考勤模拟数据
+        /// <summary>
+        /// 生成健康师考勤模拟数据
+        /// </summary>
+        /// <remarks>
+        /// 为所有健康师生成指定年月的考勤模拟数据
+        /// 
+        /// 规则：
+        /// - 80%以上的健康师出勤天数 >= 21天
+        /// - 其他健康师出勤天数随机生成（0-20天）
+        /// - 员工状态默认为1（在职）
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "year": 2025,
+        ///   "month": 11
+        /// }
+        /// ```
+        /// </remarks>
+        /// <param name="year">年份</param>
+        /// <param name="month">月份</param>
+        /// <returns>生成结果</returns>
+        /// <response code="200">成功生成考勤模拟数据</response>
+        /// <response code="400">参数错误</response>
+        /// <response code="500">生成失败</response>
+        [HttpPost("GenerateMockData/{year}/{month}")]
+        public async Task<dynamic> GenerateMockData(int year, int month)
+        {
+            try
+            {
+                // 验证参数
+                if (year < 2000 || year > 3000)
+                {
+                    throw NCCException.Oh("年份参数无效");
+                }
+                if (month < 1 || month > 12)
+                {
+                    throw NCCException.Oh("月份参数无效，应在1-12之间");
+                }
+
+                // 查询所有健康师
+                var healthCoaches = await _db.Queryable<UserEntity>()
+                    .Where(u => u.Gw == "健康师" && u.EnabledMark == 1 && (u.DeleteMark == null || u.DeleteMark == 0))
+                    .Select(u => new { u.Id, u.RealName })
+                    .ToListAsync();
+
+                if (!healthCoaches.Any())
+                {
+                    throw NCCException.Oh("未找到健康师用户");
+                }
+
+                // 检查是否已存在该年月的考勤数据
+                var existingRecords = await _db.Queryable<LqAttendanceSummaryEntity>()
+                    .Where(a => a.Year == year && a.Month == month)
+                    .CountAsync();
+
+                if (existingRecords > 0)
+                {
+                    throw NCCException.Oh($"已存在{year}年{month}月的考勤数据，请先清空后再生成");
+                }
+
+                var totalCount = healthCoaches.Count;
+                var highAttendanceCount = (int)Math.Ceiling(totalCount * 0.8); // 80%以上，向上取整
+                var lowAttendanceCount = totalCount - highAttendanceCount;
+
+                var random = new Random();
+                var entitiesToInsert = new List<LqAttendanceSummaryEntity>();
+                var now = DateTime.Now;
+
+                // 生成考勤数据
+                for (int i = 0; i < totalCount; i++)
+                {
+                    var healthCoach = healthCoaches[i];
+                    decimal workDays;
+                    decimal leaveDays;
+                    decimal restDays;
+
+                    if (i < highAttendanceCount)
+                    {
+                        // 80%以上的健康师：出勤天数 >= 21天
+                        workDays = random.Next(21, 31); // 21-30天
+                        var remainingDays = 30 - workDays;
+                        // 剩余天数分配给请假和休息
+                        if (remainingDays > 0)
+                        {
+                            leaveDays = random.Next(0, (int)remainingDays + 1);
+                            restDays = remainingDays - leaveDays;
+                        }
+                        else
+                        {
+                            leaveDays = 0;
+                            restDays = 0;
+                        }
+                    }
+                    else
+                    {
+                        // 其他20%的健康师：出勤天数 < 21天
+                        workDays = random.Next(0, 21); // 0-20天
+                        var remainingDays = 30 - workDays;
+                        // 剩余天数分配给请假和休息
+                        if (remainingDays > 0)
+                        {
+                            leaveDays = random.Next(0, (int)remainingDays + 1);
+                            restDays = remainingDays - leaveDays;
+                        }
+                        else
+                        {
+                            leaveDays = 0;
+                            restDays = 0;
+                        }
+                    }
+
+                    var entity = new LqAttendanceSummaryEntity
+                    {
+                        Id = YitIdHelper.NextId().ToString(),
+                        UserId = healthCoach.Id,
+                        Year = year,
+                        Month = month,
+                        EmployeeStatus = 1, // 在职
+                        WorkDays = workDays,
+                        LeaveDays = leaveDays,
+                        RestDays = restDays,
+                        Remark = "模拟数据",
+                        CreateUser = _userManager.UserId ?? "system",
+                        CreateTime = now,
+                        UpdateUser = _userManager.UserId ?? "system",
+                        UpdateTime = now,
+                        IsEffective = 1
+                    };
+                    entitiesToInsert.Add(entity);
+                }
+
+                // 批量插入
+                await _db.Insertable(entitiesToInsert).ExecuteCommandAsync();
+
+                // 统计结果
+                var highAttendanceActual = entitiesToInsert.Count(e => e.WorkDays >= 21);
+                var highAttendancePercentage = (decimal)highAttendanceActual / totalCount * 100;
+
+                return new
+                {
+                    success = true,
+                    message = "生成考勤模拟数据成功",
+                    data = new
+                    {
+                        year = year,
+                        month = month,
+                        totalCount = totalCount,
+                        highAttendanceCount = highAttendanceActual,
+                        highAttendancePercentage = Math.Round(highAttendancePercentage, 2),
+                        generatedCount = entitiesToInsert.Count
+                    }
+                };
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, $"生成健康师考勤模拟数据失败 - 年份: {year}, 月份: {month}");
+                throw NCCException.Oh($"生成健康师考勤模拟数据失败：{ex.Message}");
+            }
+        }
+        #endregion
+
 
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs
index 3c39985..af4eb99 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs
@@ -299,60 +299,6 @@ namespace NCC.Extend.LqHytkHytk
         /// 创建退卡信息及其关联的品项明细、健康师业绩、科技部老师业绩信息
         /// </summary>
         /// <remarks>
-        /// 创建退卡记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
-        ///
-        /// 示例请求：
-        /// ```json
-        /// {
-        ///   "md": "门店ID",
-        ///   "mdbh": "门店编号",
-        ///   "mdmc": "门店名称",
-        ///   "hy": "会员ID",
-        ///   "hymc": "会员姓名",
-        ///   "hyzh": "会员账号",
-        ///   "gklx": "顾客类型",
-        ///   "tkje": 1000.00,
-        ///   "sgfy": 50.00,
-        ///   "bz": "备注",
-        ///   "tkzt": "退卡状态",
-        ///   "tkyy": "退卡原因",
-        ///   "lqHytkMxList": [
-        ///     {
-        ///       "px": "品项编号",
-        ///       "pxmc": "品项名称",
-        ///       "pxjg": 100.00,
-        ///       "tkje": 100.00,
-        ///       "F_ProjectNumber": 1,
-        ///       "F_SourceType": "来源类型",
-        ///       "F_TotalPrice": 100.00,
-        ///       "lqHytkJksyjList": [
-        ///         {
-        ///           "jks": "健康师",
-        ///           "jksxm": "健康师姓名",
-        ///           "jkszh": "健康师账号",
-        ///           "jksyj": 50.00,
-        ///           "F_jsjid": "金三角ID",
-        ///           "F_tkpxid": "项目资料ID",
-        ///           "F_LaborCost": 10.00,
-        ///           "F_tkpxNumber": 1
-        ///         }
-        ///       ],
-        ///       "lqHytkKjbsyjList": [
-        ///         {
-        ///           "kjbls": "科技部老师",
-        ///           "kjblsxm": "科技部老师姓名",
-        ///           "kjblszh": "科技部老师账号",
-        ///           "kjblsyj": 30.00,
-        ///           "F_tkpxid": "项目资料ID",
-        ///           "F_LaborCost": 5.00,
-        ///           "F_tkpxNumber": 1
-        ///         }
-        ///       ]
-        ///     }
-        ///   ]
-        /// }
-        /// ```
-        ///
         /// 参数说明：
         /// - md: 门店ID
         /// - hy: 会员ID
@@ -378,15 +324,12 @@ namespace NCC.Extend.LqHytkHytk
             {
                 // 开启事务
                 _db.BeginTran();
-
                 // 新增退卡主表记录
                 var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
-
                 // 收集所有需要插入的实体，然后批量插入
                 var allMxEntities = new List<LqHytkMxEntity>();
                 var allJksyjEntities = new List<LqHytkJksyjEntity>();
                 var allKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
-
                 // 处理品项明细列表
                 if (input.lqHytkMxList != null && input.lqHytkMxList.Any())
                 {
@@ -405,11 +348,13 @@ namespace NCC.Extend.LqHytkHytk
                             Pxmc = item.pxmc,
                             Pxjg = item.pxjg,
                             Tkje = item.tkje,
+                            Tksj = input.tksj,
                             ProjectNumber = item.F_ProjectNumber ?? 1,
                             SourceType = item.F_SourceType,
                             TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)),
                             IsEffective = StatusEnum.有效.GetHashCode(),
                             ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
+                            PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                         };
                         allMxEntities.Add(lqHytkMxEntity);
 
@@ -426,7 +371,7 @@ namespace NCC.Extend.LqHytkHytk
                                     Jksxm = ijks_tem.jksxm,
                                     Jkszh = ijks_tem.jkszh,
                                     Jksyj = ijks_tem.jksyj,
-                                    Tksj = DateTime.Now,
+                                    Tksj = input.tksj,
                                     F_jsjid = ijks_tem.F_jsjid,
                                     F_tkpxid = ijks_tem.F_tkpxid,
                                     F_LaborCost = ijks_tem.F_LaborCost,
@@ -438,7 +383,8 @@ namespace NCC.Extend.LqHytkHytk
                                     ItemCategory = lqHytkMxEntity.ItemCategory,
                                     ItemId = lqHytkMxEntity.Px,
                                     StoreId = newEntity.Md,
-                                    ItemName = lqHytkMxEntity.Pxmc
+                                    ItemName = lqHytkMxEntity.Pxmc,
+                                    PerformanceType = lqHytkMxEntity.PerformanceType
                                 }
                                 );
                             }
@@ -458,7 +404,7 @@ namespace NCC.Extend.LqHytkHytk
                                         Kjblsxm = ikjbs_tem.kjblsxm,
                                         Kjblszh = ikjbs_tem.kjblszh,
                                         Kjblsyj = ikjbs_tem.kjblsyj,
-                                        Tksj = DateTime.Now,
+                                        Tksj = input.tksj,
                                         F_tkpxid = ikjbs_tem.F_tkpxid,
                                         F_LaborCost = ikjbs_tem.F_LaborCost,
                                         F_tkpxNumber = ikjbs_tem.F_tkpxNumber,
@@ -469,14 +415,14 @@ namespace NCC.Extend.LqHytkHytk
                                         ItemCategory = lqHytkMxEntity.ItemCategory,
                                         ItemId = lqHytkMxEntity.Px,
                                         StoreId = newEntity.Md,
-                                        ItemName = lqHytkMxEntity.Pxmc
+                                        ItemName = lqHytkMxEntity.Pxmc,
+                                        PerformanceType = lqHytkMxEntity.PerformanceType
                                     }
                                 );
                             }
                         }
                     }
                 }
-
                 // 批量插入品项明细
                 if (allMxEntities.Any())
                 {
@@ -570,6 +516,7 @@ namespace NCC.Extend.LqHytkHytk
                             SourceType = item.F_SourceType,
                             TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)),
                             ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
+                            PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                         };
                         allMxEntities.Add(lqHytkMxEntity);
 
@@ -587,7 +534,7 @@ namespace NCC.Extend.LqHytkHytk
                                         Jksxm = ijks_tem.jksxm,
                                         Jkszh = ijks_tem.jkszh,
                                         Jksyj = ijks_tem.jksyj,
-                                        Tksj = DateTime.Now,
+                                        Tksj = input.tksj,
                                         F_jsjid = ijks_tem.F_jsjid,
                                         F_tkpxid = ijks_tem.F_tkpxid,
                                         F_LaborCost = ijks_tem.F_LaborCost,
@@ -597,7 +544,8 @@ namespace NCC.Extend.LqHytkHytk
                                         ItemCategory = lqHytkMxEntity.ItemCategory,
                                         ItemId = lqHytkMxEntity.Px,
                                         StoreId = entity.Md,
-                                        ItemName = lqHytkMxEntity.Pxmc
+                                        ItemName = lqHytkMxEntity.Pxmc,
+                                        PerformanceType = lqHytkMxEntity.PerformanceType
                                     }
                                 );
                             }
@@ -617,7 +565,7 @@ namespace NCC.Extend.LqHytkHytk
                                         Kjblsxm = ikjbs_tem.kjblsxm,
                                         Kjblszh = ikjbs_tem.kjblszh,
                                         Kjblsyj = ikjbs_tem.kjblsyj,
-                                        Tksj = DateTime.Now,
+                                        Tksj = input.tksj,
                                         F_tkpxid = ikjbs_tem.F_tkpxid,
                                         F_LaborCost = ikjbs_tem.F_LaborCost,
                                         F_tkpxNumber = ikjbs_tem.F_tkpxNumber,
@@ -626,7 +574,8 @@ namespace NCC.Extend.LqHytkHytk
                                         ItemCategory = lqHytkMxEntity.ItemCategory,
                                         ItemId = lqHytkMxEntity.Px,
                                         StoreId = entity.Md,
-                                        ItemName = lqHytkMxEntity.Pxmc
+                                        ItemName = lqHytkMxEntity.Pxmc,
+                                        PerformanceType = lqHytkMxEntity.PerformanceType
                                     }
                                 );
                             }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
index 6f18fb7..84fb70c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
@@ -47,6 +47,7 @@ using NCC.Extend.Entitys.lq_mdxx;
 using NCC.Extend.Entitys.lq_card_transfer_log;
 using NCC.Extend.Entitys.Dto.LqDailyReport;
 using NCC.Extend.Entitys.lq_yyjl;
+using NCC.Extend.Entitys.lq_hzf;
 
 namespace NCC.Extend.LqKdKdjlb
 {
@@ -931,6 +932,7 @@ namespace NCC.Extend.LqKdKdjlb
                         IsEffective = StatusEnum.有效.GetHashCode(),
                         ActivityId = input.activityId,
                         ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
+                        PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                     };
                     allPxmxEntities.Add(lqKdPxmxEntity);
                     // 收集该品项关联的健康师业绩
@@ -956,7 +958,8 @@ namespace NCC.Extend.LqKdKdjlb
                                 ItemCategory = lqKdPxmxEntity.ItemCategory,
                                 ItemId = lqKdPxmxEntity.Px,
                                 ItemName = lqKdPxmxEntity.Pxmc,
-                                StoreId = entity.Djmd
+                                StoreId = entity.Djmd,
+                                PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                             });
                         }
                     }
@@ -981,7 +984,8 @@ namespace NCC.Extend.LqKdKdjlb
                                 ItemCategory = lqKdPxmxEntity.ItemCategory,
                                 ItemId = lqKdPxmxEntity.Px,
                                 ItemName = lqKdPxmxEntity.Pxmc,
-                                StoreId = entity.Djmd
+                                StoreId = entity.Djmd,
+                                PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                             }
                             );
                         }
@@ -1117,6 +1121,266 @@ namespace NCC.Extend.LqKdKdjlb
         }
         #endregion
 
+        #region 修改开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
+        /// <summary>
+        /// 修改开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
+        /// </summary>
+        /// <remarks>
+        /// 参数说明：
+        /// - id: 开单记录主键ID
+        /// - input: 开单记录更新参数，包含品项明细和业绩信息
+        /// </remarks>
+        /// <param name="id">开单记录主键ID</param>
+        /// <param name="input">开单记录更新参数</param>
+        /// <returns>无返回值</returns>
+        /// <response code="200">更新成功</response>
+        /// <response code="400">参数错误或数据验证失败</response>
+        /// <response code="500">服务器内部错误</response>
+        [HttpPut("UpdateForNoDelete/{id}")]
+        public async Task UpdateForNoDelete(string id, [FromBody] LqKdKdjlbUpInput input)
+        {
+            var entity = input.Adapt<LqKdKdjlbEntity>();
+            entity.Id = id; // 确保ID正确设置
+            try
+            {
+                //检查开单记录是否可以操作
+                var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(id);
+                if (!canCancel)
+                {
+                    throw NCCException.Oh(errorMessage);
+                }
+                //开启事务
+                _db.BeginTran();
+                //查询是否有对应的补缴开单ID
+                if (!string.IsNullOrEmpty(entity.SupplementBillingId))
+                {
+                    //查询补缴开单ID
+                    var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == entity.SupplementBillingId);//900,900
+                    if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode())
+                    {
+                        throw NCCException.Oh("补缴开单记录不存在或已作废");
+                    }
+                    //查询当前开单已经补缴金额
+                    var OldSupplementAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.Id == id).SumAsync(p => p.SupplementAmount);//900,0
+                    supplementBillingEntity.PaidDebt = supplementBillingEntity.PaidDebt - OldSupplementAmount + input.supplementAmount;
+                    await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
+                }
+                //批量查询当前开单所有品项的分类（性能优化）
+                var itemIds = input.lqKdPxmxList?.Where(x => !string.IsNullOrEmpty(x.px)).Select(x => x.px).Distinct().ToList() ?? new List<string>();
+                var itemCategoryDict = new Dictionary<string, string>();
+                if (itemIds.Any())
+                {
+                    var itemCategories = await _db.Queryable<LqXmzlEntity>()
+                        .Where(x => itemIds.Contains(x.Id) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                        .Select(x => new { x.Id, x.Qt2 })
+                        .ToListAsync();
+                    itemCategoryDict = itemCategories.ToDictionary(k => k.Id, v => v.Qt2 ?? "");
+                }
+                //判断当前开单是否包含医美品项
+                var hasMedicalItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美");
+                var MedicalItemInCurrentBillingAmount = input.lqKdPxmxList.Where(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美").Sum(x => x.actualPrice);
+                //判断当前开单是否包含科美品项
+                var hasTechItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "科美");
+                //判断当前开单是否包含生美品项
+                var hasLifeItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x => !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "生美");
+                //获取该会员之前开单品项里面是否有医美项目
+                var isMedicalProject = hasMedicalItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "医美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
+                if (isMedicalProject && MedicalItemInCurrentBillingAmount >= 1000)
+                {
+                    entity.UpgradeLifeBeauty = "是";
+                }
+                else
+                {
+                    entity.UpgradeLifeBeauty = "否";
+                }
+                //获取该会员之前开单品项里面是否有科美项目
+                var isTechProject = hasTechItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "科美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
+                if (isTechProject)
+                {
+                    entity.UpgradeTechBeauty = "是";
+                }
+                else
+                {
+                    entity.UpgradeTechBeauty = "否";
+                }
+                //获取该会员之前开单品项里面是否有生美项目
+                var isLifeProject = hasLifeItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "生美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
+                if (isLifeProject)
+                {
+                    entity.UpgradeMedicalBeauty = "是";
+                }
+                else
+                {
+                    entity.UpgradeMedicalBeauty = "否";
+                }
+                //计算储扣总金额
+                entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);
+                entity.UpdateTime = DateTime.Now;
+                // 更新开单记录主表
+                await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).IgnoreColumns(x => x.CreateTime).ExecuteCommandAsync();
+                //清空原有品项明细
+                await _db.Deleteable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
+                //清空原有健康师业绩
+                await _db.Deleteable<LqKdJksyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
+                //清空原有科技部老师业绩
+                await _db.Deleteable<LqKdKjbsyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
+                //清空原有扣款信息
+                await _db.Deleteable<LqKdDeductinfoEntity>().Where(x => x.BillingId == id).ExecuteCommandAsync();
+                //循环品相信息
+                // 收集所有需要插入的实体，然后批量插入
+                var allPxmxEntities = new List<LqKdPxmxEntity>();
+                var allJksyjEntities = new List<LqKdJksyjEntity>();
+                var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
+                var allDeductEntities = new List<LqKdDeductinfoEntity>();
+                // 处理扣款信息列表
+                foreach (var item in input.lqKdKdjlbDeductList)
+                {
+                    var lqKdDeductEntity = new LqKdDeductinfoEntity
+                    {
+                        Id = YitIdHelper.NextId().ToString(),
+                        BillingId = id,
+                        DeductId = item.DeductId,
+                        DeductType = item.DeductType,
+                        Amount = item.Amount,
+                        ProjectNumber = item.ProjectNumber,
+                        UnitPrice = item.UnitPrice,
+                        ItemName = item.ItemName,
+                        ItemId = item.ItemId,
+                        IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
+                        CreateTime = DateTime.Now, // 设置创建时间
+                        ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.DeductId).Select(x => x.Qt2).FirstAsync(),
+                    };
+                    allDeductEntities.Add(lqKdDeductEntity);
+                }
+                // 处理品项明细列表
+                foreach (var item in input.lqKdPxmxList)
+                {
+                    // 创建品项明细实体
+                    var lqKdPxmxEntity = new LqKdPxmxEntity
+                    {
+                        Id = YitIdHelper.NextId().ToString(),
+                        Glkdbh = id,
+                        Yjsj = input.kdrq,
+                        CreateTIme = DateTime.Now,
+                        MemberId = entity.Kdhy,
+                        IsEnabled = StatusEnum.有效.GetHashCode(),
+                        ProjectNumber = item.projectNumber,
+                        TotalPrice = (decimal)(item.pxjg * item.projectNumber),
+                        Px = item.px,
+                        Pxmc = item.pxmc,
+                        Pxjg = item.pxjg,
+                        SourceType = item.sourceType,
+                        ActualPrice = item.actualPrice,
+                        Remark = item.remark,
+                        IsEffective = StatusEnum.有效.GetHashCode(),
+                        ActivityId = input.activityId,
+                        ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
+                        PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
+                    };
+                    allPxmxEntities.Add(lqKdPxmxEntity);
+
+                    // 收集该品项关联的健康师业绩
+                    if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
+                    {
+                        //把jksxm保存到HealthInstructorNames
+                        foreach (var ijks_tem in item.lqKdJksyjList)
+                        {
+                            allJksyjEntities.Add(new LqKdJksyjEntity
+                            {
+                                Id = YitIdHelper.NextId().ToString(),
+                                Glkdbh = id,
+                                Jks = ijks_tem.jks,
+                                Jksxm = ijks_tem.jksxm,
+                                Jkszh = ijks_tem.jkszh,
+                                Jksyj = ijks_tem.jksyj,
+                                Yjsj = input.kdrq,
+                                Jsj_id = ijks_tem.jsj_id,
+                                Kdpxid = lqKdPxmxEntity.Id,
+                                IsEffective = StatusEnum.有效.GetHashCode(),
+                                ActivityId = input.activityId,
+                                ItemCategory = lqKdPxmxEntity.ItemCategory,
+                                ItemId = lqKdPxmxEntity.Px,
+                                StoreId = entity.Djmd,
+                                ItemName = lqKdPxmxEntity.Pxmc,
+                                PerformanceType = lqKdPxmxEntity.PerformanceType,
+                            });
+                        }
+                    }
+
+                    // 收集该品项关联的科技部老师业绩
+                    if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
+                    {
+                        foreach (var ikjbs_tem in item.lqKdKjbsyjList)
+                        {
+                            allKjbsyjEntities.Add(new LqKdKjbsyjEntity
+                            {
+                                Id = YitIdHelper.NextId().ToString(),
+                                Glkdbh = id,
+                                Kjbls = ikjbs_tem.kjbls,
+                                Kjblsxm = ikjbs_tem.kjblsxm,
+                                Kjblszh = ikjbs_tem.kjblszh,
+                                Kjblsyj = ikjbs_tem.kjblsyj,
+                                Yjsj = input.kdrq,
+                                Kdpxid = lqKdPxmxEntity.Id,
+                                IsEffective = StatusEnum.有效.GetHashCode(),
+                                ActivityId = input.activityId,
+                                ItemCategory = lqKdPxmxEntity.ItemCategory,
+                                ItemId = lqKdPxmxEntity.Px,
+                                StoreId = entity.Djmd,
+                                ItemName = lqKdPxmxEntity.Pxmc,
+                                PerformanceType = lqKdPxmxEntity.PerformanceType,
+                            });
+                        }
+                    }
+                }
+
+                //通过会员id查询会员信息
+                var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
+                //通过开单记录表查询这个会员开单金额
+                var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
+                //如果开单金额小于500，为散客，如果大于500，为会员
+                if (kdAmount < 500)
+                {
+                    memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
+                }
+                else
+                {
+                    memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
+                }
+                await _db.Updateable(memberInfo).ExecuteCommandAsync();
+                // 批量插入扣款信息
+                if (allDeductEntities.Any())
+                {
+                    await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
+                }
+                // 批量插入品项明细
+                if (allPxmxEntities.Any())
+                {
+                    await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
+                }
+                // 批量插入健康师业绩
+                if (allJksyjEntities.Any())
+                {
+                    await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
+                }
+                // 批量插入科技部老师业绩
+                if (allKjbsyjEntities.Any())
+                {
+                    await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
+                }
+
+                //关闭事务
+                _db.CommitTran();
+            }
+            catch (Exception ex)
+            {
+                //回滚事务
+                _db.RollbackTran();
+                throw NCCException.Oh($"创建开单记录失败: {ex.Message}");
+            }
+        }
+        #endregion
+
         #region 获取开单记录表无分页列表
         /// <summary>
         /// 获取开单记录表无分页列表
@@ -1256,581 +1520,93 @@ namespace NCC.Extend.LqKdKdjlb
                         var consumeRecords = await _db.Queryable<LqXhPxmxEntity>().Where(x => x.IsEffective == StatusEnum.有效.GetHashCode()).Where(x => billingItemIds.Contains(x.BillingItemId)).AnyAsync();
                         if (consumeRecords)
                         {
-                            throw NCCException.Oh("选中的开单记录中有已消耗的记录，不能删除");
-                        }
-                    }
-                    // 检查是否有储扣记录
-                    var deductRecords = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => ids.Contains(x.BillingId) && x.IsEffective == StatusEnum.有效.GetHashCode()).AnyAsync();
-                    if (deductRecords)
-                    {
-                        throw NCCException.Oh("选中的开单记录中有储扣记录，不能删除");
-                    }
-                    //批量删除开单记录表
-                    await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
-
-                    //清空健康师业绩
-                    await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
-
-                    //清空科技部老师业绩
-                    await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
-
-                    //清空品项明细
-                    await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
-
-                    //清空扣款信息
-                    await _db.Deleteable<LqKdDeductinfoEntity>().In(u => u.BillingId, ids).ExecuteCommandAsync();
-
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception ex)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh($"批量删除开单记录表失败: {ex.Message}");
-                }
-            }
-        }
-        #endregion
-
-        #region 更新开单记录表
-        /// <summary>
-        /// 更新开单记录表
-        /// </summary>
-        /// <remarks>
-        /// 更新开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
-        ///
-        /// 示例请求：
-        /// ```json
-        /// {
-        ///   "id": "开单编号",
-        ///   "djmd": "单据门店",
-        ///   "jsj": "金三角",
-        ///   "kdrq": "2025-01-11",
-        ///   "lqKdPxmxList": [
-        ///     {
-        ///       "px": "品项编号",
-        ///       "pxmc": "品项名称",
-        ///       "pxjg": 100.00,
-        ///       "projectNumber": 1,
-        ///       "sourceType": "购买",
-        ///       "lqKdJksyjList": [
-        ///         {
-        ///           "jks": "健康师",
-        ///           "jksxm": "健康师姓名",
-        ///           "jksyj": "100"
-        ///         }
-        ///       ]
-        ///     }
-        ///   ]
-        /// }
-        /// ```
-        ///
-        /// 参数说明：
-        /// - id: 开单记录主键ID
-        /// - input: 开单记录更新参数，包含品项明细和业绩信息
-        /// </remarks>
-        /// <param name="id">开单记录主键ID</param>
-        /// <param name="input">开单记录更新参数</param>
-        /// <returns>无返回值</returns>
-        /// <response code="200">更新成功</response>
-        /// <response code="400">参数错误或数据验证失败</response>
-        /// <response code="500">服务器内部错误</response>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] LqKdKdjlbUpInput input)
-        {
-            var entity = input.Adapt<LqKdKdjlbEntity>();
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-                //批量查询当前开单所有品项的分类（性能优化）
-                var itemIds = input.lqKdPxmxList?.Where(x => !string.IsNullOrEmpty(x.px)).Select(x => x.px).Distinct().ToList() ?? new List<string>();
-                var itemCategoryDict = new Dictionary<string, string>();
-                if (itemIds.Any())
-                {
-                    var itemCategories = await _db.Queryable<LqXmzlEntity>()
-                        .Where(x => itemIds.Contains(x.Id) && x.IsEffective == StatusEnum.有效.GetHashCode())
-                        .Select(x => new { x.Id, x.Qt2 })
-                        .ToListAsync();
-                    itemCategoryDict = itemCategories.ToDictionary(k => k.Id, v => v.Qt2 ?? "");
-                }
-                //判断当前开单是否包含医美品项
-                var hasMedicalItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x =>
-                    !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美");
-                var MedicalItemInCurrentBillingAmount = input.lqKdPxmxList.Where(x =>
-                    !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "医美").Sum(x => x.actualPrice);
-                //判断当前开单是否包含科美品项
-                var hasTechItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x =>
-                    !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "科美");
-                //判断当前开单是否包含生美品项
-                var hasLifeItemInCurrentBilling = input.lqKdPxmxList != null && input.lqKdPxmxList.Any(x =>
-                    !string.IsNullOrEmpty(x.px) && itemCategoryDict.ContainsKey(x.px) && itemCategoryDict[x.px] == "生美");
-                //获取该会员之前开单品项里面是否有医美项目
-                var isMedicalProject = hasMedicalItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "医美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
-                if (isMedicalProject && MedicalItemInCurrentBillingAmount >= 1000)
-                {
-                    entity.UpgradeLifeBeauty = "是";
-                }
-                else
-                {
-                    entity.UpgradeLifeBeauty = "否";
-                }
-                //获取该会员之前开单品项里面是否有科美项目
-                var isTechProject = hasTechItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "科美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
-                if (isTechProject)
-                {
-                    entity.UpgradeTechBeauty = "是";
-                }
-                else
-                {
-                    entity.UpgradeTechBeauty = "否";
-                }
-                //获取该会员之前开单品项里面是否有生美项目
-                var isLifeProject = hasLifeItemInCurrentBilling && await _db.Queryable<LqKdPxmxEntity>().Where(x => x.MemberId == entity.Kdhy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.ItemCategory == "生美" && x.ActualPrice > 0 && x.Px != "61" && x.Glkdbh != id).AnyAsync();
-                if (isLifeProject)
-                {
-                    entity.UpgradeMedicalBeauty = "是";
-                }
-                else
-                {
-                    entity.UpgradeMedicalBeauty = "否";
-                }
-
-                //更新开单记录表记录
-                await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-
-                //清空原有数据
-                await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-                await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-                await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-
-                // 收集所有需要插入的实体，然后批量插入
-                var allPxmxEntities = new List<LqKdPxmxEntity>();
-                var allJksyjEntities = new List<LqKdJksyjEntity>();
-                var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
-
-                // 处理品项明细列表
-                if (input.lqKdPxmxList != null && input.lqKdPxmxList.Any())
-                {
-                    foreach (var item in input.lqKdPxmxList)
-                    {
-                        // 创建品项明细实体
-                        var lqKdPxmxEntity = new LqKdPxmxEntity
-                        {
-                            Id = YitIdHelper.NextId().ToString(),
-                            Glkdbh = entity.Id,
-                            CreateTIme = DateTime.Now,
-                            MemberId = entity.Kdhy,
-                            IsEnabled = 0,
-                            ProjectNumber = item.projectNumber == 0 ? 1 : item.projectNumber,
-                            TotalPrice = (decimal)(item.pxjg * (item.projectNumber == 0 ? 1 : item.projectNumber)),
-                            Px = item.px,
-                            Pxmc = item.pxmc,
-                            Pxjg = item.pxjg,
-                            SourceType = item.sourceType,
-                            ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
-                        };
-                        allPxmxEntities.Add(lqKdPxmxEntity);
-
-                        // 收集该品项关联的健康师业绩
-                        if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
-                        {
-                            foreach (var ijks_tem in item.lqKdJksyjList)
-                            {
-                                allJksyjEntities.Add(new LqKdJksyjEntity
-                                {
-                                    Id = YitIdHelper.NextId().ToString(),
-                                    Glkdbh = entity.Id,
-                                    Jks = ijks_tem.jks,
-                                    Jksxm = ijks_tem.jksxm,
-                                    Jkszh = ijks_tem.jkszh,
-                                    Jksyj = ijks_tem.jksyj,
-                                    Yjsj = DateTime.Now,
-                                    Jsj_id = ijks_tem.jsj_id,
-                                    Kdpxid = lqKdPxmxEntity.Id,
-                                    StoreId = entity.Djmd,
-                                    ItemCategory = lqKdPxmxEntity.ItemCategory,
-                                    ItemId = lqKdPxmxEntity.Px,
-                                    ItemName = lqKdPxmxEntity.Pxmc,
-                                });
-                            }
-                        }
-
-                        // 收集该品项关联的科技部老师业绩
-                        if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
-                        {
-                            foreach (var ikjbs_tem in item.lqKdKjbsyjList)
-                            {
-                                allKjbsyjEntities.Add(new LqKdKjbsyjEntity
-                                {
-                                    Id = YitIdHelper.NextId().ToString(),
-                                    Glkdbh = entity.Id,
-                                    Kjbls = ikjbs_tem.kjbls,
-                                    Kjblsxm = ikjbs_tem.kjblsxm,
-                                    Kjblszh = ikjbs_tem.kjblszh,
-                                    Kjblsyj = ikjbs_tem.kjblsyj,
-                                    Yjsj = DateTime.Now,
-                                    Kdpxid = lqKdPxmxEntity.Id,
-                                    ItemCategory = lqKdPxmxEntity.ItemCategory,
-                                    ItemId = lqKdPxmxEntity.Px,
-                                    StoreId = entity.Djmd,
-                                    ItemName = lqKdPxmxEntity.Pxmc,
-                                });
-                            }
-                        }
-                    }
-                }
-
-                // 批量插入品项明细
-                if (allPxmxEntities.Any())
-                {
-                    await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
-                }
-                // 批量插入健康师业绩
-                if (allJksyjEntities.Any())
-                {
-                    await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
-                }
-                // 批量插入科技部老师业绩
-                if (allKjbsyjEntities.Any())
-                {
-                    await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
-                }
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1001);
-            }
-        }
-        #endregion
-
-        #region 删除开单记录表
-        /// <summary>
-        /// 删除开单记录表
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-                //先查询开单品项明细
-                var lqPxmxList = _db.Queryable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ToList();
-                //判断是否有对应的消耗记录
-                var consumeRecords = await _db.Queryable<LqXhPxmxEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.BillingItemId)).AnyAsync();
-                if (consumeRecords)
-                {
-                    throw NCCException.Oh("选中的开单记录中有已消耗的记录，不能删除");
-                }
-                //判断是否有对应的退卡记录
-                var refundRecords = await _db.Queryable<LqHytkMxEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.BillingItemId)).AnyAsync();
-                if (refundRecords)
-                {
-                    throw NCCException.Oh("选中的开单记录中有退卡记录，不能删除");
-                }
-                //判断是否有对应的储扣记录
-                var deductRecords = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.DeductId)).AnyAsync();
-                if (deductRecords)
-                {
-                    throw NCCException.Oh("选中的开单记录中有储扣记录，不能删除");
-                }
-
-                //删除开单记录表记录
-                await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-
-                //清空健康师业绩
-                await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-
-                //清空科技部老师业绩
-                await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-
-                //清空品项明细
-                await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-
-                //清空扣款信息
-                await _db.Deleteable<LqKdDeductinfoEntity>().Where(u => u.BillingId == id).ExecuteCommandAsync();
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception ex)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh($"删除开单记录表失败: {ex.Message}");
-            }
-        }
-        #endregion
-
-        #region 获取扣款类型枚举内容
-        /// <summary>
-        /// 获取扣款类型枚举内容
-        /// </summary>
-        /// <returns>扣款类型枚举列表</returns>
-        [HttpGet("deduct-types")]
-        public List<EnumOutput> GetDeductTypes()
-        {
-            return Enum.GetValues<DeductTypeEnum>()
-                .Select(e => new EnumOutput
-                {
-                    Value = (int)e,
-                    Name = e.ToString(),
-                    Description = e.GetDescription(),
-                })
-                .ToList();
-        }
-        #endregion
-
-        #region 获取状态枚举内容（所有的状态通用）
-        /// <summary>
-        /// 获取状态枚举内容
-        /// </summary>
-        /// <returns>状态枚举列表</returns>
-        [HttpGet("status-enum")]
-        public List<EnumOutput> GetStatusEnum()
-        {
-            return Enum.GetValues<StatusEnum>()
-                .Select(e => new EnumOutput
-                {
-                    Value = (int)e,
-                    Name = e.ToString(),
-                    Description = e.GetDescription(),
-                })
-                .ToList();
-        }
-        #endregion
-
-        #region 修改开单记录
-        /// <summary>
-        /// 修改开单记录
-        /// </summary>
-        /// <remarks>
-        /// 更新开单记录及其关联的品项明细、健康师业绩、科技部老师业绩信息
-        ///
-        /// 示例请求：
-        /// ```json
-        /// {
-        ///   "id": "开单编号",
-        ///   "djmd": "单据门店",
-        ///   "jsj": "金三角",
-        ///   "kdrq": "2025-01-11",
-        ///   "lqKdPxmxList": [
-        ///     {
-        ///       "px": "品项编号",
-        ///       "pxmc": "品项名称",
-        ///       "pxjg": 100.00,
-        ///       "projectNumber": 1,
-        ///       "sourceType": "购买",
-        ///       "lqKdJksyjList": [
-        ///         {
-        ///           "jks": "健康师",
-        ///           "jksxm": "健康师姓名",
-        ///           "jksyj": "100"
-        ///         }
-        ///       ]
-        ///     }
-        ///   ]
-        /// }
-        /// ```
-        ///
-        /// 参数说明：
-        /// - id: 开单记录主键ID
-        /// - input: 开单记录更新参数，包含品项明细和业绩信息
-        /// </remarks>
-        /// <param name="id">开单记录主键ID</param>
-        /// <param name="input">开单记录更新参数</param>
-        /// <returns>无返回值</returns>
-        /// <response code="200">更新成功</response>
-        /// <response code="400">参数错误或数据验证失败</response>
-        /// <response code="500">服务器内部错误</response>
-        [HttpPut("UpdateForNoDelete/{id}")]
-        public async Task UpdateForNoDelete(string id, [FromBody] LqKdKdjlbUpInput input)
-        {
-            var entity = input.Adapt<LqKdKdjlbEntity>();
-            entity.Id = id; // 确保ID正确设置
-            try
-            {
-                //检查开单记录是否可以操作
-                var (canCancel, errorMessage) = await CheckBillingCanCancelAsync(id);
-                if (!canCancel)
-                {
-                    throw NCCException.Oh(errorMessage);
-                }
-                //开启事务
-                _db.BeginTran();
-                //查询是否有对应的补缴开单ID
-                if (!string.IsNullOrEmpty(entity.SupplementBillingId))
-                {
-                    //查询补缴开单ID
-                    var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == entity.SupplementBillingId);//900,900
-                    if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode())
-                    {
-                        throw NCCException.Oh("补缴开单记录不存在或已作废");
-                    }
-                    //查询当前开单已经补缴金额
-                    var OldSupplementAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.Id == id).SumAsync(p => p.SupplementAmount);//900,0
-                    supplementBillingEntity.PaidDebt = supplementBillingEntity.PaidDebt - OldSupplementAmount + input.supplementAmount;
-                    await _db.Updateable(supplementBillingEntity).ExecuteCommandAsync();
-                }
-                // 更新开单记录主表
-                await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).IgnoreColumns(x => x.CreateTime).ExecuteCommandAsync();
-
-                //清空原有品项明细
-                await _db.Deleteable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
-                //清空原有健康师业绩
-                await _db.Deleteable<LqKdJksyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
-                //清空原有科技部老师业绩
-                await _db.Deleteable<LqKdKjbsyjEntity>().Where(x => x.Glkdbh == id).ExecuteCommandAsync();
-                //清空原有扣款信息
-                await _db.Deleteable<LqKdDeductinfoEntity>().Where(x => x.BillingId == id).ExecuteCommandAsync();
-                //循环品相信息
-                // 收集所有需要插入的实体，然后批量插入
-                var allPxmxEntities = new List<LqKdPxmxEntity>();
-                var allJksyjEntities = new List<LqKdJksyjEntity>();
-                var allKjbsyjEntities = new List<LqKdKjbsyjEntity>();
-                var allDeductEntities = new List<LqKdDeductinfoEntity>();
-                // 处理扣款信息列表
-                foreach (var item in input.lqKdKdjlbDeductList)
-                {
-                    var lqKdDeductEntity = new LqKdDeductinfoEntity
-                    {
-                        Id = YitIdHelper.NextId().ToString(),
-                        BillingId = id,
-                        DeductId = item.DeductId,
-                        DeductType = item.DeductType,
-                        Amount = item.Amount,
-                        ProjectNumber = item.ProjectNumber,
-                        UnitPrice = item.UnitPrice,
-                        ItemName = item.ItemName,
-                        ItemId = item.ItemId,
-                        IsEffective = StatusEnum.有效.GetHashCode(), // 设置为有效
-                        CreateTime = DateTime.Now, // 设置创建时间
-                        ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.DeductId).Select(x => x.Qt2).FirstAsync(),
-                    };
-                    allDeductEntities.Add(lqKdDeductEntity);
-                }
-                // 处理品项明细列表
-                foreach (var item in input.lqKdPxmxList)
-                {
-                    // 创建品项明细实体
-                    var lqKdPxmxEntity = new LqKdPxmxEntity
-                    {
-                        Id = YitIdHelper.NextId().ToString(),
-                        Glkdbh = id,
-                        Yjsj = input.kdrq,
-                        CreateTIme = DateTime.Now,
-                        MemberId = entity.Kdhy,
-                        IsEnabled = StatusEnum.有效.GetHashCode(),
-                        ProjectNumber = item.projectNumber,
-                        TotalPrice = (decimal)(item.pxjg * item.projectNumber),
-                        Px = item.px,
-                        Pxmc = item.pxmc,
-                        Pxjg = item.pxjg,
-                        SourceType = item.sourceType,
-                        ActualPrice = item.actualPrice,
-                        Remark = item.remark,
-                        IsEffective = StatusEnum.有效.GetHashCode(),
-                        ActivityId = input.activityId,
-                        ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
-                    };
-                    allPxmxEntities.Add(lqKdPxmxEntity);
-
-                    // 收集该品项关联的健康师业绩
-                    if (item.lqKdJksyjList != null && item.lqKdJksyjList.Any())
-                    {
-                        //把jksxm保存到HealthInstructorNames
-                        foreach (var ijks_tem in item.lqKdJksyjList)
-                        {
-                            allJksyjEntities.Add(new LqKdJksyjEntity
-                            {
-                                Id = YitIdHelper.NextId().ToString(),
-                                Glkdbh = id,
-                                Jks = ijks_tem.jks,
-                                Jksxm = ijks_tem.jksxm,
-                                Jkszh = ijks_tem.jkszh,
-                                Jksyj = ijks_tem.jksyj,
-                                Yjsj = input.kdrq,
-                                Jsj_id = ijks_tem.jsj_id,
-                                Kdpxid = lqKdPxmxEntity.Id,
-                                IsEffective = StatusEnum.有效.GetHashCode(),
-                                ActivityId = input.activityId,
-                                ItemCategory = lqKdPxmxEntity.ItemCategory,
-                                ItemId = lqKdPxmxEntity.Px,
-                            });
-                        }
-                    }
-
-                    // 收集该品项关联的科技部老师业绩
-                    if (item.lqKdKjbsyjList != null && item.lqKdKjbsyjList.Any())
-                    {
-                        foreach (var ikjbs_tem in item.lqKdKjbsyjList)
-                        {
-                            allKjbsyjEntities.Add(new LqKdKjbsyjEntity
-                            {
-                                Id = YitIdHelper.NextId().ToString(),
-                                Glkdbh = id,
-                                Kjbls = ikjbs_tem.kjbls,
-                                Kjblsxm = ikjbs_tem.kjblsxm,
-                                Kjblszh = ikjbs_tem.kjblszh,
-                                Kjblsyj = ikjbs_tem.kjblsyj,
-                                Yjsj = input.kdrq,
-                                Kdpxid = lqKdPxmxEntity.Id,
-                                IsEffective = StatusEnum.有效.GetHashCode(),
-                                ActivityId = input.activityId,
-                                ItemCategory = lqKdPxmxEntity.ItemCategory,
-                                ItemId = lqKdPxmxEntity.Px,
-                            }
-                            );
+                            throw NCCException.Oh("选中的开单记录中有已消耗的记录，不能删除");
                         }
                     }
-                }
+                    // 检查是否有储扣记录
+                    var deductRecords = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => ids.Contains(x.BillingId) && x.IsEffective == StatusEnum.有效.GetHashCode()).AnyAsync();
+                    if (deductRecords)
+                    {
+                        throw NCCException.Oh("选中的开单记录中有储扣记录，不能删除");
+                    }
+                    //批量删除开单记录表
+                    await _db.Deleteable<LqKdKdjlbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
 
+                    //清空健康师业绩
+                    await _db.Deleteable<LqKdJksyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
 
+                    //清空科技部老师业绩
+                    await _db.Deleteable<LqKdKjbsyjEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
 
-                //通过会员id查询会员信息
-                var memberInfo = await _db.Queryable<LqKhxxEntity>().Where(u => u.Id == entity.Kdhy).FirstAsync();
-                //通过开单记录表查询这个会员开单金额
-                var kdAmount = await _db.Queryable<LqKdKdjlbEntity>().Where(u => u.Kdhy == entity.Kdhy).SumAsync(u => u.Sfyj);
-                //如果开单金额小于500，为散客，如果大于500，为会员
-                if (kdAmount < 500)
-                {
-                    memberInfo.Khlx = MemberTypeEnum.散客.GetHashCode().ToString();
-                }
-                else
-                {
-                    memberInfo.Khlx = MemberTypeEnum.会员.GetHashCode().ToString();
+                    //清空品项明细
+                    await _db.Deleteable<LqKdPxmxEntity>().In(u => u.Glkdbh, ids).ExecuteCommandAsync();
+
+                    //清空扣款信息
+                    await _db.Deleteable<LqKdDeductinfoEntity>().In(u => u.BillingId, ids).ExecuteCommandAsync();
+
+                    //关闭事务
+                    _db.CommitTran();
                 }
-                await _db.Updateable(memberInfo).ExecuteCommandAsync();
-                // 批量插入扣款信息
-                if (allDeductEntities.Any())
+                catch (Exception ex)
                 {
-                    await _db.Insertable(allDeductEntities).ExecuteCommandAsync();
+                    //回滚事务
+                    _db.RollbackTran();
+                    throw NCCException.Oh($"批量删除开单记录表失败: {ex.Message}");
                 }
-                // 批量插入品项明细
-                if (allPxmxEntities.Any())
+            }
+        }
+        #endregion
+
+        #region 删除开单记录表
+        /// <summary>
+        /// 删除开单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{id}")]
+        public async Task Delete(string id)
+        {
+            var entity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == id);
+            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
+            try
+            {
+                //开启事务
+                _db.BeginTran();
+                //先查询开单品项明细
+                var lqPxmxList = _db.Queryable<LqKdPxmxEntity>().Where(x => x.Glkdbh == id).ToList();
+                //判断是否有对应的消耗记录
+                var consumeRecords = await _db.Queryable<LqXhPxmxEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.BillingItemId)).AnyAsync();
+                if (consumeRecords)
                 {
-                    await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
+                    throw NCCException.Oh("选中的开单记录中有已消耗的记录，不能删除");
                 }
-                // 批量插入健康师业绩
-                if (allJksyjEntities.Any())
+                //判断是否有对应的退卡记录
+                var refundRecords = await _db.Queryable<LqHytkMxEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.BillingItemId)).AnyAsync();
+                if (refundRecords)
                 {
-                    await _db.Insertable(allJksyjEntities).ExecuteCommandAsync();
+                    throw NCCException.Oh("选中的开单记录中有退卡记录，不能删除");
                 }
-                // 批量插入科技部老师业绩
-                if (allKjbsyjEntities.Any())
+                //判断是否有对应的储扣记录
+                var deductRecords = await _db.Queryable<LqKdDeductinfoEntity>().Where(x => lqPxmxList.Select(y => y.Id).Contains(x.DeductId)).AnyAsync();
+                if (deductRecords)
                 {
-                    await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
+                    throw NCCException.Oh("选中的开单记录中有储扣记录，不能删除");
                 }
 
+                //删除开单记录表记录
+                await _db.Deleteable<LqKdKdjlbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
+
+                //清空健康师业绩
+                await _db.Deleteable<LqKdJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
+
+                //清空科技部老师业绩
+                await _db.Deleteable<LqKdKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
+
+                //清空品项明细
+                await _db.Deleteable<LqKdPxmxEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
+
+                //清空扣款信息
+                await _db.Deleteable<LqKdDeductinfoEntity>().Where(u => u.BillingId == id).ExecuteCommandAsync();
+
                 //关闭事务
                 _db.CommitTran();
             }
@@ -1838,11 +1614,49 @@ namespace NCC.Extend.LqKdKdjlb
             {
                 //回滚事务
                 _db.RollbackTran();
-                throw NCCException.Oh($"创建开单记录失败: {ex.Message}");
+                throw NCCException.Oh($"删除开单记录表失败: {ex.Message}");
             }
         }
         #endregion
 
+        #region 获取扣款类型枚举内容
+        /// <summary>
+        /// 获取扣款类型枚举内容
+        /// </summary>
+        /// <returns>扣款类型枚举列表</returns>
+        [HttpGet("deduct-types")]
+        public List<EnumOutput> GetDeductTypes()
+        {
+            return Enum.GetValues<DeductTypeEnum>()
+                .Select(e => new EnumOutput
+                {
+                    Value = (int)e,
+                    Name = e.ToString(),
+                    Description = e.GetDescription(),
+                })
+                .ToList();
+        }
+        #endregion
+
+        #region 获取状态枚举内容（所有的状态通用）
+        /// <summary>
+        /// 获取状态枚举内容
+        /// </summary>
+        /// <returns>状态枚举列表</returns>
+        [HttpGet("status-enum")]
+        public List<EnumOutput> GetStatusEnum()
+        {
+            return Enum.GetValues<StatusEnum>()
+                .Select(e => new EnumOutput
+                {
+                    Value = (int)e,
+                    Name = e.ToString(),
+                    Description = e.GetDescription(),
+                })
+                .ToList();
+        }
+        #endregion
+
         #region 作废开单记录
         /// <summary>
         /// 作废开单记录
@@ -2325,7 +2139,7 @@ namespace NCC.Extend.LqKdKdjlb
         }
         #endregion
 
-        #region  根据会员id获取会员的开单品项列表
+        #region 根据会员id获取会员的开单品项列表
         /// <summary>
         /// 根据会员id获取会员的开单品项列表
         /// </summary>
@@ -2515,9 +2329,9 @@ namespace NCC.Extend.LqKdKdjlb
         }
         #endregion
 
-        #region 获取门店某个时间段的开单记录汇总信息
+        #region 获取门店某个时间段的开单记录汇总信息(台账)
         /// <summary>
-        /// 获取门店某个时间段的开单记录汇总信息
+        /// 获取门店某个时间段的开单记录汇总信息(台账)
         /// </summary>
         /// <param name="input">查询参数</param>
         /// <returns>开单记录汇总信息</returns>
@@ -2539,9 +2353,18 @@ namespace NCC.Extend.LqKdKdjlb
                     input.EndTime = DateTime.Now.AddDays(DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month));
                 }
 
+                // 构建开单记录查询条件
+                var billingQuery = _db.Queryable<LqKdKdjlbEntity>()
+                    .Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode());
+
+                // 客户筛选
+                if (!string.IsNullOrEmpty(input.MemberId))
+                {
+                    billingQuery = billingQuery.Where(w => w.Kdhy == input.MemberId);
+                }
+
                 // 查询开单记录
-                var billingRecords = await _db.Queryable<LqKdKdjlbEntity>()
-                    .Where(w => w.Djmd == input.StoreId && w.Kdrq >= input.StartTime && w.Kdrq <= input.EndTime && w.IsEffective == StatusEnum.有效.GetHashCode())
+                var billingRecords = await billingQuery
                     .Select(it => new
                     {
                         id = it.Id,
@@ -2552,12 +2375,15 @@ namespace NCC.Extend.LqKdKdjlb
                         zdyj = it.Zdyj,
                         sfyj = it.Sfyj,
                         qk = it.Qk,
+                        hgjg = it.Hgjg,
+                        hgjgName = SqlFunc.Subqueryable<LqHzfEntity>().Where(x => x.Id == it.Hgjg).Select(x => x.Hzmc),
                         kdhyc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Khmc),
                         kdhysjh = SqlFunc.Subqueryable<LqKhxxEntity>().Where(x => x.Id == it.Kdhy).Select(x => x.Sjh),
                         fkfs = it.Fkfs, // 付款方式
                         khly = it.Khly, // 客户来源
                         bz = it.Bz, // 备注
                         createTime = it.CreateTime
+
                     })
                     .ToListAsync();
 
@@ -2594,9 +2420,24 @@ namespace NCC.Extend.LqKdKdjlb
 
                 var billingIds = billingRecords.Select(x => x.id).ToList();
 
+                // 构建品项明细查询条件
+                var itemDetailsQuery = _db.Queryable<LqKdPxmxEntity>()
+                    .Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode());
+
+                // 品项分类筛选
+                if (!string.IsNullOrEmpty(input.ItemCategory))
+                {
+                    itemDetailsQuery = itemDetailsQuery.Where(w => w.ItemCategory == input.ItemCategory);
+                }
+
+                // 品项筛选
+                if (!string.IsNullOrEmpty(input.ItemId))
+                {
+                    itemDetailsQuery = itemDetailsQuery.Where(w => w.Px == input.ItemId);
+                }
+
                 // 查询品项明细，按F_SourceType分类
-                var itemDetails = await _db.Queryable<LqKdPxmxEntity>()
-                    .Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode())
+                var itemDetails = await itemDetailsQuery
                     .Select(it => new
                     {
                         id = it.Id,
@@ -2618,9 +2459,30 @@ namespace NCC.Extend.LqKdKdjlb
                 var giftedItems = itemDetails.Where(x => x.sourceType == "赠送").ToList();
                 var experienceItems = itemDetails.Where(x => x.sourceType == "体验").ToList();
 
+                // 构建健康师业绩查询条件
+                var healthTeacherQuery = _db.Queryable<LqKdJksyjEntity>()
+                    .Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode());
+
+                // 健康师筛选
+                if (!string.IsNullOrEmpty(input.HealthCoachId))
+                {
+                    healthTeacherQuery = healthTeacherQuery.Where(w => w.Jks == input.HealthCoachId || w.Jkszh == input.HealthCoachId);
+                }
+
+                // 品项分类筛选（健康师业绩表）
+                if (!string.IsNullOrEmpty(input.ItemCategory))
+                {
+                    healthTeacherQuery = healthTeacherQuery.Where(w => w.ItemCategory == input.ItemCategory);
+                }
+
+                // 品项筛选（健康师业绩表）
+                if (!string.IsNullOrEmpty(input.ItemId))
+                {
+                    healthTeacherQuery = healthTeacherQuery.Where(w => w.ItemId == input.ItemId);
+                }
+
                 // 查询健康师业绩数据
-                var healthTeacherData = await _db.Queryable<LqKdJksyjEntity>()
-                    .Where(w => billingIds.Contains(w.Glkdbh) && w.IsEffective == StatusEnum.有效.GetHashCode())
+                var healthTeacherData = await healthTeacherQuery
                     .Select(it => new
                     {
                         id = it.Id,
@@ -2639,6 +2501,56 @@ namespace NCC.Extend.LqKdKdjlb
                     })
                     .ToListAsync();
 
+                // 根据筛选条件过滤开单记录
+                // 收集所有需要匹配的开单ID（取交集）
+                var matchedBillingIds = new List<string>();
+                var hasFilterCondition = false; // 标记是否传入了筛选条件
+
+                // 如果传入了品项分类或品项筛选条件，收集匹配的开单ID
+                if (!string.IsNullOrEmpty(input.ItemCategory) || !string.IsNullOrEmpty(input.ItemId))
+                {
+                    hasFilterCondition = true;
+                    var itemMatchedIds = itemDetails.Select(x => x.glkdbh).Distinct().ToList();
+                    if (matchedBillingIds.Any())
+                    {
+                        matchedBillingIds = matchedBillingIds.Intersect(itemMatchedIds).ToList();
+                    }
+                    else
+                    {
+                        matchedBillingIds = itemMatchedIds;
+                    }
+                }
+
+                // 如果传入了健康师筛选条件，收集匹配的开单ID
+                if (!string.IsNullOrEmpty(input.HealthCoachId))
+                {
+                    hasFilterCondition = true;
+                    var healthTeacherMatchedIds = healthTeacherData.Select(x => x.glkdbh).Distinct().ToList();
+                    if (matchedBillingIds.Any())
+                    {
+                        matchedBillingIds = matchedBillingIds.Intersect(healthTeacherMatchedIds).ToList();
+                    }
+                    else
+                    {
+                        matchedBillingIds = healthTeacherMatchedIds;
+                    }
+                }
+
+                // 如果传入了筛选条件，必须过滤开单记录（即使没有匹配数据也要过滤，返回空结果）
+                if (hasFilterCondition)
+                {
+                    if (matchedBillingIds.Any())
+                    {
+                        billingRecords = billingRecords.Where(x => matchedBillingIds.Contains(x.id)).ToList();
+                    }
+                    else
+                    {
+                        // 传入了筛选条件但没有匹配数据，返回空结果
+                        billingRecords = billingRecords.Where(x => false).ToList();
+                    }
+                    billingIds = billingRecords.Select(x => x.id).ToList();
+                }
+
                 // 构建按开单记录分组的详细数据
                 var detailedRecords = billingRecords.Select(billing => new
                 {
@@ -2649,7 +2561,8 @@ namespace NCC.Extend.LqKdKdjlb
                     storeId = billing.djmd,
                     goldTriangle = billing.jsj,
                     customerType = billing.gjlx,
-
+                    cooperationInstitution = billing.hgjg,
+                    cooperationInstitutionName = billing.hgjgName,
                     // 品项分类
                     purchasedItems = itemDetails.Where(x => x.glkdbh == billing.id && x.sourceType == "购买").Select(x => new
                     {
@@ -2930,7 +2843,6 @@ namespace NCC.Extend.LqKdKdjlb
                 // 4. 创建退卡品项明细和业绩记录
                 var refundMxEntities = new List<LqHytkMxEntity>();
                 var refundJksyjEntities = new List<LqHytkJksyjEntity>();
-
                 var refundKjbsyjEntities = new List<LqHytkKjbsyjEntity>();
 
                 foreach (var item in input.TransferItems)
@@ -2956,6 +2868,7 @@ namespace NCC.Extend.LqKdKdjlb
                         TotalPrice = totalItemDeduction,
                         IsEffective = StatusEnum.有效.GetHashCode(),
                         ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Qt2).FirstAsync(),
+                        PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Fl3).FirstAsync() ?? "",
                     };
                     refundMxEntities.Add(refundMxEntity);
                     var refundKdyjEntities = _db.Queryable<LqKdJksyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
@@ -2978,7 +2891,7 @@ namespace NCC.Extend.LqKdKdjlb
                             Jks = jks.Jkszh,
                             Jksxm = jks.Jksxm,
                             Jkszh = jks.Jkszh,
-                            Jksyj = (totalItemDeduction / refundKdyjEntities.Count()),
+                            Jksyj = totalItemDeduction / refundKdyjEntities.Count(),
                             Tksj = DateTime.Now,
                             F_jsjid = GetMonTeam.JsjId,
                             F_tkpxid = refundMxEntity.Id,
@@ -2990,7 +2903,8 @@ namespace NCC.Extend.LqKdKdjlb
                             ItemCategory = refundMxEntity.ItemCategory,
                             ItemId = refundMxEntity.Px,
                             StoreId = refundEntity.Md,
-                            ItemName = refundMxEntity.Pxmc
+                            ItemName = refundMxEntity.Pxmc,
+                            PerformanceType = refundMxEntity.PerformanceType
                         });
                     }
                     //查询科技部老师的业绩
@@ -3017,7 +2931,8 @@ namespace NCC.Extend.LqKdKdjlb
                             ItemCategory = refundMxEntity.ItemCategory,
                             ItemId = refundMxEntity.Px,
                             StoreId = refundEntity.Md,
-                            ItemName = refundMxEntity.Pxmc
+                            ItemName = refundMxEntity.Pxmc,
+                            PerformanceType = refundMxEntity.PerformanceType
                         });
                     }
                 }
@@ -3060,6 +2975,29 @@ namespace NCC.Extend.LqKdKdjlb
                 foreach (var item in input.TransferItems)
                 {
                     var refundPxmxEntity = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Id == item.BillingItemId).FirstAsync();
+                    // 计算转卡金额和数量
+                    var transferAmount = item.ItemPrice * item.TransferQuantity;
+                    var transferQuantity = item.TransferQuantity;
+
+                    // 获取原开单品项的总金额和总数量
+                    var originalTotalPrice = refundPxmxEntity.TotalPrice > 0 ? refundPxmxEntity.TotalPrice : refundPxmxEntity.ActualPrice;
+                    var originalProjectNumber = refundPxmxEntity.ProjectNumber > 0 ? refundPxmxEntity.ProjectNumber : 1;
+
+                    // 计算转卡比例（优先使用金额比例，如果金额为0则使用数量比例）
+                    decimal transferRatio = 0;
+                    if (originalTotalPrice > 0)
+                    {
+                        transferRatio = transferAmount / originalTotalPrice;
+                    }
+                    else if (originalProjectNumber > 0)
+                    {
+                        transferRatio = (decimal)transferQuantity / originalProjectNumber;
+                    }
+                    else
+                    {
+                        transferRatio = 1; // 如果原数据异常，默认按100%计算
+                    }
+
                     var billingPxmxEntity = new LqKdPxmxEntity
                     {
                         Id = YitIdHelper.NextId().ToString(),
@@ -3072,53 +3010,142 @@ namespace NCC.Extend.LqKdKdjlb
                         ProjectNumber = item.TransferQuantity,
                         IsEnabled = StatusEnum.有效.GetHashCode(),
                         SourceType = refundPxmxEntity.SourceType,
-                        TotalPrice = item.ItemPrice * item.TransferQuantity,
-                        ActualPrice = item.ItemPrice * item.TransferQuantity,
+                        TotalPrice = transferAmount,
+                        ActualPrice = transferAmount,
                         IsEffective = StatusEnum.有效.GetHashCode(),
                         Remark = $"从会员 {fromMember.Khmc} 转入",
                         ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Qt2).FirstAsync(),
+                        PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == refundPxmxEntity.Px).Select(x => x.Fl3).FirstAsync() ?? "",
                     };
                     billingPxmxEntities.Add(billingPxmxEntity);
 
-                    foreach (var jks in refundJksyjEntities)
+                    // 查询原开单记录的健康师业绩
+                    var billingKdyjEntitiesList = _db.Queryable<LqKdJksyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
+                    if (billingKdyjEntitiesList.Any())
                     {
-                        billingJksyjEntities.Add(new LqKdJksyjEntity
+                        // 计算原开单所有健康师的总业绩
+                        var originalTotalJksyj = billingKdyjEntitiesList.Sum(x => decimal.Parse(x.Jksyj ?? "0"));
+                        // 如果原开单总业绩为0，则按转卡金额均分
+                        if (originalTotalJksyj == 0)
                         {
-                            Id = YitIdHelper.NextId().ToString(),
-                            Glkdbh = billingId,
-                            Jks = jks.Jkszh,
-                            Jksxm = jks.Jksxm,
-                            Jkszh = jks.Jkszh,
-                            Jksyj = jks.Jksyj.ToString(),
-                            Yjsj = transferTime,
-                            Jsj_id = jks.F_jsjid,
-                            Kdpxid = billingPxmxEntity.Id,
-                            IsEffective = StatusEnum.有效.GetHashCode(),
-                            ItemCategory = billingPxmxEntity.ItemCategory,
-                            ItemId = billingPxmxEntity.Px,
-                            StoreId = billingEntity.Djmd,
-                            ItemName = billingPxmxEntity.Pxmc
-                        });
+                            var avgJksyj = transferAmount / billingKdyjEntitiesList.Count;
+                            foreach (var jks in billingKdyjEntitiesList)
+                            {
+                                billingJksyjEntities.Add(new LqKdJksyjEntity
+                                {
+                                    Id = YitIdHelper.NextId().ToString(),
+                                    Glkdbh = billingId,
+                                    Jks = jks.Jkszh,
+                                    Jksxm = jks.Jksxm,
+                                    Jkszh = jks.Jkszh,
+                                    Jksyj = avgJksyj.ToString("F2"),
+                                    Yjsj = transferTime,
+                                    Jsj_id = jks.Jsj_id,
+                                    Kdpxid = billingPxmxEntity.Id,
+                                    IsEffective = StatusEnum.有效.GetHashCode(),
+                                    ItemCategory = billingPxmxEntity.ItemCategory,
+                                    ItemId = billingPxmxEntity.Px,
+                                    StoreId = billingEntity.Djmd,
+                                    ItemName = billingPxmxEntity.Pxmc,
+                                    PerformanceType = billingPxmxEntity.PerformanceType
+                                });
+                            }
+                        }
+                        else
+                        {
+                            // 按原业绩比例计算转卡后的业绩
+                            foreach (var jks in billingKdyjEntitiesList)
+                            {
+                                var originalJksyj = decimal.Parse(jks.Jksyj ?? "0");
+                                // 计算该健康师在原开单中的业绩占比
+                                var jksRatio = originalTotalJksyj > 0 ? originalJksyj / originalTotalJksyj : 0;
+                                // 转卡后的业绩 = 转卡金额 × 该健康师的业绩占比
+                                var transferJksyj = transferAmount * jksRatio;
+
+                                billingJksyjEntities.Add(new LqKdJksyjEntity
+                                {
+                                    Id = YitIdHelper.NextId().ToString(),
+                                    Glkdbh = billingId,
+                                    Jks = jks.Jkszh,
+                                    Jksxm = jks.Jksxm,
+                                    Jkszh = jks.Jkszh,
+                                    Jksyj = transferJksyj.ToString("F2"),
+                                    Yjsj = transferTime,
+                                    Jsj_id = jks.Jsj_id,
+                                    Kdpxid = billingPxmxEntity.Id,
+                                    IsEffective = StatusEnum.有效.GetHashCode(),
+                                    ItemCategory = billingPxmxEntity.ItemCategory,
+                                    ItemId = billingPxmxEntity.Px,
+                                    StoreId = billingEntity.Djmd,
+                                    ItemName = billingPxmxEntity.Pxmc,
+                                    PerformanceType = billingPxmxEntity.PerformanceType
+                                });
+                            }
+                        }
                     }
 
-                    foreach (var kjbs in refundKjbsyjEntities)
+                    // 查询原开单记录的科技部老师业绩
+                    var billingKjbsyjEntitiesList = _db.Queryable<LqKdKjbsyjEntity>().Where(p => p.Kdpxid == item.BillingItemId).ToList();
+                    if (billingKjbsyjEntitiesList.Any())
                     {
-                        billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
+                        // 计算原开单所有科技部老师的总业绩
+                        var originalTotalKjbsyj = billingKjbsyjEntitiesList.Sum(x => decimal.Parse(x.Kjblsyj ?? "0"));
+
+                        // 如果原开单总业绩为0，则按转卡金额均分
+                        if (originalTotalKjbsyj == 0)
                         {
-                            Id = YitIdHelper.NextId().ToString(),
-                            Glkdbh = billingId,
-                            Kjbls = kjbs.Kjbls,
-                            Kjblsxm = kjbs.Kjblsxm,
-                            Kjblszh = kjbs.Kjblszh,
-                            Kjblsyj = kjbs.Kjblsyj.ToString(),
-                            Yjsj = transferTime,
-                            Kdpxid = billingPxmxEntity.Id,
-                            IsEffective = StatusEnum.有效.GetHashCode(),
-                            ItemCategory = billingPxmxEntity.ItemCategory,
-                            ItemId = billingPxmxEntity.Px,
-                            StoreId = billingEntity.Djmd,
-                            ItemName = billingPxmxEntity.Pxmc
-                        });
+                            var avgKjbsyj = transferAmount / billingKjbsyjEntitiesList.Count;
+                            foreach (var kjbs in billingKjbsyjEntitiesList)
+                            {
+                                billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
+                                {
+                                    Id = YitIdHelper.NextId().ToString(),
+                                    Glkdbh = billingId,
+                                    Kjbls = kjbs.Kjbls,
+                                    Kjblsxm = kjbs.Kjblsxm,
+                                    Kjblszh = kjbs.Kjblszh,
+                                    Kjblsyj = avgKjbsyj.ToString("F2"),
+                                    Yjsj = transferTime,
+                                    Kdpxid = billingPxmxEntity.Id,
+                                    IsEffective = StatusEnum.有效.GetHashCode(),
+                                    ItemCategory = billingPxmxEntity.ItemCategory,
+                                    ItemId = billingPxmxEntity.Px,
+                                    StoreId = billingEntity.Djmd,
+                                    ItemName = billingPxmxEntity.Pxmc,
+                                    PerformanceType = billingPxmxEntity.PerformanceType
+                                });
+                            }
+                        }
+                        else
+                        {
+                            // 按原业绩比例计算转卡后的业绩
+                            foreach (var kjbs in billingKjbsyjEntitiesList)
+                            {
+                                var originalKjbsyj = decimal.Parse(kjbs.Kjblsyj ?? "0");
+                                // 计算该科技部老师在原开单中的业绩占比
+                                var kjbsRatio = originalTotalKjbsyj > 0 ? originalKjbsyj / originalTotalKjbsyj : 0;
+                                // 转卡后的业绩 = 转卡金额 × 该科技部老师的业绩占比
+                                var transferKjbsyj = transferAmount * kjbsRatio;
+
+                                billingKjbsyjEntities.Add(new LqKdKjbsyjEntity
+                                {
+                                    Id = YitIdHelper.NextId().ToString(),
+                                    Glkdbh = billingId,
+                                    Kjbls = kjbs.Kjbls,
+                                    Kjblsxm = kjbs.Kjblsxm,
+                                    Kjblszh = kjbs.Kjblszh,
+                                    Kjblsyj = transferKjbsyj.ToString("F2"),
+                                    Yjsj = transferTime,
+                                    Kdpxid = billingPxmxEntity.Id,
+                                    IsEffective = StatusEnum.有效.GetHashCode(),
+                                    ItemCategory = billingPxmxEntity.ItemCategory,
+                                    ItemId = billingPxmxEntity.Px,
+                                    StoreId = billingEntity.Djmd,
+                                    ItemName = billingPxmxEntity.Pxmc,
+                                    PerformanceType = billingPxmxEntity.PerformanceType
+                                });
+                            }
+                        }
                     }
                 }
                 //记录转卡日志
@@ -3258,6 +3285,9 @@ namespace NCC.Extend.LqKdKdjlb
         /// - PersonCount: 人次（按客户+日期去重，同一客户不同天算多次）
         /// - ProjectCount: 消耗项目数（项目总次数）
         /// - RefundAmount: 退卡金额（健康师退卡业绩总金额）
+        /// - LaborCost: 手工费（消耗时的手工费总金额）
+        /// - OriginalLaborCost: 原始手工费（消耗时的原始手工费总金额）
+        /// - OvertimeLaborCost: 加班手工费（消耗时的加班手工费总金额）
         /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>健康师统计数据列表</returns>
@@ -3305,7 +3335,12 @@ namespace NCC.Extend.LqKdKdjlb
                         CAST(COALESCE(consume_stats.ProjectCount, 0) AS DECIMAL(18,2)) as ProjectCount,
                         
                         -- 退卡金额
-                        COALESCE(refund_stats.RefundAmount, 0) as RefundAmount
+                        COALESCE(refund_stats.RefundAmount, 0) as RefundAmount,
+                        
+                        -- 手工费相关统计
+                        COALESCE(consume_stats.LaborCost, 0) as LaborCost,
+                        COALESCE(consume_stats.OriginalLaborCost, 0) as OriginalLaborCost,
+                        COALESCE(consume_stats.OvertimeLaborCost, 0) as OvertimeLaborCost
 
                     FROM BASE_USER u
                     LEFT JOIN lq_mdxx md ON u.F_MDID = md.F_Id
@@ -3365,17 +3400,20 @@ namespace NCC.Extend.LqKdKdjlb
                     -- 消耗统计子查询
                     LEFT JOIN (
                         SELECT 
-                            jksyj.jkszh as EmployeeId,
+                            jksyj.jks as EmployeeId,
                             SUM(jksyj.jksyj) as ConsumeAmount,
-                            CAST(SUM(jksyj.F_kdpxNumber) AS DECIMAL(18,2)) as ProjectCount
+                            CAST(SUM(jksyj.F_kdpxNumber) AS DECIMAL(18,2)) as ProjectCount,
+                            COALESCE(SUM(jksyj.F_LaborCost), 0) as LaborCost,
+                            COALESCE(SUM(jksyj.F_OriginalLaborCost), 0) as OriginalLaborCost,
+                            COALESCE(SUM(jksyj.F_OvertimeLaborCost), 0) as OvertimeLaborCost
                         FROM lq_xh_jksyj jksyj
                         INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id
-                        WHERE jksyj.jkszh IS NOT NULL
+                        WHERE jksyj.jks IS NOT NULL
                             AND jksyj.F_IsEffective = 1
                             AND hyhk.F_IsEffective = 1
                             AND hyhk.hksj >= @startTime
                             AND hyhk.hksj <= @endTime
-                        GROUP BY jksyj.jkszh
+                        GROUP BY jksyj.jks
                     ) consume_stats ON u.F_Id = consume_stats.EmployeeId
 
                     -- 有效人头统计子查询（从人次记录表获取，按月份+客户+数量去重后累加数量，F_HasBilling=1）
@@ -3831,7 +3869,11 @@ namespace NCC.Extend.LqKdKdjlb
                 var sidx = string.IsNullOrEmpty(input.sidx) ? "CreateTime" : input.sidx;
 
                 // 构建基础查询：储扣信息 JOIN 开单记录 JOIN 客户信息 JOIN 门店信息
-                var baseQuery = _db.Queryable<LqKdDeductinfoEntity, LqKdKdjlbEntity, LqKhxxEntity, LqMdxxEntity>((deduct, billing, member, store) => deduct.BillingId == billing.Id && billing.Kdhy == member.Id && billing.Djmd == store.Id)
+                var baseQuery = _db.Queryable<LqKdDeductinfoEntity, LqKdKdjlbEntity, LqKhxxEntity, LqMdxxEntity>(
+                    (deduct, billing, member, store) =>
+                        deduct.BillingId == billing.Id &&
+                        billing.Kdhy == member.Id &&
+                        billing.Djmd == store.Id)
                     .WhereIF(!string.IsNullOrEmpty(input.DeductType), (deduct, billing, member, store) => deduct.DeductType == input.DeductType)
                     .WhereIF(!string.IsNullOrEmpty(input.DeductId), (deduct, billing, member, store) => deduct.DeductId == input.DeductId)
                     .WhereIF(!string.IsNullOrEmpty(input.BillingId), (deduct, billing, member, store) => deduct.BillingId == input.BillingId)
@@ -3851,7 +3893,7 @@ namespace NCC.Extend.LqKdKdjlb
                         (billing.Id != null && billing.Id.Contains(input.keyword)));
 
 
-                // 查询并分页
+                // 查询并分页，使用子查询获取开单类型
                 var data = await baseQuery.Select((deduct, billing, member, store) => new LqKdDeductinfoListOutput
                 {
                     Id = deduct.Id ?? "",
@@ -3871,7 +3913,12 @@ namespace NCC.Extend.LqKdKdjlb
                     MemberName = member.Khmc ?? "",
                     MemberPhone = member.Sjh ?? "",
                     StoreId = billing.Djmd ?? "",
-                    StoreName = store.Dm ?? ""
+                    StoreName = store.Dm ?? "",
+                    TimePeriod = billing.Kdrq,
+                    BillingType = SqlFunc.Subqueryable<LqKdPxmxEntity>()
+                        .Where(pxmx => pxmx.Id == deduct.DeductId && pxmx.Px == deduct.ItemId)
+                        .Select(pxmx => pxmx.SourceType),
+                    CooperationInstitution = billing.Hgjg ?? ""
                 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
 
                 return PageResult<LqKdDeductinfoListOutput>.SqlSugarPageResult(data);
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqProductService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqProductService.cs
index fad69fd..7f1a9ee 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqProductService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqProductService.cs
@@ -254,6 +254,7 @@ namespace NCC.Extend
                 var productIds = data.list.Select(x => x.id).ToList();
                 if (productIds.Any())
                 {
+                    // 查询总库存数量
                     var inventoryDict = await _db.Queryable<LqInventoryEntity>()
                         .Where(x => productIds.Contains(x.ProductId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                         .GroupBy(x => x.ProductId)
@@ -262,10 +263,21 @@ namespace NCC.Extend
 
                     var inventoryDictMap = inventoryDict.ToDictionary(k => k.ProductId, v => v.TotalQuantity.HasValue ? (int)v.TotalQuantity.Value : 0);
 
-                    // 填充库存数量
+                    // 查询已使用数量
+                    var usageDict = await _db.Queryable<LqInventoryUsageEntity>()
+                        .Where(x => productIds.Contains(x.ProductId) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                        .GroupBy(x => x.ProductId)
+                        .Select(x => new { ProductId = x.ProductId, TotalUsage = SqlFunc.AggregateSum((decimal?)x.UsageQuantity) })
+                        .ToListAsync();
+
+                    var usageDictMap = usageDict.ToDictionary(k => k.ProductId, v => v.TotalUsage.HasValue ? (int)v.TotalUsage.Value : 0);
+
+                    // 填充库存数量（总库存减去已使用数量）
                     foreach (var item in data.list)
                     {
-                        item.currentInventory = inventoryDictMap.ContainsKey(item.id) ? inventoryDictMap[item.id] : 0;
+                        var totalInventory = inventoryDictMap.ContainsKey(item.id) ? inventoryDictMap[item.id] : 0;
+                        var totalUsage = usageDictMap.ContainsKey(item.id) ? usageDictMap[item.id] : 0;
+                        item.currentInventory = totalInventory - totalUsage;
                     }
                 }
 
@@ -427,6 +439,7 @@ namespace NCC.Extend
                 var productIds = products.Select(x => x.id).ToList();
                 if (productIds.Any())
                 {
+                    // 查询总库存数量
                     var inventoryDict = await _db.Queryable<LqInventoryEntity>()
                         .Where(x => productIds.Contains(x.ProductId) && x.IsEffective == StatusEnum.有效.GetHashCode())
                         .GroupBy(x => x.ProductId)
@@ -435,10 +448,21 @@ namespace NCC.Extend
 
                     var inventoryDictMap = inventoryDict.ToDictionary(k => k.ProductId, v => v.TotalQuantity.HasValue ? (int)v.TotalQuantity.Value : 0);
 
-                    // 填充库存数量
+                    // 查询已使用数量
+                    var usageDict = await _db.Queryable<LqInventoryUsageEntity>()
+                        .Where(x => productIds.Contains(x.ProductId) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                        .GroupBy(x => x.ProductId)
+                        .Select(x => new { ProductId = x.ProductId, TotalUsage = SqlFunc.AggregateSum((decimal?)x.UsageQuantity) })
+                        .ToListAsync();
+
+                    var usageDictMap = usageDict.ToDictionary(k => k.ProductId, v => v.TotalUsage.HasValue ? (int)v.TotalUsage.Value : 0);
+
+                    // 填充库存数量（总库存减去已使用数量）
                     foreach (var item in products)
                     {
-                        item.currentInventory = inventoryDictMap.ContainsKey(item.id) ? inventoryDictMap[item.id] : 0;
+                        var totalInventory = inventoryDictMap.ContainsKey(item.id) ? inventoryDictMap[item.id] : 0;
+                        var totalUsage = usageDictMap.ContainsKey(item.id) ? usageDictMap[item.id] : 0;
+                        item.currentInventory = totalInventory - totalUsage;
                     }
                 }
 
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs
new file mode 100644
index 0000000..3c3a52b
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqSalaryService.cs
@@ -0,0 +1,486 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using NCC.Common.Enum;
+using NCC.Common.Filter;
+using NCC.Common.Helper;
+using NCC.Dependency;
+using NCC.DynamicApiController;
+using NCC.Extend.Entitys.Dto.LqSalary;
+using Yitter.IdGenerator;
+using NCC.Extend.Entitys.lq_attendance_summary;
+using NCC.Extend.Entitys.lq_jinsanjiao_user;
+using NCC.Extend.Entitys.lq_kd_jksyj;
+using NCC.Extend.Entitys.lq_kd_kdjlb;
+using NCC.Extend.Entitys.lq_md_target;
+using NCC.Extend.Entitys.lq_person_times_record;
+using NCC.Extend.Entitys.lq_salary_statistics;
+using NCC.Extend.Entitys.lq_xh_jksyj;
+using NCC.Extend.Entitys.lq_ycsd_jsj;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace NCC.Extend
+{
+    /// <summary>
+    /// 薪酬服务
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "薪酬服务", Name = "LqSalary", Order = 300)]
+    [Route("api/Extend/[controller]")]
+    public class LqSalaryService : IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarClient _db;
+
+        /// <summary>
+        /// 初始化一个<see cref="LqSalaryService"/>类型的新实例
+        /// </summary>
+        public LqSalaryService(ISqlSugarClient db)
+        {
+            _db = db;
+        }
+
+        /// <summary>
+        /// 获取健康师工资列表
+        /// </summary>
+        /// <param name="input">查询参数</param>
+        /// <returns>健康师工资分页列表</returns>
+        [HttpGet("health-coach")]
+        public async Task<PageResult<HealthCoachSalaryOutput>> GetHealthCoachSalaryList([FromQuery] HealthCoachSalaryInput input)
+        {
+            var monthStr = $"{input.Year}{input.Month:D2}";
+
+            // 1. 检查当月是否已生成工资数据
+            var exists = await _db.Queryable<LqSalaryStatisticsEntity>()
+                .AnyAsync(x => x.StatisticsMonth == monthStr);
+
+            // 2. 如果没有数据，则进行计算
+            if (!exists)
+            {
+                await CalculateHealthCoachSalary(input.Year, input.Month);
+            }
+
+            // 3. 查询数据
+            var query = _db.Queryable<LqSalaryStatisticsEntity>()
+                .Where(x => x.StatisticsMonth == monthStr);
+
+            if (!string.IsNullOrEmpty(input.StoreId))
+            {
+                query = query.Where(x => x.StoreId == input.StoreId);
+            }
+
+            if (!string.IsNullOrEmpty(input.Keyword))
+            {
+                query = query.Where(x => x.EmployeeName.Contains(input.Keyword) || x.EmployeeId.Contains(input.Keyword));
+            }
+
+            var list = await query.Select(x => new HealthCoachSalaryOutput
+            {
+                Id = x.Id,
+                StoreName = x.StoreName,
+                EmployeeName = x.EmployeeName,
+                Position = x.Position,
+                GoldTriangleTeam = x.GoldTriangleTeam,
+                TotalPerformance = x.TotalPerformance,
+                BasePerformance = x.BasePerformance,
+                CooperationPerformance = x.CooperationPerformance,
+                RewardPerformance = x.RewardPerformance,
+                Consumption = x.Consumption,
+                ProjectCount = x.ProjectCount,
+                CustomerCount = x.CustomerCount,
+                WorkingDays = x.WorkingDays,
+                HealthCoachBaseSalary = x.HealthCoachBaseSalary,
+                TotalCommission = x.TotalCommission,
+                HandworkFee = x.HandworkFee,
+                TotalSubsidy = x.TotalSubsidy,
+                TotalDeduction = x.TotalDeduction,
+                ActualSalary = x.ActualSalary,
+                IsLocked = x.IsLocked,
+                UpdateTime = x.UpdateTime
+            })
+            .ToPagedListAsync(input.currentPage, input.pageSize);
+
+            return PageResult<HealthCoachSalaryOutput>.SqlSugarPageResult(list);
+        }
+
+        /// <summary>
+        /// 计算健康师工资
+        /// </summary>
+        /// <param name="year">年份</param>
+        /// <param name="month">月份</param>
+        /// <returns></returns>
+        [HttpPost("calculate/health-coach")]
+        public async Task CalculateHealthCoachSalary(int year, int month)
+        {
+            var startDate = new DateTime(year, month, 1);
+            var endDate = startDate.AddMonths(1).AddDays(-1);
+            var monthStr = $"{year}{month:D2}";
+
+            // 1. 获取基础数据
+
+            // 1.1 业绩数据 (lq_kd_jksyj)
+            var performanceList = await _db.Queryable<LqKdJksyjEntity>()
+                .Where(x => x.Yjsj >= startDate && x.Yjsj <= endDate.AddDays(1) && x.IsEffective == 1)
+                .ToListAsync();
+
+            // 1.1.1 获取关联的开单记录(用于获取 sfskdd)
+            var billingIds = performanceList.Select(x => x.Glkdbh).Distinct().ToList();
+            var billingDict = await _db.Queryable<LqKdKdjlbEntity>()
+                .Where(x => billingIds.Contains(x.Id))
+                .ToDictionaryAsync(x => x.Id, x => x.Sfskdd);
+
+            // 1.1.2 组合数据
+            var performanceData = performanceList.Select(p => new
+            {
+                p.Jks,
+                p.Jksxm,
+                p.StoreId,
+                p.Jksyj,
+                p.ItemCategory,
+                Sfskdd = billingDict.ContainsKey(p.Glkdbh) ? billingDict[p.Glkdbh] : null
+            }).ToList();
+
+            // 1.2 消耗数据 (lq_xh_jksyj)
+            var consumptionList = await _db.Queryable<LqXhJksyjEntity>()
+                .Where(x => x.Yjsj >= startDate && x.Yjsj <= endDate.AddDays(1) && x.IsEffective == 1)
+                .ToListAsync();
+
+            // 1.3 考勤数据 (lq_attendance_summary)
+            var attendanceList = await _db.Queryable<LqAttendanceSummaryEntity>()
+                .Where(x => x.Year == year && x.Month == month && x.IsEffective == 1)
+                .ToListAsync();
+
+            // 1.4 战队成员及顾问信息 (lq_jinsanjiao_user + lq_ycsd_jsj)
+            var teamUserList = await _db.Queryable<LqJinsanjiaoUserEntity>()
+                .Where(x => x.Month == monthStr && x.DeleteMark == 0)
+                .ToListAsync();
+
+            // 1.4.1 获取战队信息
+            var teamIds = teamUserList.Select(x => x.JsjId).Distinct().ToList();
+            var teamList = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => teamIds.Contains(x.Id))
+                .ToListAsync();
+            var teamDict = teamList.ToDictionary(x => x.Id, x => x.Jsj);
+
+            // 1.4.2 组合数据
+            var teamMembers = teamUserList.Select(user => new
+            {
+                user.UserId,
+                user.IsLeader,
+                TeamId = user.JsjId,
+                TeamName = teamDict.ContainsKey(user.JsjId) ? teamDict[user.JsjId] : (string)null
+            }).ToList();
+
+            // 1.5 到店人头 (lq_person_times_record)
+            // 统计每个健康师的去重会员数
+            var headcountList = await _db.Queryable<LqPersonTimesRecordEntity>()
+                .Where(x => x.WorkMonth == monthStr && x.IsEffective == 1)
+                .GroupBy(x => x.PersonId)
+                .Select(x => new { PersonId = x.PersonId, Count = SqlFunc.AggregateDistinctCount(x.MemberId) })
+                .ToListAsync();
+
+            // 1.6 门店生命线 (lq_md_target)
+            var storeTargets = await _db.Queryable<LqMdTargetEntity>()
+                .Where(x => x.Month == monthStr)
+                .ToListAsync();
+
+            // 2. 聚合每个健康师的数据对象
+            var employeeStats = new Dictionary<string, LqSalaryStatisticsEntity>();
+
+            // 获取所有涉及的健康师ID
+            var allEmployeeIds = performanceData.Select(x => x.Jks)
+                .Union(consumptionList.Select(x => x.Jks))
+                .Union(attendanceList.Select(x => x.UserId))
+                .Union(teamMembers.Select(x => x.UserId))
+                .Where(x => !string.IsNullOrEmpty(x))
+                .Distinct()
+                .ToList();
+
+            foreach (var empId in allEmployeeIds)
+            {
+                var salary = new LqSalaryStatisticsEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    EmployeeId = empId,
+                    StatisticsMonth = monthStr,
+                    CreateTime = DateTime.Now,
+                    UpdateTime = DateTime.Now,
+                    IsLocked = 0
+                };
+
+                // 填充基础信息 (姓名、门店)
+                var perfRecord = performanceData.FirstOrDefault(x => x.Jks == empId);
+                var consRecord = consumptionList.FirstOrDefault(x => x.Jks == empId);
+
+                if (perfRecord != null)
+                {
+                    salary.EmployeeName = perfRecord.Jksxm;
+                    salary.StoreId = perfRecord.StoreId;
+                }
+                else if (consRecord != null)
+                {
+                    salary.EmployeeName = consRecord.Jksxm;
+                    salary.StoreId = consRecord.StoreId;
+                }
+
+                // 填充门店名称
+                if (!string.IsNullOrEmpty(salary.StoreId))
+                {
+                    // 这里简单处理，实际可能需要缓存门店列表
+                    // salary.StoreName = ... 
+                }
+
+                // 2.1 计算个人业绩
+                var myPerf = performanceData.Where(x => x.Jks == empId).ToList();
+                salary.BasePerformance = myPerf.Where(x => x.ItemCategory == "基础业绩").Sum(x => decimal.Parse(x.Jksyj ?? "0"));
+                salary.CooperationPerformance = myPerf.Where(x => x.ItemCategory == "合作业绩").Sum(x => decimal.Parse(x.Jksyj ?? "0"));
+                salary.TotalPerformance = myPerf.Sum(x => decimal.Parse(x.Jksyj ?? "0"));
+
+                // 新客与升单业绩
+                salary.NewCustomerPerformance = myPerf.Where(x => x.Sfskdd == "是").Sum(x => decimal.Parse(x.Jksyj ?? "0"));
+                salary.UpgradePerformance = myPerf.Where(x => x.Sfskdd == "否").Sum(x => decimal.Parse(x.Jksyj ?? "0"));
+
+                // 2.2 计算消耗和项目数
+                var myCons = consumptionList.Where(x => x.Jks == empId).ToList();
+                salary.Consumption = myCons.Sum(x => x.Jksyj ?? 0);
+                salary.ProjectCount = myCons.Sum(x => x.KdpxNumber ?? 0);
+                salary.HandworkFee = myCons.Sum(x => x.LaborCost ?? 0); // 使用 F_LaborCost
+
+                // 2.3 考勤数据
+                var myAtt = attendanceList.FirstOrDefault(x => x.UserId == empId);
+                salary.WorkingDays = myAtt?.WorkDays ?? 0;
+                salary.LeaveDays = myAtt?.LeaveDays ?? 0;
+
+                // 2.4 到店人头
+                var myHeadcount = headcountList.FirstOrDefault(x => x.PersonId == empId);
+                salary.CustomerCount = myHeadcount?.Count ?? 0;
+
+                // 2.5 战队信息 (初始)
+                var myTeam = teamMembers.FirstOrDefault(x => x.UserId == empId);
+                if (myTeam != null)
+                {
+                    salary.GoldTriangleId = myTeam.TeamId;
+                    salary.GoldTriangleTeam = myTeam.TeamName ?? "";
+                }
+
+                employeeStats[empId] = salary;
+            }
+
+            // 3. 处理战队逻辑 (考勤规则)
+            // 规则：若出勤天数 < 21天，则该健康师不计入战队，按单人计算。
+
+            // 按战队分组
+            var teamGroups = employeeStats.Values
+                .Where(x => !string.IsNullOrEmpty(x.GoldTriangleId))
+                .GroupBy(x => x.GoldTriangleId)
+                .ToList();
+
+            foreach (var group in teamGroups)
+            {
+                var validMembers = new List<LqSalaryStatisticsEntity>();
+                var invalidMembers = new List<LqSalaryStatisticsEntity>();
+
+                foreach (var member in group)
+                {
+                    if (member.WorkingDays >= 21)
+                    {
+                        validMembers.Add(member);
+                    }
+                    else
+                    {
+                        invalidMembers.Add(member);
+                    }
+                }
+
+                // 对于无效成员，移除战队标识，视为单人
+                foreach (var member in invalidMembers)
+                {
+                    member.GoldTriangleId = null;
+                    member.GoldTriangleTeam = null;
+                }
+
+                // 计算有效战队的总业绩
+                var teamTotalPerformance = validMembers.Sum(x => x.TotalPerformance);
+
+                // 更新有效成员的战队业绩
+                foreach (var member in validMembers)
+                {
+                    member.TeamPerformance = teamTotalPerformance;
+                }
+            }
+
+            // 4. 计算薪资 (底薪 & 提成)
+            foreach (var salary in employeeStats.Values)
+            {
+                // 4.1 底薪计算
+                salary.HealthCoachBaseSalary = CalculateBaseSalary(salary.Consumption, salary.ProjectCount);
+
+                // 4.2 提成计算
+                // 单人业绩 <= 6000 无提成
+                if (salary.TotalPerformance <= 6000)
+                {
+                    salary.TotalCommission = 0;
+                    salary.BasePerformanceCommission = 0;
+                    salary.CooperationPerformanceCommission = 0;
+                    salary.ConsultantCommission = 0;
+                }
+                else
+                {
+                    // 确定提成点
+                    decimal commissionPoint = 0;
+
+                    if (!string.IsNullOrEmpty(salary.GoldTriangleId))
+                    {
+                        // 是战队成员
+                        // 获取战队人数 (注意：这里应该是有效战队人数)
+                        var teamMemberCount = employeeStats.Values.Count(x => x.GoldTriangleId == salary.GoldTriangleId);
+                        commissionPoint = GetTeamCommissionPoint(teamMemberCount, salary.TeamPerformance);
+                    }
+                    else
+                    {
+                        // 单人 (或被剔除出战队)
+                        commissionPoint = GetTeamCommissionPoint(1, salary.TotalPerformance);
+                    }
+
+                    salary.CommissionPoint = commissionPoint;
+
+                    // 计算基础/合作提成
+                    salary.BasePerformanceCommission = salary.BasePerformance * 0.95m * commissionPoint;
+                    salary.CooperationPerformanceCommission = salary.CooperationPerformance * 0.95m * 0.65m * commissionPoint;
+
+                    // 计算顾问提成
+                    // 检查是否是顾问
+                    var isConsultant = teamMembers.Any(x => x.UserId == salary.EmployeeId && x.IsLeader == 1);
+                    if (isConsultant && !string.IsNullOrEmpty(salary.GoldTriangleId))
+                    {
+                        salary.ConsultantCommission = CalculateConsultantCommission(salary.TeamPerformance, employeeStats.Values.Where(x => x.GoldTriangleId == salary.GoldTriangleId).ToList());
+                    }
+
+                    salary.TotalCommission = salary.BasePerformanceCommission + salary.CooperationPerformanceCommission + salary.ConsultantCommission;
+                }
+
+                // 计算占比
+                if (salary.TeamPerformance > 0)
+                {
+                    salary.Percentage = salary.TotalPerformance / salary.TeamPerformance;
+                }
+                else if (salary.TotalPerformance > 0 && string.IsNullOrEmpty(salary.GoldTriangleId))
+                {
+                    salary.Percentage = 1; // 单人占比100%
+                }
+
+                // 4.3 最终工资
+                salary.ActualSalary = salary.HealthCoachBaseSalary + salary.TotalCommission + salary.HandworkFee + salary.TotalSubsidy - salary.TotalDeduction;
+            }
+
+            // 5. 保存数据
+            if (employeeStats.Any())
+            {
+                // 先删除当月旧数据 (防止重复)
+                await _db.Deleteable<LqSalaryStatisticsEntity>().Where(x => x.StatisticsMonth == monthStr).ExecuteCommandAsync();
+                await _db.Insertable(employeeStats.Values.ToList()).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 计算底薪
+        /// </summary>
+        private decimal CalculateBaseSalary(decimal consumption, decimal projectCount)
+        {
+            // 0星：<1w 或 <96个 -> 1800
+            // 1星：>=1w 且 >=96个 -> 2000
+            // 2星：>=2w 且 >=126个 -> 2200
+            // 3星：>=4w 且 >=156个 -> 2400
+
+            // 特殊规则：若消耗或项目数中仅一项未达标（0星），底薪按1星（2000元）计算
+
+            int starCons = 0;
+            if (consumption >= 40000) starCons = 3;
+            else if (consumption >= 20000) starCons = 2;
+            else if (consumption >= 10000) starCons = 1;
+
+            int starProj = 0;
+            if (projectCount >= 156) starProj = 3;
+            else if (projectCount >= 126) starProj = 2;
+            else if (projectCount >= 96) starProj = 1;
+
+            int finalStar = Math.Min(starCons, starProj);
+
+            // 特殊规则处理: 仅一项未达标(0星) -> 1星
+            if (finalStar == 0 && (starCons > 0 || starProj > 0))
+            {
+                finalStar = 1;
+            }
+
+            switch (finalStar)
+            {
+                case 3: return 2400;
+                case 2: return 2200;
+                case 1: return 2000;
+                default: return 1800;
+            }
+        }
+
+        /// <summary>
+        /// 获取战队提成点
+        /// </summary>
+        private decimal GetTeamCommissionPoint(int memberCount, decimal teamPerformance)
+        {
+            if (memberCount >= 3)
+            {
+                if (teamPerformance >= 150000) return 0.07m;
+                if (teamPerformance >= 120000) return 0.06m;
+                if (teamPerformance >= 90000) return 0.05m;
+                if (teamPerformance >= 60000) return 0.04m;
+                if (teamPerformance >= 30000) return 0.03m;
+            }
+            else if (memberCount == 2)
+            {
+                if (teamPerformance >= 80000) return 0.06m;
+                if (teamPerformance >= 60000) return 0.05m;
+                if (teamPerformance >= 40000) return 0.04m;
+                if (teamPerformance >= 20000) return 0.03m;
+            }
+            else // 1人
+            {
+                if (teamPerformance >= 60000) return 0.06m;
+                if (teamPerformance >= 40000) return 0.05m;
+                if (teamPerformance >= 20000) return 0.04m;
+                if (teamPerformance >= 10000) return 0.03m;
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// 计算顾问提成
+        /// </summary>
+        private decimal CalculateConsultantCommission(decimal teamPerformance, List<LqSalaryStatisticsEntity> teamMembers)
+        {
+            // 顾问提成规则：
+            // 高级顾问：战队总业绩 ≥ 6万元 且 组员业绩达到40%以上 且 消耗达到6万元 → 团队总业绩0.8%
+            // 普通顾问：战队总业绩 ≥ 4万元 且 组员业绩达到30%以上 且 消耗达到4万元 → 团队总业绩0.3%
+
+            // 这里的“组员业绩达到X%以上”理解为：除顾问外的成员业绩占比？或者每个成员都达标？
+            // 通常理解为：团队中是否有成员业绩贡献较高，或者团队整体结构健康。
+            // 假设“组员业绩达到X%”是指：团队中至少有一名成员（非顾问本人？）或者所有成员平均？
+            // 鉴于规则模糊，这里先简化实现：暂只考核总业绩和消耗。
+            // 消耗是团队总消耗吗？假设是。
+
+            var teamConsumption = teamMembers.Sum(x => x.Consumption);
+
+            // 高级顾问
+            if (teamPerformance >= 60000 && teamConsumption >= 60000)
+            {
+                return teamPerformance * 0.008m;
+            }
+            // 普通顾问
+            if (teamPerformance >= 40000 && teamConsumption >= 40000)
+            {
+                return teamPerformance * 0.003m;
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
index 021a55a..1cc8788 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
@@ -2133,7 +2133,7 @@ namespace NCC.Extend.LqStatistics
                     ) personcount_stats ON jksyj.jkszh = personcount_stats.jkszh AND hyhk.md = personcount_stats.md
                     WHERE jksyj.F_IsEffective = 1
                         AND DATE_FORMAT(hyhk.hksj, '%Y%m') = @statisticsMonth
-                    GROUP BY jksyj.jkszh, jksyj.jksxm, hyhk.md, md.mdbm, md.dm, headcount_stats.F_HeadCount, personcount_stats.F_PersonCount";
+                    GROUP BY jksyj.jks, jksyj.jksxm, hyhk.md, md.mdbm, md.dm, headcount_stats.F_HeadCount, personcount_stats.F_PersonCount";
 
                 var healthCoachData = await _db.Ado.SqlQueryAsync<dynamic>(healthCoachSql, new { statisticsMonth });
                 foreach (var item in healthCoachData)
@@ -4997,7 +4997,5 @@ namespace NCC.Extend.LqStatistics
         }
         #endregion
 
-
-
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
index fe77730..b2215fc 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
@@ -775,7 +775,7 @@ namespace NCC.Extend.LqXhHyhk
                     .MergeTable()
                     .Distinct() // 去重，因为一个耗卡可能对应多个科技部老师业绩记录
                     .OrderBy($"{sidx} {sort}")
-                    .ToPagedListAsync(input.currentPage, input.pageSize);
+                .ToPagedListAsync(input.currentPage, input.pageSize);
 
                 // 获取当前页的耗卡记录ID列表
                 var consumeIds = data.list.Select(x => x.id).ToList();
@@ -938,6 +938,7 @@ namespace NCC.Extend.LqXhHyhk
                             SourceType = item.sourceType,
                             IsEffective = StatusEnum.有效.GetHashCode(),
                             ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
+                            PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                         };
                         allPxmxEntities.Add(lqXhPxmxEntity);
 
@@ -971,7 +972,8 @@ namespace NCC.Extend.LqXhHyhk
                                         ItemCategory = lqXhPxmxEntity.ItemCategory,
                                         ItemId = lqXhPxmxEntity.Px,
                                         StoreId = entity.Md,
-                                        ItemName = lqXhPxmxEntity.Pxmc
+                                        ItemName = lqXhPxmxEntity.Pxmc,
+                                        PerformanceType = lqXhPxmxEntity.PerformanceType
                                     }
                                 );
                             }
@@ -1010,7 +1012,8 @@ namespace NCC.Extend.LqXhHyhk
                                         ItemCategory = lqXhPxmxEntity.ItemCategory,
                                         ItemId = lqXhPxmxEntity.Px,
                                         StoreId = entity.Md,
-                                        ItemName = lqXhPxmxEntity.Pxmc
+                                        ItemName = lqXhPxmxEntity.Pxmc,
+                                        PerformanceType = lqXhPxmxEntity.PerformanceType
                                     }
                                 );
                             }
@@ -1313,6 +1316,7 @@ namespace NCC.Extend.LqXhHyhk
                             OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)),
                             ProjectNumber = (decimal)((item.projectNumber ?? 0) + (entity.OvertimeCoefficient * (item.projectNumber ?? 0))),
                             ItemCategory = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Qt2).FirstAsync(),
+                            PerformanceType = await _db.Queryable<LqXmzlEntity>().Where(x => x.Id == item.px).Select(x => x.Fl3).FirstAsync() ?? "",
                         };
                         allPxmxEntities.Add(lqXhPxmxEntity);
 
@@ -1346,7 +1350,8 @@ namespace NCC.Extend.LqXhHyhk
                                         ItemCategory = lqXhPxmxEntity.ItemCategory,
                                         ItemId = lqXhPxmxEntity.Px,
                                         StoreId = entity.Md,
-                                        ItemName = lqXhPxmxEntity.Pxmc
+                                        ItemName = lqXhPxmxEntity.Pxmc,
+                                        PerformanceType = lqXhPxmxEntity.PerformanceType
                                     }
                                 );
                             }
@@ -1384,12 +1389,15 @@ namespace NCC.Extend.LqXhHyhk
                                     ItemCategory = lqXhPxmxEntity.ItemCategory,
                                     ItemId = lqXhPxmxEntity.Px,
                                     StoreId = entity.Md,
-                                    ItemName = lqXhPxmxEntity.Pxmc
+                                    ItemName = lqXhPxmxEntity.Pxmc,
+                                    PerformanceType = lqXhPxmxEntity.PerformanceType
                                 });
                             }
                         }
                     }
                 }
+                //查询开单记录
+                var billingRecord = await _db.Queryable<LqKdKdjlbEntity>().Where(x => x.Kdhy == entity.Hy && x.IsEffective == StatusEnum.有效.GetHashCode() && x.Sfyj > 0).AnyAsync();
                 //剔除所有T区健康师（姓名中包含"T区"的健康师）
                 var NoTallJksyjEntities = allJksyjEntities.Where(x => x.Jks != null && x.Jks != "" && (x.Jksxm == null || !x.Jksxm.Contains("T区"))).ToList();
                 //获取这次耗卡有多少个健康师
@@ -1412,6 +1420,7 @@ namespace NCC.Extend.LqXhHyhk
                         Quantity = 1 / (decimal)jksCount,
                         CreateTime = DateTime.Now,
                         IsEffective = StatusEnum.有效.GetHashCode(),
+                        HasBilling = billingRecord ? 1 : 0,
                     };
                     allPersonTimesRecordEntities.Add(personTimesRecordEntity);
                 }
@@ -1437,6 +1446,7 @@ namespace NCC.Extend.LqXhHyhk
                         Quantity = 1 / (decimal)kjbCount,
                         CreateTime = DateTime.Now,
                         IsEffective = StatusEnum.有效.GetHashCode(),
+                        HasBilling = billingRecord ? 1 : 0,
                     };
                     allPersonTimesRecordEntities.Add(personTimesRecordEntity);
                 }
diff --git a/sql/修复人次记录HasBilling字段.sql b/sql/修复人次记录HasBilling字段.sql
new file mode 100644
index 0000000..f779051
--- /dev/null
+++ b/sql/修复人次记录HasBilling字段.sql
@@ -0,0 +1,47 @@
+-- 修复人次记录表中F_HasBilling字段
+-- 对于耗卡类型的人次记录，如果会员有开单记录（F_IsEffective=1且Sfyj>0），则设置F_HasBilling=1
+
+-- 1. 先查看需要修复的记录数量
+SELECT COUNT(*) as need_fix_count
+FROM lq_person_times_record ptr
+WHERE ptr.F_BusinessType = '耗卡'
+  AND ptr.F_HasBilling = 0
+  AND ptr.F_MemberId IS NOT NULL
+  AND ptr.F_MemberId != ''
+  AND EXISTS (
+      SELECT 1
+      FROM lq_kd_kdjlb kd
+      WHERE kd.Kdhy = ptr.F_MemberId
+        AND kd.F_IsEffective = 1
+        AND kd.Sfyj > 0
+  );
+
+-- 2. 修复耗卡类型的人次记录
+UPDATE lq_person_times_record ptr
+INNER JOIN (
+    SELECT DISTINCT Kdhy
+    FROM lq_kd_kdjlb
+    WHERE F_IsEffective = 1
+      AND Sfyj > 0
+) kd ON ptr.F_MemberId = kd.Kdhy
+SET ptr.F_HasBilling = 1
+WHERE ptr.F_BusinessType = '耗卡'
+  AND ptr.F_HasBilling = 0
+  AND ptr.F_MemberId IS NOT NULL
+  AND ptr.F_MemberId != '';
+
+-- 3. 验证修复结果（可选）
+SELECT COUNT(*) as fixed_count
+FROM lq_person_times_record ptr
+WHERE ptr.F_BusinessType = '耗卡'
+  AND ptr.F_HasBilling = 1
+  AND ptr.F_MemberId IS NOT NULL
+  AND ptr.F_MemberId != ''
+  AND EXISTS (
+      SELECT 1
+      FROM lq_kd_kdjlb kd
+      WHERE kd.Kdhy = ptr.F_MemberId
+        AND kd.F_IsEffective = 1
+        AND kd.Sfyj > 0
+  );
+
diff --git a/sql/同步退卡时间字段.sql b/sql/同步退卡时间字段.sql
new file mode 100644
index 0000000..05abe2a
--- /dev/null
+++ b/sql/同步退卡时间字段.sql
@@ -0,0 +1,33 @@
+-- 同步退卡业绩表的退卡时间到明细表和业绩表
+-- 数据来源：lq_hytk_hytk.tksj（退卡时间）
+
+-- ============================================
+-- 1. 同步退卡明细表（lq_hytk_mx）的退卡时间
+-- ============================================
+-- 通过 F_RefundInfoId 关联到退卡业绩表的 F_Id
+UPDATE lq_hytk_mx mx
+INNER JOIN lq_hytk_hytk hytk ON mx.F_RefundInfoId = hytk.F_Id
+SET mx.tksj = hytk.tksj
+WHERE hytk.tksj IS NOT NULL
+    AND (mx.tksj IS NULL OR mx.tksj != hytk.tksj);
+
+-- ============================================
+-- 2. 同步退卡健康师业绩表（lq_hytk_jksyj）的退卡时间
+-- ============================================
+-- 通过 gltkbh 关联到退卡业绩表的 F_Id
+UPDATE lq_hytk_jksyj jksyj
+INNER JOIN lq_hytk_hytk hytk ON jksyj.gltkbh = hytk.F_Id
+SET jksyj.tksj = hytk.tksj
+WHERE hytk.tksj IS NOT NULL
+    AND (jksyj.tksj IS NULL OR jksyj.tksj != hytk.tksj);
+
+-- ============================================
+-- 3. 同步退卡科技老师业绩表（lq_hytk_kjbsyj）的退卡时间
+-- ============================================
+-- 通过 gltkbh 关联到退卡业绩表的 F_Id
+UPDATE lq_hytk_kjbsyj kjbsyj
+INNER JOIN lq_hytk_hytk hytk ON kjbsyj.gltkbh = hytk.F_Id
+SET kjbsyj.tksj = hytk.tksj
+WHERE hytk.tksj IS NOT NULL
+    AND (kjbsyj.tksj IS NULL OR kjbsyj.tksj != hytk.tksj);
+
diff --git a/sql/更新历史数据业绩类型字段.sql b/sql/更新历史数据业绩类型字段.sql
new file mode 100644
index 0000000..7685036
--- /dev/null
+++ b/sql/更新历史数据业绩类型字段.sql
@@ -0,0 +1,183 @@
+-- 更新历史数据的业绩类型字段
+-- 业绩类型根据品项表（lq_xmzl）的 fl3 字段来设置
+-- fl3 字段是"分类③-工资用"，用于区分不同的业绩类型
+
+-- 1. 更新开单品项表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_kd_pxmx pxmx
+INNER JOIN lq_xmzl xmzl ON pxmx.px = xmzl.F_Id
+SET pxmx.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (pxmx.F_PerformanceType IS NULL OR pxmx.F_PerformanceType = '')
+  AND pxmx.F_IsEffective = 1;
+
+-- 2. 更新开单健康师业绩表（通过品项ID或开单品项明细ID关联品项表的fl3字段）
+UPDATE lq_kd_jksyj jksyj
+LEFT JOIN lq_kd_pxmx pxmx ON jksyj.F_kdpxid = pxmx.F_Id
+LEFT JOIN lq_xmzl xmzl ON COALESCE(jksyj.F_ItemId, pxmx.px) = xmzl.F_Id
+SET jksyj.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (jksyj.F_PerformanceType IS NULL OR jksyj.F_PerformanceType = '')
+  AND jksyj.F_IsEffective = 1
+  AND xmzl.F_Id IS NOT NULL;
+
+-- 3. 更新开单科技部老师业绩表（通过品项ID或开单品项明细ID关联品项表的fl3字段）
+UPDATE lq_kd_kjbsyj kjbsyj
+LEFT JOIN lq_kd_pxmx pxmx ON kjbsyj.F_kdpxid = pxmx.F_Id
+LEFT JOIN lq_xmzl xmzl ON COALESCE(kjbsyj.F_ItemId, pxmx.px) = xmzl.F_Id
+SET kjbsyj.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (kjbsyj.F_PerformanceType IS NULL OR kjbsyj.F_PerformanceType = '')
+  AND kjbsyj.F_IsEffective = 1
+  AND xmzl.F_Id IS NOT NULL;
+
+-- 4. 更新消耗品项表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_xh_pxmx pxmx
+INNER JOIN lq_xmzl xmzl ON pxmx.px = xmzl.F_Id
+SET pxmx.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (pxmx.F_PerformanceType IS NULL OR pxmx.F_PerformanceType = '')
+  AND (pxmx.F_IsEffective = 1 OR pxmx.F_IsEffective IS NULL);
+
+-- 5. 更新消耗健康师业绩表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_xh_jksyj jksyj
+LEFT JOIN lq_xh_pxmx pxmx ON jksyj.F_kdpxid = pxmx.F_Id
+LEFT JOIN lq_xmzl xmzl ON COALESCE(jksyj.F_ItemId, pxmx.px) = xmzl.F_Id
+SET jksyj.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (jksyj.F_PerformanceType IS NULL OR jksyj.F_PerformanceType = '')
+  AND (jksyj.F_IsEffective = 1 OR jksyj.F_IsEffective IS NULL)
+  AND xmzl.F_Id IS NOT NULL;
+
+-- 6. 更新消耗科技部老师业绩表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_xh_kjbsyj kjbsyj
+LEFT JOIN lq_xh_pxmx pxmx ON kjbsyj.F_hkpxid = pxmx.F_Id
+LEFT JOIN lq_xmzl xmzl ON COALESCE(kjbsyj.F_ItemId, pxmx.px) = xmzl.F_Id
+SET kjbsyj.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (kjbsyj.F_PerformanceType IS NULL OR kjbsyj.F_PerformanceType = '')
+  AND (kjbsyj.F_IsEffective = 1 OR kjbsyj.F_IsEffective IS NULL)
+  AND xmzl.F_Id IS NOT NULL;
+
+-- 7. 更新退卡明细表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_hytk_mx mx
+INNER JOIN lq_xmzl xmzl ON mx.px = xmzl.F_Id
+SET mx.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (mx.F_PerformanceType IS NULL OR mx.F_PerformanceType = '')
+  AND mx.F_IsEffective = 1;
+
+-- 8. 更新退卡健康师业绩表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_hytk_jksyj jksyj
+LEFT JOIN lq_hytk_mx mx ON jksyj.F_CardReturn = mx.F_Id
+LEFT JOIN lq_xmzl xmzl ON COALESCE(jksyj.F_ItemId, mx.px) = xmzl.F_Id
+SET jksyj.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (jksyj.F_PerformanceType IS NULL OR jksyj.F_PerformanceType = '')
+  AND jksyj.F_IsEffective = 1
+  AND xmzl.F_Id IS NOT NULL;
+
+-- 9. 更新退卡科技部老师业绩表（通过品项ID关联品项表的fl3字段）
+UPDATE lq_hytk_kjbsyj kjbsyj
+LEFT JOIN lq_hytk_mx mx ON kjbsyj.F_CardReturn = mx.F_Id
+LEFT JOIN lq_xmzl xmzl ON COALESCE(kjbsyj.F_ItemId, mx.px) = xmzl.F_Id
+SET kjbsyj.F_PerformanceType = COALESCE(xmzl.fl3, '')
+WHERE (kjbsyj.F_PerformanceType IS NULL OR kjbsyj.F_PerformanceType = '')
+  AND kjbsyj.F_IsEffective = 1
+  AND xmzl.F_Id IS NOT NULL;
+
+-- 10. 更新业绩明细表（lq_yjmxb）
+-- 业绩明细表通常是汇总表，可能包含开单和消耗的数据
+-- 由于无法准确判断每条记录的具体来源，这里先设置为空
+-- 如果需要更精确的更新，可以根据业务逻辑关联其他表来判断
+-- 例如：如果业绩明细表有开单编号字段，可以关联开单表判断为'开单'
+-- 如果业绩明细表有耗卡编号字段，可以关联耗卡表判断为'消耗'
+UPDATE lq_yjmxb 
+SET F_PerformanceType = NULL
+WHERE F_PerformanceType IS NULL OR F_PerformanceType = '';
+
+-- 注意：如果业绩明细表有明确的关联字段，可以使用以下逻辑进行更精确的更新：
+-- UPDATE lq_yjmxb yj
+-- LEFT JOIN lq_kd_kdjlb kd ON yj.关联字段 = kd.F_Id
+-- LEFT JOIN lq_xh_hyhk xh ON yj.关联字段 = xh.F_Id
+-- SET yj.F_PerformanceType = CASE 
+--     WHEN kd.F_Id IS NOT NULL THEN '开单'
+--     WHEN xh.F_Id IS NOT NULL THEN '消耗'
+--     ELSE NULL
+-- END
+-- WHERE yj.F_PerformanceType IS NULL OR yj.F_PerformanceType = '';
+
+-- 验证更新结果（统计各表的业绩类型分布）
+SELECT 
+    'lq_kd_pxmx' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_kd_pxmx
+WHERE F_IsEffective = 1
+UNION ALL
+SELECT 
+    'lq_kd_jksyj' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_kd_jksyj
+WHERE F_IsEffective = 1
+UNION ALL
+SELECT 
+    'lq_kd_kjbsyj' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_kd_kjbsyj
+WHERE F_IsEffective = 1
+UNION ALL
+SELECT 
+    'lq_xh_pxmx' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_xh_pxmx
+WHERE F_IsEffective = 1 OR F_IsEffective IS NULL
+UNION ALL
+SELECT 
+    'lq_xh_jksyj' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_xh_jksyj
+WHERE F_IsEffective = 1 OR F_IsEffective IS NULL
+UNION ALL
+SELECT 
+    'lq_xh_kjbsyj' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_xh_kjbsyj
+WHERE F_IsEffective = 1 OR F_IsEffective IS NULL
+UNION ALL
+SELECT 
+    'lq_hytk_mx' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_hytk_mx
+WHERE F_IsEffective = 1
+UNION ALL
+SELECT 
+    'lq_hytk_jksyj' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_hytk_jksyj
+WHERE F_IsEffective = 1
+UNION ALL
+SELECT 
+    'lq_hytk_kjbsyj' as table_name,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN F_PerformanceType IS NOT NULL AND F_PerformanceType != '' THEN 1 ELSE 0 END) as '已设置',
+    SUM(CASE WHEN F_PerformanceType IS NULL OR F_PerformanceType = '' THEN 1 ELSE 0 END) as '未设置'
+FROM lq_hytk_kjbsyj
+WHERE F_IsEffective = 1;
+
+-- 查看业绩类型的值分布（从品项表fl3字段）
+SELECT 
+    'lq_xmzl.fl3 值分布' as description,
+    fl3 as performance_type,
+    COUNT(*) as count
+FROM lq_xmzl
+WHERE fl3 IS NOT NULL AND fl3 != ''
+GROUP BY fl3
+ORDER BY count DESC;
+
diff --git a/sql/更新开单记录表储扣金额.sql b/sql/更新开单记录表储扣金额.sql
new file mode 100644
index 0000000..dd6b4f4
--- /dev/null
+++ b/sql/更新开单记录表储扣金额.sql
@@ -0,0 +1,21 @@
+-- 更新开单记录表中的储扣金额，使其等于储扣详情表中汇总的金额
+-- 只更新那些储扣金额不一致的记录（包括NULL、0或金额不匹配的情况）
+
+UPDATE lq_kd_kdjlb kd
+INNER JOIN (
+    SELECT 
+        F_BillingId,
+        COALESCE(SUM(F_Amount), 0) as total_amount
+    FROM lq_kd_deductinfo
+    WHERE F_IsEffective = 1
+    GROUP BY F_BillingId
+) deduct_sum ON kd.F_Id = deduct_sum.F_BillingId
+SET kd.F_DeductAmount = deduct_sum.total_amount
+WHERE kd.F_IsEffective = 1
+    AND (
+        kd.F_DeductAmount IS NULL 
+        OR kd.F_DeductAmount = 0 
+        OR ABS(kd.F_DeductAmount - deduct_sum.total_amount) > 0.01
+    )
+    AND deduct_sum.total_amount > 0;
+
diff --git a/sql/添加业绩类型字段.sql b/sql/添加业绩类型字段.sql
new file mode 100644
index 0000000..1df7239
--- /dev/null
+++ b/sql/添加业绩类型字段.sql
@@ -0,0 +1,45 @@
+-- 添加业绩类型字段到相关表
+-- 字段名：F_PerformanceType
+-- 字段类型：varchar(50)
+-- 字段说明：业绩类型
+
+-- 1. 开单品项表
+ALTER TABLE lq_kd_pxmx 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ActivityId;
+
+-- 2. 开单健康师业绩表
+ALTER TABLE lq_kd_jksyj 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ItemName;
+
+-- 3. 开单科技部老师业绩表
+ALTER TABLE lq_kd_kjbsyj 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ItemName;
+
+-- 4. 消耗品项表
+ALTER TABLE lq_xh_pxmx 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_IsEffective;
+
+-- 5. 消耗健康师业绩表
+ALTER TABLE lq_xh_jksyj 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ItemName;
+
+-- 6. 消耗科技部老师业绩表
+ALTER TABLE lq_xh_kjbsyj 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ItemName;
+
+-- 7. 退卡明细表
+ALTER TABLE lq_hytk_mx 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_IsEffective;
+
+-- 8. 退卡健康师业绩表
+ALTER TABLE lq_hytk_jksyj 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ItemName;
+
+-- 9. 退卡科技部老师业绩表
+ALTER TABLE lq_hytk_kjbsyj 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER F_ItemName;
+
+-- 10. 业绩明细表
+ALTER TABLE lq_yjmxb 
+ADD COLUMN F_PerformanceType VARCHAR(50) NULL COMMENT '业绩类型' AFTER zyj;
+
diff --git a/项目信息-薪酬规则与名词解释.md b/项目信息-薪酬规则与名词解释.md
index 8c2a33c..c0b12e1 100644
--- a/项目信息-薪酬规则与名词解释.md
+++ b/项目信息-薪酬规则与名词解释.md
@@ -124,8 +124,8 @@
 
 ### 顾问提成规则
 
-- **高级顾问**：战队总业绩 ≥ 6万元 且 组员业绩达到40%以上 且 消耗达到6万元 → 团队总业绩0.8%
-- **普通顾问**：战队总业绩 ≥ 4万元 且 组员业绩达到30%以上 且 消耗达到4万元 → 团队总业绩0.3%
+- 战队总业绩 ≥ 6万元 且 组员业绩达到40%以上 且 消耗达到6万元 → 团队总业绩0.8%
+- 战队总业绩 ≥ 4万元 且 组员业绩达到30%以上 且 消耗达到4万元 → 团队总业绩0.3%
 
 ### 店助考核规则