diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index d6c2e73..866eb6a 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -1,15 +1,12 @@
 <template>
   <div>
     <div>
-      <div style="display: flex;justify-content:space-between;"> 
+      <div style="display: flex;justify-content:space-between;">
         <div class="contenttitle">
           体检 /<span class="contenttitleBold">检查医生诊台</span>
-        </div>  
+        </div>
         <div style="position: absolute;margin-right:110px; top:50px;right:10px;z-index: 2;">
-          <el-image
-            style="width: 100px; height: 105px;"
-            :src="peoplePhoto"
-            >
+          <el-image style="width: 100px; height: 105px;" :src="peoplePhoto">
             <div slot="placeholder" class="image-slot">
               加载中<span class="dot">...</span>
             </div>
@@ -18,49 +15,54 @@
       </div>
       <div style="display: flex;">
         <div :style="`width:${window.pageWidth - 100}px;`">
-          <div style="display: flex;justify-content:space-between;z-index:-1;" >
+          <div style="display: flex;justify-content:space-between;z-index:-1;">
             <div>
               <PatientRegisterBase />
             </div>
             <div style="width: 95px;"></div>
           </div>
-          <div style="display: flex;">            
+          <div style="display: flex;">
             <el-tabs v-model="activeName" tab-position="bottom" style="width: 200px;">
               <el-tab-pane label="组合项目" name="asbitem">
                 <RegisterCheckList />
               </el-tab-pane>
               <el-tab-pane label="叫号" name="call">
-                <div :style="`height:${window.pageHeight < 600 ? 400:window.pageHeight-200}px;`">叫号</div>
+                <div :style="`height:${window.pageHeight < 600 ? 400 : window.pageHeight - 200}px;`">叫号</div>
               </el-tab-pane>
             </el-tabs>
 
-            <div :style="'width:' + (window.pageWidth - 200 - 110 - 15) + 'px;'" >              
-              <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'" >
-                <CheckItemList :isCheckPicture="isCheckPicture" :registerCheckId="dataTransOpts.tableS.register_check.id"/>
+            <div :style="'width:' + (window.pageWidth - 200 - 110 - 15) + 'px;'">
+              <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
+                <CheckItemList :isCheckPicture="isCheckPicture"
+                  :registerCheckId="dataTransOpts.tableS.register_check.id" />
               </div>
-              <div v-if="isCheckPicture" class="demo-image__preview" :style="'margin-top: 2px;margin-left: 2px;height:110px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
+              <div v-if="isCheckPicture" class="demo-image__preview"
+                :style="'margin-top: 2px;margin-left: 2px;height:110px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
                 <CheckPicture />
               </div>
               <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
-                <CheckSumSug :registerCheckId="dataTransOpts.tableS.register_check.id" :isCheckPicture="isCheckPicture" :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save" :audit="audit" :unAudit="unAudit" :btnLineUp="btnLineUp"/>
+                <CheckSumSug :registerCheckId="dataTransOpts.tableS.register_check.id" :isCheckPicture="isCheckPicture"
+                  :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save"
+                  :audit="audit" :unAudit="unAudit" :btnLineUp="btnLineUp" />
               </div>
               <div :style="'margin-top: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
-                <RegisterCheckEdit :registerCheckId="dataTransOpts.tableS.register_check.id"/>
+                <RegisterCheckEdit :registerCheckId="dataTransOpts.tableS.register_check.id" />
               </div>
             </div>
           </div>
         </div>
         <div style="width:110px;">
-          <ButtonList :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save" :audit="audit" :unAudit="unAudit"/>
+          <ButtonList :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save"
+            :audit="audit" :unAudit="unAudit" />
         </div>
       </div>
-    </div>    
+    </div>
   </div>
 </template>
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { arrayExistObj,tcdate,photoParse } from "../../utlis/proFunc";
+import { arrayExistObj, tcdate, photoParse } from "../../utlis/proFunc";
 
 import PatientRegisterBase from "../../components/doctorCheck/PatientRegisterBase.vue";
 import ButtonList from "../../components/doctorCheck/ButtonList.vue";
