From 2a0a250857cc9b3f3719393a38a0726cfc86211b Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 21 Aug 2024 18:16:51 +0800
Subject: [PATCH] SEO

---
 src/components/doctorCheck/CheckPicture.vue   |   2 +-
 src/components/doctorCheck/QueueCheckList.vue |   2 +-
 .../doctorCheck/RegisterCheckEdit.vue         |   1 -
 .../doctorCheck/RegisterCheckList.vue         |   2 +-
 src/components/itemSet/ReferenceRange.vue     |  55 ++----
 .../patientRegister/patientRegisterQuery.vue  |   1 +
 src/views/doctorCheck/doctorCheck.vue         |   6 +-
 src/views/fee-settings/Asbitem.vue            | 165 +++++-------------
 src/views/fee-settings/Item.vue               |  82 ++++++++-
 src/views/report/report.vue                   |  12 +-
 10 files changed, 155 insertions(+), 173 deletions(-)

diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index cc3a2ee..02633fe 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -258,7 +258,7 @@ export default {
             // ImageFormat
             // console.log(lres.data,this.checkPictures)
           }
-          // console.log('lres', lres)
+          console.log('lres', lres)
         }).catch(err => {
           this.$message.error(err)
         }).finally(() => {
diff --git a/src/components/doctorCheck/QueueCheckList.vue b/src/components/doctorCheck/QueueCheckList.vue
index 2171c14..6a27eba 100644
--- a/src/components/doctorCheck/QueueCheckList.vue
+++ b/src/components/doctorCheck/QueueCheckList.vue
@@ -172,7 +172,7 @@ export default {
     ...mapState(['window', 'dialogWin', 'dataTransOpts', 'dict', 'doctorCheck']),
 
     tableHeight() {
-      return this.window.pageHeight < 600 ? 400 : this.window.pageHeight - 200
+      return this.window.pageHeight < 600 ? 390 : this.window.pageHeight - 210
     },
 
   },
diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue
index a0d91ac..3096d07 100644
--- a/src/components/doctorCheck/RegisterCheckEdit.vue
+++ b/src/components/doctorCheck/RegisterCheckEdit.vue
@@ -23,7 +23,6 @@
           style="width: 90px" size="small" disabled></el-input>
       </div>
       <div>
-        <span class="query">状态</span>
         <el-select v-model="doctorCheck.RegisterCheckEdit.completeFlag" style="width: 60px" size="small" disabled>
           <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index abdc2f6..b44d676 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -82,7 +82,7 @@ export default {
     ...mapState(['window', 'dataTransOpts', 'dict', 'doctorCheck']),
 
     tableHeight() {
-      return this.window.pageHeight < 600 ? 400 : this.window.pageHeight - 200
+      return this.window.pageHeight < 600 ? 390 : this.window.pageHeight - 210
     },
 
     registerCheckList0(){
diff --git a/src/components/itemSet/ReferenceRange.vue b/src/components/itemSet/ReferenceRange.vue
index accc717..7f2667f 100644
--- a/src/components/itemSet/ReferenceRange.vue
+++ b/src/components/itemSet/ReferenceRange.vue
@@ -13,7 +13,7 @@
         <el-table-column prop="ageLowerLimit" label="年龄上限" />
         <el-table-column prop="ageUpperLimit" label="年龄下限" />
         <el-table-column prop="referenceRangeValue" label="参考范围" />
-        <el-table-column prop="随访范围" label="随访范围" />
+        <el-table-column prop="followUpRangeValue" label="随访范围" />
         <el-table-column prop="criticalRangeValue" label="危急范围" />
         <el-table-column prop="lowerDiagnosisId" label="偏低诊断">
           <template slot-scope="scope">
@@ -83,18 +83,25 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="年龄下限" prop="ageLowerLimit">
-              <el-input v-model="form.ageLowerLimit" style="width: 100%" size="small"></el-input> </el-form-item></el-col>
+              <el-input v-model="form.ageLowerLimit" size="small"></el-input> </el-form-item></el-col>
           <el-col :span="8">
             <el-form-item label="年龄上限" prop="ageUpperLimit">
-              <el-input v-model="form.ageUpperLimit" style="width: 85%" size="small"></el-input> </el-form-item></el-col>
+              <el-input v-model="form.ageUpperLimit" size="small"></el-input> </el-form-item></el-col>
           <el-col :span="8">
             <el-form-item label="参考范围" prop="referenceRangeValue">
-              <el-input v-model="form.referenceRangeValue" style="width: 85%" size="small"></el-input>
-            </el-form-item></el-col>
+              <el-input v-model="form.referenceRangeValue" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="随访范围" prop="followUpRangeValue">
+              <el-input v-model="form.followUpRangeValue" size="small"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
-            <el-form-item label="警告范围" prop="">
-              <el-input v-model="form.criticalRangeValue" style="width: 100%" size="small"></el-input>
-            </el-form-item></el-col>
+            <el-form-item label="危急值范围" prop="criticalRangeValue">
+              <el-input v-model="form.criticalRangeValue" size="small"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="偏低诊断" prop="">
               <el-select v-model="form.lowerDiagnosisId" placeholder="请选择" filterable :filter-method="remoteMethods"
@@ -141,9 +148,6 @@ export default {
         referenceRangeValue: [
           { required: true, message: "请输入参考范围", trigger: "blur" },
         ],
-        criticalRangeValue: [
-          { required: true, message: "请输入临界范围", trigger: "blur" },
-        ],
         lowerDiagnosisId: [
           { required: true, message: "请选择偏低诊断", trigger: "blur" },
         ],
@@ -164,6 +168,7 @@ export default {
         ageUpperLimit: "",
         referenceRangeValue: "",
         criticalRangeValue: "",
+        followUpRangeValue:"",
         lowerDiagnosisId: "",
         upperDiagnosisId: "",
         referenceRangeTypeFlag: "1",
@@ -321,6 +326,7 @@ export default {
           this.$message.info({ showClose: true, message: "已取消删除" });
         });
     },
+    
     confirmationRequest() {
       if (!this.id) {
         postapi("/api/app/reference-range", this.form).then((res) => {
@@ -348,32 +354,7 @@ export default {
       this.$refs["form"].validate((v) => {
         let that = this
         if (v) {
-          that.confirmationRequest()
-          // if(that.form.referenceRangeValue.includes('-')){
-          //   let before=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/(\S*)-/)[1])
-          //   let after=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/-(\S*)/)[1])
-          //   if(before && after){
-          //     if(that.form.criticalRangeValue!="" && that.form.criticalRangeValue!=undefined){
-          //       if(that.form.criticalRangeValue.includes('-')){
-          //         let criticalBefore=/^\d+\.?\d?$/.test(that.form.criticalRangeValue.match(/(\S*)-/)[1])
-          //         let criticalAfter=/^\d+\.?\d?$/.test(that.form.criticalRangeValue.match(/-(\S*)/)[1])
-          //         if(criticalBefore && criticalAfter){
-          //           that.confirmationRequest()
-          //         }else{
-          //           return that.$message.warning("警告范围值-符号前后必须是数字");
-          //         }
-          //       }else{
-          //         return that.$message.warning("警告范围值必须以-符号隔开");
-          //       }
-          //     }else{
-          //       that.confirmationRequest()
-          //     }
-          //   }else{
-          //     return that.$message.warning("参考范围值-符号前后必须是数字");
-          //   }
-          // }else{
-          //   return that.$message.warning("参考范围值必须以-符号隔开");
-          // }
+          that.confirmationRequest()          
         }
       });
     },
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 737df95..b4aaccb 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -265,6 +265,7 @@ export default {
       postapi('/api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter', { customerOrgRegisterId }).then(res => {
         if (res.code > - 1) {
           this.dict.customerOrgGroup = res.data;
+          this.$forceUpdate()  // 强制视图更新（页面渲染）
         }
       })
     },
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index ecc04e0..69c1a5c 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -5,7 +5,7 @@
         <div class="contenttitle">
           体检 /<span class="contenttitleBold">检查医生诊台</span>
         </div>
-        <div style="position: absolute;margin-right:110px; top:50px;right:10px;z-index: 2;">
+        <div style="position: absolute;margin-right:120px; top:50px;right:10px;z-index: 2;">
           <el-image style="width: 100px; height: 105px;" :src="peoplePhoto">
             <div slot="placeholder" class="image-slot">
               加载中<span class="dot">...</span>
@@ -14,12 +14,12 @@
         </div>
       </div>
       <div style="display: flex;">
-        <div :style="`width:${window.pageWidth - 100}px;`">
+        <div :style="`width:${window.pageWidth - 120}px;`">
           <div style="display: flex;justify-content:space-between;z-index:-1;">
             <div>
               <PatientRegisterBase />
             </div>
-            <div style="width: 95px;"></div>
+            <div style="width: 100px;"></div>
           </div>
           <div style="display: flex;">
             <el-tabs v-model="activeName" tab-position="bottom" style="width: 200px;">
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index f3280ec..a0e3f39 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -48,8 +48,8 @@
                 'px;padding: 15px;background-color: #fff;border-radius: 8px;'
                 ">
                 <el-table :data="tableData" style="width: 100%" row-key="id" :height="window.pageHeight < 600
-                    ? 190
-                    : Math.floor((window.pageHeight - 260) / 2)
+                  ? 190
+                  : Math.floor((window.pageHeight - 260) / 2)
                   " class="el-table__body-wrapper tbody" @row-click="rowick" highlight-current-row
                   :row-style="{ height: '36px' }" ref="tableData">
                   <el-table-column prop="id" label="编号" width="320">
@@ -139,8 +139,8 @@
                           </el-cascader>
                         </div>
                         <el-table :data="leftdata" :height="window.pageHeight < 600
-                            ? 170
-                            : Math.floor((window.pageHeight - 230) / 2)
+                          ? 170
+                          : Math.floor((window.pageHeight - 230) / 2)
                           " @row-dblclick="dbClickChoosedAsb" @selection-change="handleSelectionChange"
                           @row-click="chooseAsbItem" highlight-current-row :row-style="{ height: '28px' }">
                           <el-table-column type="index" align="center" label="序号" />
@@ -192,8 +192,8 @@
                           </el-select>
                         </div>
                         <el-table :data="rightdata" :height="window.pageHeight < 600
-                            ? 170
-                            : Math.floor((window.pageHeight - 230) / 2)
+                          ? 170
+                          : Math.floor((window.pageHeight - 230) / 2)
                           " width="100%" @row-dblclick="removeAbs" @selection-change="selecteditems"
                           @row-click="removeAsbItem" highlight-current-row :row-style="{ height: '28px' }"
                           :summary-method="getSummaries" show-summary ref="table">
@@ -213,8 +213,8 @@
                         <el-form ref="guidanceinformation" :rules="guidelinesRules" :model="formdata">
                           <el-table :data="formdata.guidanceinformationdata" style="width: 100%" highlight-current-row
                             @row-click="guiderow" :row-class-name="tableRowClassName" :height="window.pageHeight < 600
-                                ? 215
-                                : Math.floor((window.pageHeight - 174) / 2)
+                              ? 215
+                              : Math.floor((window.pageHeight - 174) / 2)
                               " ref="guidanceinformationdata" class="guidelines" border>
                             <el-table-column label="体检中心" width="200">
                               <template slot-scope="scope">
@@ -304,9 +304,9 @@
       </div>
     </div>
     <!-- 新增或者编辑弹框 -->
-    <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="70%" @close="bindidclose"
+    <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="800px" @close="bindidclose"
       :close-on-click-modal="false">
-      <el-form :model="form" :rules="rules" ref="ruleForm" label-width="110px">
+      <el-form :model="form" :rules="rules" ref="ruleForm" label-width="70px">
         <el-row>
           <el-col :span="10">
             <el-form-item label="项目编号" prop="">
@@ -315,15 +315,6 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="项目类别" prop="itemTypeId">
-              <!-- <el-select v-model="form.itemTypeId" placeholder="请选择">
-                    <el-option
-                      v-for="item in itemTypeId"
-                      :key="item.id"
-                      :label="item.displayName"
-                      :value="item.id"
-                    >
-                    </el-option>
-                  </el-select> -->
               <el-cascader v-model="form.itemTypeId" :options="itemTypeId" popper-class="example" ref="itemTypeIds"
                 @change="ischangsItemTypeId" :props="{
                   value: 'id',
@@ -379,7 +370,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="汇总项目类别" prop="collectItemTypeId">
+            <el-form-item label="汇总项目类别" prop="collectItemTypeId" label-width="100px">
               <el-select v-model="form.collectItemTypeId" placeholder="请选择" size="small" @change="quckRusetform">
                 <el-option v-for="item in collectItemType" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
@@ -387,7 +378,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="项目结果合并" prop="" label-width="110px">
+            <el-form-item label="项目结果合并" prop="" label-width="100px">
               <!-- <el-select
                     v-model="form.isItemResultMerger"
                     placeholder="请选择"
@@ -449,7 +440,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="备怀孕期间禁检" prop="">
+            <el-form-item label="备怀孕期间禁检" prop="" label-width="110px">
               <el-select v-model="form.forPregnantFlag" placeholder="请选择" size="small" @change="quckRusetform">
                 <el-option v-for="item in forPregnantFlag" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
@@ -458,18 +449,6 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="启用诊断" prop="">
-              <!-- <el-select
-                    v-model="form.isDiagnosisFunction"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in isDiagnosisFunction"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select> -->
               <el-checkbox v-model="form.isDiagnosisFunctionBox" @change="changeBox('isDiagnosisFunction')" />
             </el-form-item>
           </el-col>
@@ -484,19 +463,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="函数处理完毕" prop="" label-width="110px">
-              <!-- <el-select
-                    v-model="form.isContinueProcess"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in isContinueProcess"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select> -->
+            <el-form-item label="函数处理完毕" prop="" label-width="100px">
               <el-checkbox v-model="form.isContinueProcess" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
@@ -506,6 +473,33 @@
                 size="small"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="4">
+            <el-form-item label="启用危急值" prop="" label-width="85px">
+              <el-checkbox v-model="form.isCriticalValueFunction" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="危急值函数" prop="" label-width="85px">
+              <el-input v-model="form.criticalValueFunction" disabled size="small">
+                <el-button slot="append" icon="el-icon-more" v-if="form.isCriticalValueFunction == 'Y'"
+                  @click="dialogCriticalValueFunction = true" size="small"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="启用随访" prop="">
+              <el-checkbox v-model="form.isFollowUpFunction" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="随访函数" prop="">
+              <el-input v-model="form.followUpFunction" disabled size="small">
+                <el-button slot="append" icon="el-icon-more" v-if="form.isFollowUpFunction == 'Y'"
+                  @click="dialogFollowUpFunction = true" size="small"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="条码模式" prop="">
               <el-select v-model="form.barcodeMode" placeholder="请选择" size="small" @change="quckRusetform">
@@ -515,19 +509,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item label="体检报告" prop="" size="small">
-              <!-- <el-select
-                    v-model="form.isPictureRotate"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in isPictureRotate"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select> -->
+            <el-form-item label="体检报告" prop="">
               <el-checkbox v-model="form.isPictureRotate" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
@@ -546,7 +528,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="疾病筛查类别" prop="">
+            <el-form-item label="疾病筛查类别" prop="" label-width="100px">
               <el-select v-model="form.diseaseScreeningTypeId" placeholder="请选择" size="small" @change="quckRusetform">
                 <el-option v-for="item in diseaseScreeningType" :key="item.id" :label="item.displayName"
                   :value="item.id">
@@ -832,6 +814,10 @@ export default {
         forPregnantFlag: "A",
         maritalStatusId: "A",
         suggestReason: "",
+        isCriticalValueFunction:'N',
+        criticalValueFunction:'',
+        isFollowUpFunction:'N',
+        followUpFunction:''
       },
       forSexId: [], //性别
       forPregnantFlag: [
@@ -1844,35 +1830,8 @@ export default {
     addoredit() {
       this.$refs.ruleForm.validate((v) => {
         if (v) {
+          let obj = Object.assign({}, this.form, { price: Number(this.form.price) })
           if (this.title == 1) {
-            let obj = {
-              displayName: this.form.displayName,
-              shortName: this.form.shortName,
-              forSexId: this.form.forSexId,
-              itemTypeId: this.form.itemTypeId,
-              price: Number(this.form.price),
-              deviceTypeId: this.form.deviceTypeId,
-              invoiceItemTypeId: this.form.invoiceItemTypeId,
-              isItemResultMerger: this.form.isItemResultMerger,
-              isBeforeEat: this.form.isBeforeEat,
-              clinicalMeaning: this.form.clinicalMeaning,
-              defaultResult: this.form.defaultResult,
-              queueTime: this.form.queueTime,
-              isDiagnosisFunction: this.form.isDiagnosisFunction,
-              diagnosisFunction: this.form.diagnosisFunction,
-              isContinueProcess: this.form.isContinueProcess,
-              isPictureRotate: this.form.isPictureRotate,
-              isCheck: this.form.isCheck,
-              isActive: this.form.isActive,
-              collectItemTypeId: this.form.collectItemTypeId,
-              barcodeMode: this.form.barcodeMode,
-              isWebAppoint: this.form.isWebAppoint,
-              warn: this.form.warn,
-              diseaseScreeningTypeId: this.form.diseaseScreeningTypeId,
-              forPregnantFlag: this.form.forPregnantFlag,
-              maritalStatusId: this.form.maritalStatusId,
-              suggestReason:this.form.suggestReason
-            };
             newcombination(obj).then((res) => {
               if (res.code != -1) {
                 this.getItemIdList();
@@ -1886,34 +1845,6 @@ export default {
               }
             });
           } else if (this.title == 2) {
-            let obj = {
-              displayName: this.form.displayName,
-              shortName: this.form.shortName,
-              forSexId: this.form.forSexId,
-              itemTypeId: this.form.itemTypeId,
-              price: Number(this.form.price),
-              deviceTypeId: this.form.deviceTypeId,
-              invoiceItemTypeId: this.form.invoiceItemTypeId,
-              isItemResultMerger: this.form.isItemResultMerger,
-              isBeforeEat: this.form.isBeforeEat,
-              clinicalMeaning: this.form.clinicalMeaning,
-              defaultResult: this.form.defaultResult,
-              queueTime: this.form.queueTime,
-              isDiagnosisFunction: this.form.isDiagnosisFunction,
-              diagnosisFunction: this.form.diagnosisFunction,
-              isContinueProcess: this.form.isContinueProcess,
-              isPictureRotate: this.form.isPictureRotate,
-              isCheck: this.form.isCheck,
-              isActive: this.form.isActive,
-              collectItemTypeId: this.form.collectItemTypeId,
-              barcodeMode: this.form.barcodeMode,
-              isWebAppoint: this.form.isWebAppoint,
-              warn: this.form.warn,
-              diseaseScreeningTypeId: this.form.diseaseScreeningTypeId,
-              forPregnantFlag: this.form.forPregnantFlag,
-              maritalStatusId: this.form.maritalStatusId,
-              suggestReason:this.form.suggestReason
-            };
             updateombination(this.form.id, obj).then((res) => {
               if (res.code != -1) {
                 this.tableData.forEach((item, index) => {
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index be14e17..d2f4462 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -221,7 +221,7 @@
         </div>
       </el-card>
     </div> -->
-    <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="70%"
+    <el-dialog :title="title == 1 ? '新增' : '编辑'" :visible.sync="dialogVisible" width="800px"
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="110px" :rules="rules">
         <el-row>
@@ -418,28 +418,54 @@
             <el-form-item label="启用" prop="">
               <el-checkbox v-model="isActiveBox" @change="changeBox('isActive')" />
             </el-form-item>
+          </el-col>          
+        </el-row>
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="启用危急值函数" prop="isCriticalValueFunction">
+              <el-checkbox v-model="form.isCriticalValueFunction" size="small" true-label="Y" false-label="N"/>
+            </el-form-item> 
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="危急值函数" prop="criticalValueFunction">
+              <el-input v-model="form.criticalValueFunction" disabled size="small">
+                <el-button slot="append" icon="el-icon-more" v-if="form.isCriticalValueFunction == 'Y'" @click="dialogCriticalValueFunction = true" size="small"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="启用随访函数" prop="isFollowUpFunction">
+              <el-checkbox v-model="form.isFollowUpFunction" size="small" true-label="Y" false-label="N"/>
+            </el-form-item> 
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="随访函数" prop="followUpFunction">
+              <el-input v-model="form.followUpFunction" disabled size="small">
+                <el-button slot="append" icon="el-icon-more" v-if="form.isFollowUpFunction == 'Y'" @click="dialogFollowUpFunction = true" size="small"></el-button>
+              </el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <!--  -->
         <el-divider></el-divider>
         <el-row>
           <el-col :span="5">
-            <el-form-item label="创建者">
+            <el-form-item label="创建者" label-width="50px">
               <el-input v-model="form.creatorName" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="创建时间" style="margin-left: -5%">
+            <el-form-item label="创建时间" label-width="70px">
               <el-input :value="form.creationTime | dateFormat" disabled style="width: 90%" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="修改者" style="margin-left: -25%">
+            <el-form-item label="修改者" label-width="50px">
               <el-input v-model="form.creatorName" disabled size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="修改时间" style="margin-left: -5%">
+            <el-form-item label="修改时间" label-width="70px">
               <el-input :value="form.lastModificationTime | dateFormat" disabled style="width: 90%"
                 size="small"></el-input>
             </el-form-item>
@@ -899,6 +925,43 @@
         <el-button type="primary" @click="OnsubmitDiagnosis" class="commonbutton">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 危急值函数弹框 -->
+    <el-dialog title="危急值函数设置" :visible.sync="dialogCriticalValueFunction" width="90%" :close-on-click-modal="false" fullscreen>
+      <el-form label-width="110px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="危急值函数">
+              <el-input type="textarea" v-model="form.criticalValueFunction"
+                :autosize="{ minRows: 29, maxRows: 29 }"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="(dialogCriticalValueFunction = false), (form.criticalValueFunction = '')" class="difference">取
+          消</el-button>
+        <el-button type="primary" @click="dialogCriticalValueFunction = false" class="commonbutton">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 危急值函数弹框 -->
+    <el-dialog title="随访函数设置" :visible.sync="dialogFollowUpFunction" :close-on-click-modal="false" fullscreen>
+      <el-form label-width="110px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="随访函数">
+              <el-input type="textarea" v-model="form.followUpFunction"
+                :autosize="{ minRows: 29, maxRows: 29 }"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="(dialogFollowUpFunction = false), (form.followUpFunction = '')" class="difference">取
+          消</el-button>
+        <el-button type="primary" @click="dialogFollowUpFunction = false" class="commonbutton">确 定</el-button>
+      </span>
+    </el-dialog>
+
     <!-- 计算函数弹框 -->
     <el-dialog title="计算函数设置" :visible.sync="calculationFunctionBox" width="50%" :close-on-click-modal="false"
       fullscreen>
@@ -1067,7 +1130,11 @@ export default {
         inputCheck: "",
         isActive: "",
         lineModeFlag: '2',
-        deviceTypeId: null
+        deviceTypeId: null,
+        isCriticalValueFunction:'N',
+        criticalValueFunction:'',
+        isFollowUpFunction:'N',
+        followUpFunction:'',
       },
       referenceRangeTypeFlag: [
         {
@@ -1301,6 +1368,8 @@ export default {
       reference: [], //参考范围
       resulttemp: [], // 结果模板
       disableddiagnosisFunction: true,
+      dialogFollowUpFunction:false,   // 随访函数详细编辑窗口
+      dialogCriticalValueFunction:false, // 危急值详细编辑窗口 
       curRow: {},
       diagnosisFunctionText: "",
       calculationFunctionText: "",
@@ -2436,6 +2505,7 @@ export default {
       this.calculationFunctionText = "";
       this.calculationFunctionBox = false;
     },
+    
     //确定新增或者编辑
     Onsubmit() {
       this.$refs.form.validate((v) => {
diff --git a/src/views/report/report.vue b/src/views/report/report.vue
index 7d43504..3001548 100644
--- a/src/views/report/report.vue
+++ b/src/views/report/report.vue
@@ -93,12 +93,12 @@ export default {
       );
 
       //体检单位树
-      getapi("/api/app/customerorg/getbycodeall").then((res) => {
-        if (res.code != -1) {
-          this.patientRegister.customerOrgTreeAll = res.data;
-          tcdate(this.patientRegister.customerOrgTreeAll);
-        }
-      });
+      // getapi("/api/app/customerorg/getbycodeall").then((res) => {
+      //   if (res.code != -1) {
+      //     this.patientRegister.customerOrgTreeAll = res.data;
+      //     tcdate(this.patientRegister.customerOrgTreeAll);
+      //   }
+      // });
 
       //体检类别
       getapi("/api/app/medical-type/in-filter").then((res) => {