【机构服务包】引入时，专病错误

src/pages/index/care/institutionService.vue

@@ -108,9 +108,9 @@ const gridOptions = reactive<VxeGridProps<SystemCwModel>>({
   columns: [
     { type: 'seq', width: 70, fixed: 'left' },
     { field: 'name', title: '服务包名称' },
-    { field: 'diagnoseDiseaseNames', title: '专病' },
-    { field: 'diagnoseSyndromeNames', title: '证型' },
-    { field: 'constitutionGroupNames', title: '体质' },
+    { field: 'conditioningWrapPatientMatchRule.diagnoseDiseaseNames', title: '专病' },
+    { field: 'conditioningWrapPatientMatchRule.diagnoseSyndromeNames', title: '证型' },
+    { field: 'conditioningWrapPatientMatchRule.constitutionGroupNames', title: '体质' },
     { field: 'institutionName', title: '机构名称' },
     { field: 'createBy', title: '创建者' },
     { field: 'createTime', title: '创建时间' },

src/pages/index/care/issueService.vue

@@ -805,7 +805,6 @@ watch(showProjectPopover, (val) => {
           {{ formatPatientInfo(currentPatient || null, cpDetail) }}
         </div>
         <div style="margin: 12px 0 12px 0; font-size: 12px">
-          <!-- <div>{{ form.healthAnalysisReport }}</div> -->
           <span style="color: lightgray" v-if="currentPatient?.diagnosis">诊断：</span><span v-if="currentPatient?.diagnosis">{{ currentPatient?.diagnosis }}</span>
           <span style="margin-left: 20px; color: lightgray" v-if="form?.healthAnalysisReport?.willillStateName">欲病状态：</span
           ><span>{{ form?.healthAnalysisReport?.willillStateName }}</span>

src/pages/index/care/systemService.vue

@@ -97,9 +97,9 @@ const gridOptions = reactive<VxeGridProps<SystemCwModel>>({
   columns: [
     { type: 'seq', width: 70, fixed: 'left' },
     { field: 'name', title: '服务包名称' },
-    { field: 'diagnoseDiseaseNames', title: '专病' },
-    { field: 'diagnoseSyndromeNames', title: '证型' },
-    { field: 'constitutionGroupNames', title: '体质' },
+    { field: 'conditioningWrapPatientMatchRule.diagnoseDiseaseNames', title: '专病' },
+    { field: 'conditioningWrapPatientMatchRule.diagnoseSyndromeNames', title: '证型' },
+    { field: 'conditioningWrapPatientMatchRule.constitutionGroupNames', title: '体质' },
     { field: 'createBy', title: '创建者' },
     { field: 'createTime', title: '创建时间' },
     {

src/request/api/patient.api.ts

@@ -157,7 +157,7 @@ export function updatePatientAnalysisCountMethod(id: string, count: number) {
 // 调养
 export function carePatientMethod(id: string) {
   console.log(id, 'carePatientMethod-id');
-  return request.Post(`/fdhb-pc/patientInfoManage/conditioning/${id}`, {}, {
+  return request.Post(`/fdhb-pc/patientInfoManage/conditioning/${id}`, { patientId: id }, {
     transform(data) {
       return data;
     },

src/service/ServicePackageList.vue

@@ -18,6 +18,7 @@ const { loading, page, pageSize, total, onSuccess, replace, refresh, remove } =
 onSuccess(({ data: { data } }) => {
   tableData.value = data;
   loading.value = false;
+  console.log(tableData.value, 'tableData');
 });
 const id = ref<string>('');
 async function handleSelect(model?: SystemCwModel) {
@@ -42,12 +43,12 @@ async function handleSelect(model?: SystemCwModel) {
       props.data.cwPatientMatchRules = model.cwPatientMatchRules;
       props.data.price = model.price;
       props.data.name = model.name;
-      props.data.conditioningWrapPatientMatchRule.diagnoseDiseaseNames = model.diagnoseDiseaseNames;
-      props.data.conditioningWrapPatientMatchRule.diagnoseSyndromeNames = model.diagnoseSyndromeNames;
-      props.data.conditioningWrapPatientMatchRule.constitutionGroupNames = model.constitutionGroupNames; 
-      props.data.conditioningWrapPatientMatchRule.sex = model.sex;
-      props.data.conditioningWrapPatientMatchRule.age = model.age;
-      props.data.conditioningWrapPatientMatchRule.willillStateNames = model.willillStateNames;
+      props.data.conditioningWrapPatientMatchRule.diagnoseDiseaseNames = model.conditioningWrapPatientMatchRule.diagnoseDiseaseNames;
+      props.data.conditioningWrapPatientMatchRule.diagnoseSyndromeNames = model.conditioningWrapPatientMatchRule.diagnoseSyndromeNames;
+      props.data.conditioningWrapPatientMatchRule.constitutionGroupNames = model.conditioningWrapPatientMatchRule.constitutionGroupNames; 
+      props.data.conditioningWrapPatientMatchRule.sex = model.conditioningWrapPatientMatchRule.sex;
+      props.data.conditioningWrapPatientMatchRule.age = model.conditioningWrapPatientMatchRule.age;
+      props.data.conditioningWrapPatientMatchRule.willillStateNames = model.conditioningWrapPatientMatchRule.willillStateNames;
     } catch (err) {
       console.error('Error fetching data:', err);
     }
@@ -81,9 +82,9 @@ async function handleSelect(model?: SystemCwModel) {
   <div style=" background: #fff; padding: 32px; border-radius: 6px; box-shadow: 0 2px 8px #0001">
     <vxe-table :data="tableData" border>
       <vxe-column field="name" title="服务包名称" />
-      <vxe-column field="diagnoseDiseaseNames" title="专病" />
-      <vxe-column field="diagnoseSyndromeNames" title="证型" />
-      <vxe-column field="constitutionGroupNames" title="体质" />
+      <vxe-column field="conditioningWrapPatientMatchRule.diagnoseDiseaseNames" title="专病" />
+      <vxe-column field="conditioningWrapPatientMatchRule.diagnoseSyndromeNames" title="证型" />
+      <vxe-column field="conditioningWrapPatientMatchRule.constitutionGroupNames" title="体质" />
       <vxe-column field="price" title="价格（元）" />
       <vxe-column title="操作" width="80" align="center">
         <template #default="{ row }">