@@ -83,9 +85,9 @@ export default {
   },
   data() {
     return {
-      peoplePhoto:'', //人员照片
-      activeName:'asbitem',
-      isCheckPicture:true,  //是否显示结果图片
+      peoplePhoto: '', //人员照片
+      activeName: 'asbitem',
+      isCheckPicture: true,  //是否显示结果图片
     };
   },
 
@@ -93,8 +95,8 @@ export default {
     if (this.$peisAPI) {
       // this.$message.info("此功能，需要在壳客户端才可运行！");
       // console.log('this.$peisAPI',this.$peisAPI)
-      this.$peisAPI.getIsCheckPicture().then(res =>{
-        if(res) this.isCheckPicture = res
+      this.$peisAPI.getIsCheckPicture().then(res => {
+        if (res) this.isCheckPicture = res
       })
     }
 
@@ -103,14 +105,14 @@ export default {
   //挂载完成
   mounted() {
     this.dictInit();
-  },  
+  },
 
   computed: {
-    ...mapState(["window","dataTransOpts","dict", "patientRegister", "customerOrg", "doctorCheck","sumDoctorCheck"]),
+    ...mapState(["window", "dataTransOpts", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck"]),
   },
 
-  methods: {    
-    
+  methods: {
+
     //数据初始化
     dictInit() {
       //性别（仅档案用）
@@ -125,7 +127,7 @@ export default {
         if (res.code == 1) {
           this.dict.forSex = res.data;
         }
-      });      
+      });
 
       //体检中心
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
@@ -186,7 +188,7 @@ export default {
       });
 
       //套餐
-      postapi("/api/app/medicalpackage/GetBasicList",{}).then((res) => {
+      postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
         if (res.code == 1) {
           this.dict.medicalPackage = res.data;
         }
@@ -215,7 +217,7 @@ export default {
       });
 
       //所有组合项目
-      postapi("/api/app/asbitem/GetBasicList",{isFilterActive:'Y'}).then((res) => {
+      postapi("/api/app/asbitem/GetBasicList", { isFilterActive: 'Y' }).then((res) => {
         if (res.code == 1) {
           this.dict.asbItemAll = res.data;
         }
@@ -228,7 +230,7 @@ export default {
         this.patientRegister.customerOrgTreeAll = res.data;
         tcdate(this.patientRegister.customerOrgTreeAll)
       });
-    
+
 
       console.log("dict", this.dict);
     },
@@ -240,49 +242,49 @@ export default {
       if (this.doctorCheck.RegisterCheckEdit.isLock == 'Y') return '组合项目已锁定，不可执行此操作'
       if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return '组合项目已弃检，不可执行此操作'
       if (optType == 'save') {
-          // if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return "请选择检查医生"
-          if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
-          if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
+        // if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return "请选择检查医生"
+        if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
+        if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
       }
       if (optType == 'edit') {
-          if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
-          if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
+        if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+        if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
       }
       if (optType == 'del') {
-          if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
-          if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
+        if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+        if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
       }
       if (optType == 'audit') {
-          if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
-          if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，无需再执行此操作"
+        if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+        if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，无需再执行此操作"
       }
       if (optType == 'unAudit') {
-          if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
-          if (this.doctorCheck.RegisterCheckEdit.isAudit == 'N') return "该检查项目尚未审核，无需执行此操作"
+        if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+        if (this.doctorCheck.RegisterCheckEdit.isAudit == 'N') return "该检查项目尚未审核，无需执行此操作"
       }
-      if (optType == 'delItem' || optType == 'refuseItem' || optType == 'makeDiagnosis' ) {
-          if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
-          if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，请先取消审核"
+      if (optType == 'delItem' || optType == 'refuseItem' || optType == 'makeDiagnosis') {
+        if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
+        if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，请先取消审核"
       }
       return ret
     },
 
     // 生成小结
-    btnMakeDiagnosis(){
+    btnMakeDiagnosis() {
       let ret = this.optGrant('makeDiagnosis')
       if (ret) {
-          this.$message.warning(ret)
-          return
+        this.$message.warning(ret)
+        return
       }
 
-      if(this.doctorCheck.checkItemList.length == 0){
+      if (this.doctorCheck.checkItemList.length == 0) {
         this.$message.warning("系统错误，组合项目没有明细")
         return
       }
-      
+
       console.log('生成小结');
 
-      if(this.doctorCheck.checkSummaryList.length > 0){            
+      if (this.doctorCheck.checkSummaryList.length > 0) {
         this.$confirm("已经有小结，是否重新生成小结?", "提示", {
           confirmButtonText: "是",
           cancelButtonText: "否",
@@ -294,15 +296,15 @@ export default {
             this.$message.info("已取消");
           }
         });
-      }else{
+      } else {
         this.makeDiagnosisFun();
       }
 
     },
 
     // 生成小结的函数
-    makeDiagnosisFun(){
-      
+    makeDiagnosisFun() {
+
       // /api/app/diagnosisfunction/getdiagnosisresult
       // {
       //     "registerCheckId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
@@ -313,85 +315,72 @@ export default {
       //         }
       //     ]
       // }
-      
-    
+
+
       let body = {
-          registerCheckId:'',
-          items:[]
+        registerCheckId: '',
+        items: []
       }
 
-      this.doctorCheck.checkItemList.forEach((e,index) =>{
-          if(index == 0) body.registerCheckId = e.registerCheckId
-          body.items.push({
-              itemId:e.itemId,
-              result:e.result
-          })
+      this.doctorCheck.checkItemList.forEach((e, index) => {
+        if (index == 0) body.registerCheckId = e.registerCheckId
+        body.items.push({
+          itemId: e.itemId,
+          result: e.result
+        })
       })
-      
-      console.log(`/api/app/diagnosisfunction/getdiagnosisresult`, body)
+
+      // 旧接口： console.log(`/api/app/diagnosisfunction/getdiagnosisresult`, body)
       this.doctorCheck.checkSummaryList = []
       this.doctorCheck.checkSuggestionList = []
-      postapi(`/api/app/diagnosisfunction/getdiagnosisresult`, body)
-      .then((res) => {                
-          if (res.code != -1) {
-              // console.log(res.data)
-              // {
-              //     "diagnosisResultDetails": [
-              //     {
-              //         "diagnosisResult": "超重"
-              //     }
-              //     ],
-              //     "diagnosisSuggestionDetails": [
-              //     {
-              //         "diagnosisSuggestion": "定期复查"
-              //     },
-              //     {
-              //         "diagnosisSuggestion": "控制热量摄入，适当运动"
-              //     }
-              //     ]
-              // }
-              
-              // 小结
-              res.data.diagnosisResultDetails.forEach(e =>{
-                  this.doctorCheck.checkSummaryList.push({
-                      id:Math.random(),
-                      registerCheckId:body.registerCheckId,
-                      summary:e.diagnosisResult,
-                      summaryFlag:'Y'
-                  })
+      postapi(`/api/app/DiagnosisFunction/GetDoctorCheckDiagnosisResultAsync`, body)
+        .then((res) => {
+          if (res.code > -1) {
+            // if (res.code == 0) {
+            //   // 个别项目有异常，但不影响其他项目生成小结
+            //   this.$message.warning({ showClose: true, message: res.message })
+            // }
+            // 小结
+            res.data.diagnosisResultDetails.forEach(e => {
+              this.doctorCheck.checkSummaryList.push({
+                id: Math.random(),
+                registerCheckId: body.registerCheckId,
+                summary: e.diagnosisResult,
+                summaryFlag: 'Y'
               })
-
-              // 建议
-              res.data.diagnosisSuggestionDetails.forEach(e =>{
-                  this.doctorCheck.checkSuggestionList.push({
-                      id:Math.random(),
-                      registerCheckId:body.registerCheckId,
-                      suggestion:e.diagnosisSuggestion
-                  })
+            })
+
+            // 建议
+            res.data.diagnosisSuggestionDetails.forEach(e => {
+              this.doctorCheck.checkSuggestionList.push({
+                id: Math.random(),
+                registerCheckId: body.registerCheckId,
+                suggestion: e.diagnosisSuggestion
               })
-              console.log("操作成功！")
+            })
+            console.log("操作成功！")
           }
-      })
-      .catch((err) => {
-        this.$message({ type: "error", message: `生成小结失败，原因：${err}` });
-      });
+        })
+        .catch((err) => {
+          this.$message({ type: "error", message: `生成小结失败，原因：${err}` });
+        });
     },
 
     // 手动新增小结与建议
     addSummary() {
       let ret = this.optGrant('makeDiagnosis')
       if (ret) {
-          this.$message.warning(ret)
-          return
+        this.$message.warning(ret)
+        return
       }
 
       this.doctorCheck.checkSummaryList.push({
-          id:Math.random(),
-          registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
-          summary: '',
-          summaryFlag: 'N',
+        id: Math.random(),
+        registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
+        summary: '',
+        summaryFlag: 'N',
       })
-      
+
     },
 
     //保存数据
@@ -417,9 +406,9 @@ export default {
 
     //更新检查医生
     updateDoctorCheck(successTip) {
-      let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate||new Date(); 
+      let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate || new Date();
       checkDate = moment(new Date(checkDate)).format('yyyy-MM-DD'); //yyyy-MM-DD HH:mm:ss
-      let checkDoctorId = this.doctorCheck.RegisterCheckEdit.checkDoctorId||window.sessionStorage.getItem("user");
+      let checkDoctorId = this.doctorCheck.RegisterCheckEdit.checkDoctorId || window.sessionStorage.getItem("user");
 
       let body = {
         registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
@@ -429,15 +418,15 @@ export default {
       console.log(`/api/app/registercheck/updatecheckdoctor`, body)
       postapi(`/api/app/registercheck/updatecheckdoctor`, body)
         .then((res) => {
-            console.log("updateDoctorCheck", res.data);
-            if (res.code != -1) {
-              console.log("更新检查医生 成功", res.data);
-              this.doctorCheck.RegisterCheckEdit.completeFlag = '1';
-              //更新组合项目列表记录状态
-              let lfind = arrayExistObj(this.doctorCheck.RegisterCheckList,'id',body.registerCheckId)
-              if(lfind > -1) this.doctorCheck.RegisterCheckList[lfind].completeFlag = '1'
-              if(successTip) console.log("操作成功！")
-            }
+          console.log("updateDoctorCheck", res.data);
+          if (res.code != -1) {
+            console.log("更新检查医生 成功", res.data);
+            this.doctorCheck.RegisterCheckEdit.completeFlag = '1';
+            //更新组合项目列表记录状态
+            let lfind = arrayExistObj(this.doctorCheck.RegisterCheckList, 'id', body.registerCheckId)
+            if (lfind > -1) this.doctorCheck.RegisterCheckList[lfind].completeFlag = '1'
+            if (successTip) console.log("操作成功！")
+          }
         })
         .catch((err) => {
           this.$message({ type: "error", message: `更新检查医生失败，原因：${err}` });
@@ -445,10 +434,10 @@ export default {
     },
 
     //更新检查项目明细
-    updateCheckItemList(successTip) {            
-      let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate||new Date();            
+    updateCheckItemList(successTip) {
+      let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate || new Date();
       checkDate = moment(new Date(checkDate)).format('yyyy-MM-DD'); //yyyy-MM-DD HH:mm:ss
-      let checkDoctorId = this.doctorCheck.RegisterCheckEdit.checkDoctorId||window.sessionStorage.getItem("user");
+      let checkDoctorId = this.doctorCheck.RegisterCheckEdit.checkDoctorId || window.sessionStorage.getItem("user");
       let body = []
       for (let i = 0; i < this.doctorCheck.checkItemList.length; i++) {
         body.push({
@@ -465,7 +454,7 @@ export default {
           console.log("updateCheckItemList", res.data);
           if (res.code != -1) {
             console.log("更新检查项目明细成功", res.data);
-            if(successTip) console.log("操作成功！")
+            if (successTip) console.log("操作成功！")
           }
         })
         .catch((err) => {
@@ -484,17 +473,17 @@ export default {
         })
       });
       let body = {
-        registerCheckId:this.doctorCheck.RegisterCheckEdit.id,
+        registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
         details
-      }           
-      
+      }
+
       console.log(`/api/app/registerchecksummary/createregisterchecksummarymany`, body)
       postapi(`/api/app/registerchecksummary/createregisterchecksummarymany`, body)
         .then((res) => {
           console.log("saveCheckSummary", res.data);
           if (res.code != -1) {
             console.log("更新小结 成功", res.data);
-            if(successTip) console.log("操作成功！")
+            if (successTip) console.log("操作成功！")
           }
         })
         .catch((err) => {
@@ -514,9 +503,9 @@ export default {
       });
 
       let body = {
-        registerCheckId:this.doctorCheck.RegisterCheckEdit.id,
+        registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
         details
-      }     
+      }
 
       console.log(`/api/app/registerchecksuggestion/createregisterchecksuggestionmany`, body)
       postapi(`/api/app/registerchecksuggestion/createregisterchecksuggestionmany`, body)
@@ -524,7 +513,7 @@ export default {
           console.log("saveCheckSuggestion", res.data);
           if (res.code != -1) {
             //this.doctorCheck.RegisterCheckEdit.completeFlag = '1';
-            if(successTip) console.log("操作成功！")
+            if (successTip) console.log("操作成功！")
           }
         })
         .catch((err) => {
@@ -549,14 +538,14 @@ export default {
       console.log(`/api/app/registercheck/updateauditordoctor`, body)
       postapi(`/api/app/registercheck/updateauditordoctor`, body)
         .then((res) => {
-            console.log("audit", res.data);
-            if (res.code != -1) {
-                this.doctorCheck.RegisterCheckEdit.isAudit = 'Y';
-                this.$message({ type: "success", message: `组合项目审核成功` });
-            }
+          console.log("audit", res.data);
+          if (res.code != -1) {
+            this.doctorCheck.RegisterCheckEdit.isAudit = 'Y';
+            this.$message({ type: "success", message: `组合项目审核成功` });
+          }
         })
         .catch((err) => {
-            this.$message({ type: "error", message: `组合项目审核失败，原因：${err}` });
+          this.$message({ type: "error", message: `组合项目审核失败，原因：${err}` });
         });
     },
 
@@ -573,8 +562,8 @@ export default {
         .then((res) => {
           console.log("unAudit", res.data);
           if (res.code != -1) {
-              this.doctorCheck.RegisterCheckEdit.isAudit = 'N';
-              this.$message({ type: "success", message: `组合项目取消审核成功` });
+            this.doctorCheck.RegisterCheckEdit.isAudit = 'N';
+            this.$message({ type: "success", message: `组合项目取消审核成功` });
           }
         })
         .catch((err) => {
@@ -583,7 +572,7 @@ export default {
     },
 
     // 排队
-    btnLineUp(){
+    btnLineUp() {
       console.log('排队')
     },
 
@@ -603,8 +592,8 @@ export default {
     //     this.getCustomerOrgGroup(newVal);
     //   }
     // },
-    "patientRegister.photo":{
-      immediate:true,
+    "patientRegister.photo": {
+      immediate: true,
       // deep:true,
       handler(newVal, oldVal) {
         //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)