From 9e5f117e42d4a36a8825f61f6a1c5373721207c2 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 10 Aug 2023 18:12:38 +0800
Subject: [PATCH] seo

---
 .../patientRegister/PatientRegisterEdit.vue   |  38 +-
 .../patientRegister/PatientRegisterItem.vue   | 513 +++++++++---------
 .../patientRegister/PatientRegisterList.vue   |   5 +-
 .../patientRegisterAsbItem.vue                |   1 +
 src/store/index.js                            |  76 ++-
 src/views/customerOrg/patientRegister.vue     |   4 +-
 6 files changed, 341 insertions(+), 296 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 4da7703..3a9197c 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -109,23 +109,23 @@
             <el-row>
               <el-col :span="5">
                 <el-form-item label="民族" prop="nationId">
-                  <el-select v-model="form.nationId" placeholder="请选择" filterable
+                  <el-select v-model="form.nationId" placeholder="请选择" filterable clearable
                     :style="'width:'+ Math.floor((window.pageWidth - 530)/ 4.8)+'px;'" >
-                    <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
+                    <el-option v-for="item in dict.nation" :key="item.nationId" :label="item.displayName" :value="item.nationId" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
-                <el-form-item label="籍惯" prop="nationId">
-                  <el-select v-model="form.nationId" placeholder="请选择" filterable
+                <el-form-item label="籍惯" prop="birthPlaceId">
+                  <el-select v-model="form.birthPlaceId" placeholder="请选择" filterable clearable
                     :style="'width:'+ Math.floor((window.pageWidth - 530)/ 4.8)+'px;'" >
-                    <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
+                    <el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
                 <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable
+                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
                     :style="'width:'+ Math.floor((window.pageWidth - 530)/ 4.8)+'px;'" >
                     <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
                       :value="item.id" />
@@ -134,7 +134,7 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="人员类别" prop="personnelTypeId">
-                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable
+                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable clearable
                     :style="'width:'+ Math.floor((window.pageWidth - 530)/ 4.8)+'px;'" >
                     <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
                       :value="item.id" />
@@ -309,7 +309,7 @@
           <el-button @click="readIdCard" class="btnClass">读身份证</el-button>
         </div>
         <div class="btn">
-          <el-button type="success" class="btnClass" @click="Onsubmit('form')">保存</el-button>
+          <el-button type="success" class="btnClass" @click="Onsubmit('form',true)">保存</el-button>
         </div>        
         <div class="btn">
           <el-button type="primary" class="btnClass">申请单</el-button>
@@ -440,6 +440,7 @@ export default {
         telephone: "", //电话
         mobileTelephone: "", //手机号
         nationId: null, //民族编号
+        birthPlaceId: null, //籍惯（出生地）
         postalCode: "", //邮编
         creatorId: null,
         creationTime: "",
@@ -457,6 +458,7 @@ export default {
         "sexHormoneTermId",
         "organizationUnitId",
         "nationId",
+        "birthPlaceId",
       ], //一般uuid字段为空时，需设置为null值
 
       rules: {
@@ -509,11 +511,13 @@ export default {
     //分组改变时触发
     changeCustomerOrgGroupId() {
       this.patientRegister.customerOrgGroupChange++;
+      if(this.form.id) this.Onsubmit('form',false);
     },
 
     //套餐改变时触发
     changeMedicalPackageId() {
       this.patientRegister.medicalPackageChange++;
+      if(this.form.id) this.Onsubmit('form',false);
     },
 
     //根据姓名，身份证号 查询档案信息，用于判断人员多次体检
@@ -569,7 +573,7 @@ export default {
     },
 
     //提交
-    Onsubmit(formName) {
+    Onsubmit(formName,msgTip) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           //赋值
@@ -603,7 +607,7 @@ export default {
               (res) => {
                 if (res.code == 1) {
                   //console.log('res',res)
-                  this.$message.success("创健 操作成功");
+                  if(msgTip) this.$message.success("创健 操作成功");
                   objCopy(res.data, this.form);
                   this.patientRegister.patientRegisterId = res.data.id;
                   this.patientRegister.patientRegisterId = res.data.id;
@@ -615,18 +619,12 @@ export default {
             );
           } else {
             //id不为空则编辑
-            console.log(
-              `/api/app/patient-register?PatientRegisterId=${this.form.id}`,
-              body
-            );
-            putapi(
-              `/api/app/patient-register?PatientRegisterId=${this.form.id}`,
-              body
-            ).then((res) => {
+            console.log(`/api/app/patient-register?PatientRegisterId=${this.form.id}`,body);
+            putapi(`/api/app/patient-register?PatientRegisterId=${this.form.id}`,body).then((res) => {
               if (res.code == 1) {
-                this.$message.success("更新 操作成功");
+                if(msgTip) this.$message.success("更新 操作成功");
                 this.patientRegister.query.times++;
-                this.patientRegister.saveTimes++;
+                //this.patientRegister.saveTimes++;  //更新保存时，无需触发组合项目保存
               }
             });
           }
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 890d3ff..b1894ff 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -1,5 +1,4 @@
 <template>
-  
   <div style="display: flex; margin-left: 10px; margin-top: 20px;">
     <div style="width:230px;">
       <div>
@@ -11,10 +10,11 @@
       </div>
 
       <div class="mainareaBox">
-        <el-table :header-cell-style="{ background: '#eef1f6' }" :data="dict.asbItem" :height="(window.pageHeight>735 ? (window.pageHeight - 537):198)"
+        <el-table :header-cell-style="{ background: '#eef1f6' }" :data="dict.asbItem"
+          :height="(window.pageHeight > 735 ? (window.pageHeight - 537) : 198)" @row-dblclick="dbClickChoosedAsb"
           @selection-change="handleSelectionChange" size="small">
-          <el-table-column type="selection" />
-          <el-table-column prop="displayName" label="未选组合项目" width="120"/>
+          <el-table-column type="selection" align="center" />
+          <el-table-column prop="displayName" label="未选组合项目" width="120" />
           <!--
           <el-table-column prop="price" label="标准价格" width="70">
             <template slot-scope="scope">
@@ -37,59 +37,64 @@
         </el-button>
       </div>
       <div class="btnList">
-        <el-button type="primary" @click="delAbs">移除 <i class="el-icon-back"></i>
+        <el-button type="primary" @click="delAbs(patientRegisterAbsChoosed)">移除 <i class="el-icon-back"></i>
         </el-button>
       </div>
+      <!-- 不显示保存，当已选组合有修改时，失去焦点自动保存
       <div class="btnList">
         <el-button type="success" @click="onSubmit('保存')">保存 <i class="el-icon-check"></i>
         </el-button>
-      </div>      
+      </div> 
+      -->
     </div>
 
-    <div :style="'width:'+(window.pageWidth - 120 - 30 - 230 - 100)+'px;'">
+    <div :style="'width:' + (window.pageWidth - 120 - 30 - 230 - 100) + 'px;'">
       <div style="display: flex;">
         <div class="disTotal">
           <el-tooltip class="item" effect="dark" content="根据输入的折扣，自动计算折后总价" placement="top">
             <span>折扣 </span>
           </el-tooltip>
-          <el-input style="width:55px;" v-model="discount" size="small" @input="changeAllDiscount" type="number"/>                
+          <el-input style="width:55px;" v-model="discount" size="small" type="number" @input="changeAllDiscount"
+            @focus="discountFoucs = true" @blur="discountFoucs = false" />
         </div>
         <div class="disTotal">
           <el-tooltip class="item" effect="dark" content="总金额即该人员此次体检实收金额，并根据此金额自动计算折扣" placement="top">
             <span>总金额 </span>
           </el-tooltip>
-          <el-input style="width:70px;" v-model="total" size="small" @input="changeTotal" type="number"/>
+          <el-input style="width:70px;" v-model="total" size="small" type="number" @input="changeTotal"
+            @focus="totalFoucs = true" @blur="totalFoucs = false" />
         </div>
-        <div class="disTotal">        
-          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small"
-            filterable clearable @change="quickChoosedAsb" style="width:150px;text-align: left;padding-right: 15px;">
-            <el-option v-for="item in dict.asbItemQuick" :key="item.id" :value="item.id" 
-            :label="item.displayName" />
+        <div class="disTotal">
+          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote
+            :remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option
+            style="width:150px;text-align: left;padding-right: 15px;">
+            <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
           </el-select>
         </div>
       </div>
       <div class="mainareaBox">
-        <el-table :data="patientRegister.patientRegisterAbs" 
-          :height="(window.pageHeight>735 ? (window.pageHeight - 537):198)" width="100%"
-          :summary-method="getSummaries" show-summary
-          @selection-change="selecteditems" size="small">
+        <el-table :data="patientRegister.patientRegisterAbs"
+          :height="(window.pageHeight > 735 ? (window.pageHeight - 537) : 198)" width="100%" :summary-method="getSummaries"
+          show-summary @row-dblclick="removeAbs" @selection-change="selecteditems" size="small">
           <!-- temporaryselection   personnelUnit.nogroupselected-->
-          <el-table-column type="selection"/>
+          <el-table-column type="selection" align="center" />
           <el-table-column label="已选组合项目" width="120" prop="asbitemName" />
-          <el-table-column label="标准价格" prop="standardPrice" width="70"/>
+          <el-table-column label="标准价格" prop="standardPrice" width="70" align="center" />
           <el-table-column label="折扣" prop="discount" width="60">
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.discount" size="small" @input="changeDiscount(scope.$index)"/>
+              <el-input type="number" v-model="scope.row.discount" size="small" @input="changeDiscount(scope.$index)"
+                @blur="onSubmit('')" />
             </template>
           </el-table-column>
           <el-table-column label="数量" prop="amount" width="50">
             <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.amount" size="small" />
+              <el-input type="number" v-model="scope.row.amount" size="small" @blur="onSubmit('')" />
             </template>
           </el-table-column>
           <el-table-column label="实收价格" prop="chargePrice" width="70">
             <template slot-scope="scope">
-              <el-input type="number" v-model="patientRegister.patientRegisterAbs[scope.$index].chargePrice" size="small" @input="changePrice(scope.$index)"/>
+              <el-input type="number" v-model="patientRegister.patientRegisterAbs[scope.$index].chargePrice" size="small"
+                @input="changePrice(scope.$index)" @blur="onSubmit('')" />
             </template>
           </el-table-column>
           <el-table-column prop="total" label="金额" width="70" v-if="false" />
@@ -97,21 +102,41 @@
           <el-table-column label="支付方式" prop="payTypeFlag" width="100">
             <template slot-scope="scope">
               <el-select v-model="scope.row.payTypeFlag" size="small">
-                <el-option v-for="item in dict.payType" :key="item.id" 
-                  :label="item.displayName" :value="item.id" />
+                <el-option v-for="item in dict.payType" :key="item.id" :label="item.displayName" :value="item.id" />
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column prop="isCharge" label="收费" width="50" align="center">
+            <template slot-scope="scope">
+              <el-checkbox :value="scope.row.isCharge == 'Y'" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="checkCompleteFlag" label="状态" align="center">
+            <template slot-scope="scope">
+              <div>{{ ldddw(dict.checkCompleteFlag, "id", scope.row.checkCompleteFlag, "displayName") }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isLock" label="锁" width="50" align="center">
+            <template slot-scope="scope">
+              <el-checkbox :value="scope.row.isLock == 'Y'" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorName" label="登记人" align="center"></el-table-column>
+          <el-table-column prop="creationTime" label="登记日期" width="90" align="center">
+            <template slot-scope="scope">
+              <div>{{ lmoment(scope.row.creationTime, 'yyyy-MM-DD') }}</div>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
   </div>
-
 </template>
 <script>
+import moment from 'moment';
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { arrayFilter, arrayReduce, arrayExistObj,dddw } from "../../utlis/proFunc";
+import { arrayFilter, arrayReduce, arrayExistObj, dddw } from "../../utlis/proFunc";
 export default {
   props: ["patientRegisterForm"],
   data() {
@@ -138,24 +163,31 @@ export default {
         groupPackageId: null, //	string($uuid) 分组或者套餐ID
       }, //单个添加的组合项目
 
-      asbItemId:'',
-      discount:100,
-      total:0,
-      totalStand:0,
+      asbItemId: '',
+      discount: 100,
+      total: 0,
+      totalStand: 0,
+      quickAsb: [],
+      totalFoucs: false,    //总价是否获取焦点
+      discountFoucs: false, //总折扣是否获取焦点
     };
   },
   computed: {
-    ...mapState(["window","dict", "customerOrg", "patientRegister", "personnelUnit"]),
+    ...mapState(["window", "dict", "customerOrg", "patientRegister", "personnelUnit"]),
   },
 
   mounted() { },
 
   methods: {
-    ...mapActions(['getCustomerOrgGroup', 'getMedicalPackageAsb', 'getPatientRegisterAbs']),
+    ...mapActions(['getCustomerOrgGroup', 'getPatientRegisterAbs']),
 
     ldddw(arrayData, key, value, display) {
       return dddw(arrayData, key, value, display);
     },
+
+    lmoment(date, forMat) {
+      return moment(new Date(date)).format(forMat);
+    },
     //保存按钮
     // [
     //   {
@@ -173,9 +205,9 @@ export default {
     //批量更新组合项目
     async batchEditAsb(body, msg) {
       console.log(`/api/app/registerasbitem/updatemany`, body)
-      postapi(`/api/app/registerasbitem/updatemany`, body)
+      await postapi(`/api/app/registerasbitem/updatemany`, body)
         .then((res) => {
-          console.log("onSubmit", res);
+          console.log("batchEditAsb", res);
           if (res.code == 1) {
             if (msg) {
               //未选项目中移除，已选项中添加
@@ -193,11 +225,11 @@ export default {
     async onSubmit(msg) {
       let body = [], insBody = []
       if (!this.patientRegisterForm.id) {
-        alert("请先保存人员体检基本信息！")
+        //alert("请先保存人员体检基本信息！")
         return
       }
       if (this.patientRegister.patientRegisterAbs.length < 1) {
-        alert("暂无可操作的数据")
+        //alert("暂无可操作的数据")
         return
       }
       for (let i = 0; i < this.patientRegister.patientRegisterAbs.length; i++) {
@@ -218,7 +250,7 @@ export default {
             patientRegisterId: this.patientRegisterForm.id,
             standardPrice: this.patientRegister.patientRegisterAbs[i].standardPrice,
             chargePrice: this.patientRegister.patientRegisterAbs[i].chargePrice,
-            payTypeFlag:this.patientRegister.patientRegisterAbs[i].payTypeFlag,
+            payTypeFlag: this.patientRegister.patientRegisterAbs[i].payTypeFlag,
             isCharge: this.patientRegister.patientRegisterAbs[i].isCharge,
             amount: this.patientRegister.patientRegisterAbs[i].amount,
             groupPackageId: this.patientRegister.patientRegisterAbs[i].groupPackageId
@@ -227,13 +259,14 @@ export default {
       }
 
       //if (body.length > 0 ) await this.batchEditAsb(body, msg);
-      if (body.length > 0 && insBody.length > 0){
+      console.log('111111', msg, body.length, body, insBody.length, insBody);
+      if (body.length > 0 && insBody.length > 0) {
         await this.batchEditAsb(body, '');
-        await this.batchAddAsb(insBody,msg);
-      }else if (body.length > 0 && insBody.length < 1){
+        await this.batchAddAsb(insBody, msg);
+      } else if (body.length > 0 && insBody.length < 1) {
         await this.batchEditAsb(body, msg);
-      }else if (body.length < 1 && insBody.length > 0){
-        await this.batchAddAsb(insBody,msg);
+      } else if (body.length < 1 && insBody.length > 0) {
+        await this.batchAddAsb(insBody, msg);
       }
 
     },
@@ -246,9 +279,9 @@ export default {
     },
 
     //批量添加组合项目
-    batchAddAsb(body, msg) {
+    async batchAddAsb(body, msg) {
       console.log(`/api/app/registerasbitem/createmany?CustomerOrgId=${this.patientRegisterForm.customerOrgId}`, body)
-      postapi(`/api/app/registerasbitem/createmany?CustomerOrgId=${this.patientRegisterForm.customerOrgId}`, body)
+      await postapi(`/api/app/registerasbitem/createmany?CustomerOrgId=${this.patientRegisterForm.customerOrgId}`, body)
         .then((res) => {
           console.log("batchAddAsb", res);
           if (res.code == 1) {
@@ -265,7 +298,7 @@ export default {
 
     // 添加组合项目
     ///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
-    addAbs(asbItemChoosed) {
+    async addAbs(asbItemChoosed) {
       let body = []
       let checked = true
       let payTypeFlag = '0' //默认个人支付
@@ -281,7 +314,7 @@ export default {
       //   "forSexId": "F",
       //   "itemTypeId": "3a0b16de-75b9-c910-c61b-844709a88940",
       //   "price": 0,
-      console.log('asbItemChoosed.length',asbItemChoosed.length)
+      console.log('asbItemChoosed.length', asbItemChoosed.length)
       for (let i = 0; i < asbItemChoosed.length; i++) {
         if (this.patientRegisterForm.sexId == 'U') break //未选性别时，无需判断组合项目性别限制
         if (asbItemChoosed[i].forSexId == 'A') continue
@@ -304,19 +337,21 @@ export default {
           payTypeFlag,
           isCharge: "N",
           amount: 1,
-          total:asbItemChoosed[i].price,
+          total: asbItemChoosed[i].price,
         }
         body.push(pojo)
         this.patientRegister.patientRegisterAbs.push({ ...pojo, asbitemName: asbItemChoosed[i].displayName })
         lfind = arrayExistObj(this.dict.asbItem, 'id', asbItemChoosed[i].id)
         if (lfind > -1) this.dict.asbItem.splice(lfind, 1)
-      }
 
-      if (this.patientRegisterForm.id) this.batchAddAsb(body, '添加组合项目');
+        lfind = arrayExistObj(this.dict.asbItemQuick, 'id', asbItemChoosed[i].id)
+        if (lfind > -1) this.dict.asbItemQuick.splice(lfind, 1)
 
-    },
+      }
 
+      if (this.patientRegisterForm.id) await this.batchAddAsb(body, '添加组合项目');
 
+    },
 
     //人员已选组合项目 勾选情况
     selecteditems(val) {
@@ -324,9 +359,9 @@ export default {
     },
 
     //批量删除组合项目
-    batchDelAsb(body, msg) {
+    async batchDelAsb(body, msg) {
       console.log(`/api/app/registerasbitem/deletemany`, body)
-      postapi(`/api/app/registerasbitem/deletemany`, body)
+      await postapi(`/api/app/registerasbitem/deletemany`, body)
         .then((res) => {
           console.log("delAbs", res);
           if (res.code != -1) {
@@ -345,33 +380,34 @@ export default {
           this.$message({ type: "error", message: `${msg}操作失败，原因：${err}` });
         });
     },
+
     //删除 人员已选中的组合项目
     ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
-    delAbs() {
+    delAbs(absForDel) {
       let body = {}
       let registerAsbitemIds = []
       let chargeComplete = ''
       let lfind = -1
 
-      if (this.patientRegisterAbsChoosed.length < 1) {
+      if (absForDel.length < 1) {
         alert("请选择要移除的组合项目")
         return
       }
 
-      for (let i = 0; i < this.patientRegisterAbsChoosed.length; i++) {
+      for (let i = 0; i < absForDel.length; i++) {
         //未在数据库中，直接删除
-        if (!this.patientRegisterAbsChoosed[i].id) {
-          lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', this.patientRegisterAbsChoosed[i].asbitemId)
+        if (!absForDel[i].id) {
+          lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', absForDel[i].asbitemId)
           if (lfind > -1) this.patientRegister.patientRegisterAbs.splice(lfind, 1)
 
-          this.patientRegisterAbsChoosed.splice(i, 1)
+          absForDel.splice(i, 1)
           i--
           continue
         }
 
-        if (this.patientRegisterAbsChoosed[i].isCharge == 'Y' || this.patientRegisterAbsChoosed[i].checkCompleteFlag != '0') {
-          chargeComplete += this.patientRegisterAbsChoosed[i].asbitemName + '，'
-          this.patientRegisterAbsChoosed.splice(i, 1)
+        if (absForDel[i].isCharge == 'Y' || absForDel[i].checkCompleteFlag != '0') {
+          chargeComplete += absForDel[i].asbitemName + '，'
+          absForDel.splice(i, 1)
           i--
         }
       }
@@ -381,11 +417,11 @@ export default {
 
       if (chargeComplete) {
         this.$message({ type: "info", message: `所选项目：${chargeComplete}已收费或已检，不可删除！` });
-        if (this.patientRegisterAbsChoosed.length < 1) return
+        if (absForDel.length < 1) return
       }
 
-      for (let i = 0; i < this.patientRegisterAbsChoosed.length; i++) {
-        registerAsbitemIds.push(this.patientRegisterAbsChoosed[i].id)
+      for (let i = 0; i < absForDel.length; i++) {
+        registerAsbitemIds.push(absForDel[i].id)
       }
 
       body = { registerAsbitemIds }
@@ -393,9 +429,14 @@ export default {
 
     },
 
+    //双击删除已选项目
+    removeAbs(row) {
+      this.delAbs([row]);
+    },
+
     //项目类别过滤 组合项目，未过滤已选择的组合项目
     getAsbItemByItemTypeAll() {
-      console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
+      //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
       let lv = "";
       if (typeof this.itemTypeIds === "object") {
         lv = this.itemTypeIds[this.itemTypeIds.length - 1];
@@ -405,9 +446,10 @@ export default {
         this.dict.asbItem = arrayFilter(this.dict.asbItemAll, "itemTypeId", lv);
       } else {
         this.dict.asbItem = [...this.dict.asbItemAll];
-      }      
-      console.log('lv,this.dict.asbItem', lv, this.dict.asbItem)
-      
+      }
+      //console.log('lv,this.dict.asbItem', lv, this.dict.asbItem)
+      this.dict.asbItemQuick = [...this.dict.asbItemAll];
+
     },
 
     //按项目类别显示组合项目，并过滤已选择的组合项目
@@ -415,6 +457,7 @@ export default {
       this.getAsbItemByItemTypeAll()
       //刷新显示 未选组合项目
       arrayReduce(this.dict.asbItem, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
+      arrayReduce(this.dict.asbItemQuick, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
     },
 
 
@@ -433,131 +476,100 @@ export default {
     // },
 
     //选中分组所包含的组合项目
-    getCustomerOrgGroupAsb(customerOrgGroupId) {
-      console.log(`getCustomerOrgGroupAsb /api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`);
-      getapi(`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`)
-        .then((res) => {
-          console.log("getCustomerOrgGroupAsb", res);
-          if (res.code == 1) {
-            this.patientRegister.customerOrgGroupAsb = res.data;
-            //移除旧分组或套餐的组合项目
-            this.removeGroupPackageAsb();
+    // async getCustomerOrgGroupAsb(customerOrgGroupId) {
+    //   console.log(`getCustomerOrgGroupAsb /api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`);
+    //   getapi(`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`)
+    //     .then((res) => {
+    //       console.log("getCustomerOrgGroupAsb", res);
+    //       if (res.code == 1) {
+    //         this.patientRegister.customerOrgGroupAsb = res.data;
+    //         //移除旧分组或套餐的组合项目
+    //         this.removeGroupPackageAsb();
+
+    //         //添加新分组的组合项目;
+    //         this.addCustomerOrgGroupAsb(customerOrgGroupId);
+    //       }
+    //     });
+    // },
 
-            //添加新分组的组合项目;
-            this.addCustomerOrgGroupAsb(customerOrgGroupId);
-          }
-        });
-    },
+    //选中 套餐/分组 所包含的组合项目
+    getGroupPackageAsb(typeFlag, groupPackageId) {
+      let delBody = {};
+      let url = typeFlag == 'group' ?
+        '/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/'
+        : '/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=';
+      let msg = typeFlag == 'group' ? '更换分组' : '更换套餐';
 
-    //选中套餐所包含的组合项目
-    getMedicalPackageAsb(medicalPackageId) {
-      console.log(`/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=${medicalPackageId}`);
-      getapi(`/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=${medicalPackageId}`)
+      console.log(`${url}${groupPackageId}`);
+      getapi(`${url}${groupPackageId}`)
         .then((res) => {
-          console.log("getMedicalPackageAsb", res);
-          if (res.code == 1) {
-            this.patientRegister.medicalPackageAsb = res.data;
+          console.log("getGroupPackageAsb", res);
+          if (res.code != -1) {
+            //this.patientRegister.medicalPackageAsb = res.data;
+            //return this.promiseRemoveGroupPackageAsb();
 
             //移除旧分组或套餐的组合项目
-            this.removeGroupPackageAsb();
-
+            delBody = this.removeGroupPackageAsb();
+
+            //添加或更新已选组合项目
+            this.addGroupPackageAsb(res.data, groupPackageId);
+            //console.log('delBody', delBody,delBody['registerAsbitemIds'].length);
+            if (delBody['registerAsbitemIds'].length > 0) {
+              return postapi(`/api/app/registerasbitem/deletemany`, delBody)
+            } else {
+              this.onSubmit(msg);
+            }
+          }
+        })
+        .then(res => {
+          //console.log('res', res);
+          if (res && res.code != -1) {
             //添加新套餐的组合项目
-            this.addMedicalPackageAsb(medicalPackageId);
+            this.onSubmit(msg);
           }
         });
     },
 
-    //添加新分组的组合项目
-    async addCustomerOrgGroupAsb(groupPackageId) {
-      let body = []
-      let payTypeFlag = '0'
-      let lfind = -1
-      let editCount = 0
+    //添加新套餐/分组的组合项目
+    addGroupPackageAsb(groupPackageAsb, groupPackageId) {
 
-      if (this.patientRegisterForm.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'
-      console.log('this.patientRegister.customerOrgGroupAsb', this.patientRegister.customerOrgGroupAsb)
-      for (let i = 0; i < this.patientRegister.customerOrgGroupAsb.length; i++) {
-        lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', this.patientRegister.customerOrgGroupAsb[i].asbitemId)
-        if (lfind > - 1) {
-          this.patientRegister.patientRegisterAbs[lfind].groupPackageId = groupPackageId
-          continue
-        }
-        let pojo = {
-          asbitemId: this.patientRegister.customerOrgGroupAsb[i].asbitemId,
-          patientRegisterId: this.patientRegisterForm.id,
-          standardPrice: this.patientRegister.customerOrgGroupAsb[i].price,
-          chargePrice: this.patientRegister.customerOrgGroupAsb[i].customerOrgGroupDetailPrice,
-          payTypeFlag,
-          isCharge: "N",
-          amount: 1,
-          groupPackageId: groupPackageId
-        }
-        body.push(pojo)
-        this.patientRegister.patientRegisterAbs.push({ ...pojo, asbitemName: this.patientRegister.customerOrgGroupAsb[i].displayName })
-
-      }
-      console.log('this.patientRegister.patientRegisterAbs', this.patientRegister.patientRegisterAbs)
-      // if (editCount > 0 && this.patientRegisterForm.id) await this.onSubmit('');
-      // if (body.length > 0 && this.patientRegisterForm.id) {
-      //   await this.batchAddAsb(body, '更换分组');
-      // } else {
-      //   //刷新
-      //   this.getAsbItemByItemType()
-      // }
-      if(this.patientRegister.patientRegisterAbs.length > 0 && this.patientRegisterForm.id){
-        await this.onSubmit('更换分组');
-      }
-
-    },
-
-    //添加新套餐的组合项目
-    async addMedicalPackageAsb(groupPackageId) {
-      let body = []
-      let payTypeFlag = '0'
+      let payTypeFlag = '0';  //默认个人支付
       let lfind = -1
-      let editCount = 0
 
-      if (this.patientRegisterForm.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'
-      for (let i = 0; i < this.patientRegister.medicalPackageAsb.length; i++) {
-        lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', this.patientRegister.medicalPackageAsb[i].id)
+
+      if (this.patientRegisterForm.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'  //单位支付
+      for (let i = 0; i < groupPackageAsb.length; i++) {
+        lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', groupPackageAsb[i].id)
         if (lfind > - 1) {
           this.patientRegister.patientRegisterAbs[lfind].groupPackageId = groupPackageId
           editCount++
           continue
         }
         let pojo = {
-          asbitemId: this.patientRegister.medicalPackageAsb[i].id,
+          asbitemId: groupPackageAsb[i].id,
           patientRegisterId: this.patientRegisterForm.id,
-          standardPrice: this.patientRegister.medicalPackageAsb[i].price,
-          chargePrice: this.patientRegister.medicalPackageAsb[i].price,
+          standardPrice: groupPackageAsb[i].price,
+          chargePrice: groupPackageAsb[i].price,
           payTypeFlag,
+          discount: 100,
           isCharge: "N",
           amount: 1,
           groupPackageId: groupPackageId
         }
-        body.push(pojo)
-        this.patientRegister.patientRegisterAbs.push({ ...pojo, asbitemName: this.patientRegister.customerOrgGroupAsb[i].displayName })
-      }
-
-      if (editCount > 0 && this.patientRegisterForm.id) await this.onSubmit('');
-      if (body.length > 0 && this.patientRegisterForm.id) {
-        await this.batchAddAsb(body, '更换分组');
-      } else {
-        //刷新
-        this.getAsbItemByItemType()
+        this.patientRegister.patientRegisterAbs.push({ ...pojo, asbitemName: groupPackageAsb[i].displayName })
       }
     },
 
     //移除旧分组或套餐的组合项目
-    async removeGroupPackageAsb() {
-      let body = {}
+    removeGroupPackageAsb() {
+      let body = { registerAsbitemIds: [] }
       let registerAsbitemIds = []
       let chargeComplete = ''
 
       //体检基本信息未保存时，删除所有所选项目
       if (!this.patientRegisterForm.id) {
-        this.patientRegister.patientRegisterAbs = []
-        return
+        this.patientRegister.patientRegisterAbs = [];
+        return body;
       }
 
       //删除已选 分组或套餐的组合项目 ，如已收费或 已检时，将 groupPackageId 置为null
@@ -584,108 +596,118 @@ export default {
         this.$message({ type: "info", message: `所选项目：${chargeComplete}已收费或已检，不可删除！` });
       }
 
-      body = { registerAsbitemIds }
-      if (registerAsbitemIds.length > 0) {
-        await this.batchDelAsb(body, '');
-      }
+      body = { registerAsbitemIds };
 
-      let updateBody = []
-      if (this.patientRegister.patientRegisterAbs.length > 0) {
-        for (let i = 0; i < this.patientRegister.patientRegisterAbs.length; i++) {
-          //数据库有，才添加到待更新的数组中
-          if (this.patientRegister.patientRegisterAbs[i].id) {
-            updateBody.push({
-              registerAsbitemId: this.patientRegister.patientRegisterAbs[i].id,
-              input: {
-                chargePrice: this.patientRegister.patientRegisterAbs[i].chargePrice,
-                payTypeFlag: this.patientRegister.patientRegisterAbs[i].payTypeFlag,
-                isCharge: this.patientRegister.patientRegisterAbs[i].isCharge,
-                amount: this.patientRegister.patientRegisterAbs[i].amount,
-                groupPackageId: this.patientRegister.patientRegisterAbs[i].groupPackageId
-              }
-            })
-          }
-        }
-        await this.batchEditAsb(updateBody, '');
-      }
+      return body;
 
     },
 
+    //双击选择组合项目
+    dbClickChoosedAsb(row) {
+      this.addAbs([row]);
+    },
     //快速选择组合项目
-    quickChoosedAsb(v){
+    quickChoosedAsb(v) {
+      //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickChoosedAsb',v)
       let lfind = -1
-      let asbItemChoosed = []
-
-      console.log('quickChoosedAsb',v,this.dict.asbItemQuick)
-      if(v){
-        lfind = arrayExistObj(this.dict.asbItemQuick,'id',v)
-        if(lfind > -1){
-          asbItemChoosed.push(this.dict.asbItemQuick[lfind])       
-          this.addAbs(asbItemChoosed)   
-        }             
-      }      
+      if (v) {
+        lfind = arrayExistObj(this.dict.asbItemQuick, 'id', v)
+        if (lfind > -1) {
+          this.addAbs([this.dict.asbItemQuick[lfind]])
+        }
+      }
+    },
+    // quickChoosedAsb(v){
+    //   let lfind = -1
+    //   let asbItemChoosed = []
+
+    //   console.log('quickChoosedAsb',v,this.dict.asbItemQuick)
+    //   if(v){
+    //     lfind = arrayExistObj(this.dict.asbItemQuick,'id',v)
+    //     if(lfind > -1){
+    //       asbItemChoosed.push(this.dict.asbItemQuick[lfind])       
+    //       this.addAbs(asbItemChoosed)   
+    //     }             
+    //   }      
+    // },   
+
+    //快速选择组合项目时，调整可按拼间简码及简称查找
+    remoteMethod(keyWords) {
+      //console.log('remoteMethod',this.dict.asbItemQuick)  
+      if (keyWords) {
+        this.quickAsb = [];
+        this.dict.asbItemQuick.forEach(item => {
+          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+            this.quickAsb.push(item);
+          }
+        });
+      } else {
+        this.quickAsb = [...this.dict.asbItemQuick];
+      }
     },
 
     //修改总折扣
-    changeAllDiscount(){      
+    changeAllDiscount() {
 
-      if(!this.discount || this.discount == 0) return
-      if(!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
+      if (!this.discount || this.discount == 0) return
+      if (!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
 
-      this.patientRegister.patientRegisterAbs.forEach(e =>{ 
+      this.patientRegister.patientRegisterAbs.forEach(e => {
         e.discount = this.discount
-        e.chargePrice = (e.standardPrice * this.discount/100).toFixed(2)
-        e.total = (e.standardPrice * this.discount * e.amount/100).toFixed(2)        
+        e.chargePrice = (e.standardPrice * this.discount / 100).toFixed(2)
+        e.total = (e.standardPrice * this.discount * e.amount / 100).toFixed(2)
         return e
       });
       this.onSubmit('')
-      
+
     },
 
     //修改总金额
-    changeTotal(){  
+    changeTotal() {
 
-      if(!this.total) return
-      if(!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
+      if (!this.total) return
+      if (!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
 
       let sumChargeDetails = 0 //单个标准价折后价 合计总计 
       let qtyIsOneLast = 0   //数量为1的最后行项目，用于返写金额
 
 
-      this.discount = (100 * this.total/this.totalStand ).toFixed(2)
+      this.discount = (100 * this.total / this.totalStand).toFixed(2)
 
-      this.patientRegister.patientRegisterAbs.forEach((e,index) =>{
-        if(e.amount == 1) qtyIsOneLast = index        
+      this.patientRegister.patientRegisterAbs.forEach((e, index) => {
+        if (e.amount == 1) qtyIsOneLast = index
         e.discount = this.discount
-        e.chargePrice = (e.standardPrice * this.discount/100).toFixed(2)
-        e.total = (e.standardPrice * this.discount * e.amount/100).toFixed(2)
-        sumChargeDetails += Number((e.standardPrice * this.discount * e.amount/100).toFixed(2))
+        e.chargePrice = (e.standardPrice * this.discount / 100).toFixed(2)
+        e.total = (e.standardPrice * this.discount * e.amount / 100).toFixed(2)
+        sumChargeDetails += Number((e.standardPrice * this.discount * e.amount / 100).toFixed(2))
         return e
-      });     
-      console.log('this.total - sumChargeDetails',sumChargeDetails,this.total - sumChargeDetails)
-      if(this.total != sumChargeDetails){
+      });
+      console.log('this.total - sumChargeDetails', sumChargeDetails, this.total - sumChargeDetails)
+      if (this.total != sumChargeDetails) {
         this.patientRegister.patientRegisterAbs[qtyIsOneLast].chargePrice
-         = (Number(this.patientRegister.patientRegisterAbs[qtyIsOneLast].chargePrice)
-         + Number((this.total - sumChargeDetails)/this.patientRegister.patientRegisterAbs[qtyIsOneLast].amount)).toFixed(2)
+          = (Number(this.patientRegister.patientRegisterAbs[qtyIsOneLast].chargePrice)
+            + Number((this.total - sumChargeDetails) / this.patientRegister.patientRegisterAbs[qtyIsOneLast].amount)).toFixed(2)
       }
-      this.onSubmit('')  
+      this.onSubmit('')
     },
 
     //修改数量
-    changeDiscount(index){
+    changeDiscount(index) {
       //console.log('index',index)
-      if(!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
-      if(!this.patientRegister.patientRegisterAbs[index].discount) return
+      if (!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
+      if (!this.patientRegister.patientRegisterAbs[index].discount) return
       //console.log(this.patientRegister.patientRegisterAbs[index].chargePrice,this.patientRegister.patientRegisterAbs[index].standardPrice)
-      this.patientRegister.patientRegisterAbs[index].chargePrice = Number( this.patientRegister.patientRegisterAbs[index].standardPrice * this.patientRegister.patientRegisterAbs[index].discount/100).toFixed(2)
+      this.patientRegister.patientRegisterAbs[index].chargePrice = Number(this.patientRegister.patientRegisterAbs[index].standardPrice * this.patientRegister.patientRegisterAbs[index].discount / 100).toFixed(2)
       this.onSubmit('')
     },
 
     //修改单价
-    changePrice(index){
+    changePrice(index) {
       //console.log('index',index)
-      if(!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
-      if(!this.patientRegister.patientRegisterAbs[index].chargePrice) return
+      if (!this.patientRegister.patientRegisterAbs || this.patientRegister.patientRegisterAbs.length == 0) return
+      if (!this.patientRegister.patientRegisterAbs[index].chargePrice) return
       //console.log(this.patientRegister.patientRegisterAbs[index].chargePrice,this.patientRegister.patientRegisterAbs[index].standardPrice)
       this.patientRegister.patientRegisterAbs[index].discount = Number(this.patientRegister.patientRegisterAbs[index].chargePrice * 100 / this.patientRegister.patientRegisterAbs[index].standardPrice).toFixed(2)
       this.onSubmit('')
@@ -694,7 +716,7 @@ export default {
     //自定义计算列
     getSummaries(param) {
       const { columns, data } = param;
-      const sumCol = [2,5]  //需合计的列
+      const sumCol = [2, 5]  //需合计的列
       const sums = [];
       columns.forEach((column, index) => {
         //console.log('column, index,data',column, index,data)
@@ -709,10 +731,10 @@ export default {
           sums[index] = '';
           return;
         }
-        
+
         sums[index] = 0
-        data.forEach(e =>{
-          if(!isNaN(e[column.property])) sums[index] += e[column.property] * e['amount']
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += e[column.property] * e['amount']
         })
         sums[index] = sums[index].toFixed(2) //+ ' 元';
 
@@ -733,9 +755,10 @@ export default {
         // }
 
       });
-      this.totalStand = sums[2]
-      this.total = sums[5]
-      this.discount = Number(this.total * 100 / this.totalStand).toFixed(2)
+      this.totalStand = sums[2];
+      //console.log('this.totalFoucs/this.discountFoucs',this.totalFoucs,this.discountFoucs)
+      if (!this.totalFoucs) this.total = sums[5];
+      if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
       return sums;
     },
 
@@ -747,7 +770,8 @@ export default {
     "patientRegister.customerOrgGroupChange"(newVal, oldVal) {
       console.log("watch patientRegister.customerOrgGroupChange newVal：", newVal, " oldVal：", oldVal);
       if (newVal != oldVal && newVal > 0) {
-        this.getCustomerOrgGroupAsb(this.patientRegisterForm.customerOrgGroupId);
+        //this.getCustomerOrgGroupAsb(this.patientRegisterForm.customerOrgGroupId);
+        this.getGroupPackageAsb('group', this.patientRegisterForm.customerOrgGroupId);
       }
     },
 
@@ -755,13 +779,17 @@ export default {
     "patientRegister.medicalPackageChange"(newVal, oldVal) {
       console.log("watch patientRegister.medicalPackageChange newVal：", newVal, " oldVal：", oldVal);
       if (newVal != oldVal && newVal > 0) {
-        this.getMedicalPackageAsb(this.patientRegisterForm.medicalPackageId);
+        //this.getMedicalPackageAsb(this.patientRegisterForm.medicalPackageId);
+        this.getGroupPackageAsb('medical', this.patientRegisterForm.medicalPackageId);
       }
     },
 
-    //体检信息触发分组的保存
+    //体检信息保存，触发已选组合项目保存
     "patientRegister.saveTimes"(newVal, oldVal) {
-      this.onSubmit('')
+      console.log("patientRegister.saveTimes newVal：", newVal, " oldVal：", oldVal);
+      if (newVal != oldVal) {
+        this.onSubmit('');
+      }
     },
   },
 };
@@ -769,16 +797,17 @@ export default {
 <style lang="scss" scoped>
 .mainareaBox {
   border: 1px solid #000;
-  height: v-bind("(window.pageHeight>735 ? (window.pageHeight - 535):200) + 'px'");
+  height: v-bind("(window.pageHeight > 735 ? (window.pageHeight - 535) : 200) + 'px'");
   margin-top: 5px;
 }
 
-.btnList{
+.btnList {
   margin-top: 5px;
   margin-left: 5px;
   margin-right: 5px;
 }
-.disTotal{
+
+.disTotal {
   margin-left: 10px;
 }
 
@@ -788,27 +817,27 @@ export default {
   padding-right: 1px;
 }
 
-::v-deep .el-table th.el-table__cell{
+::v-deep .el-table th.el-table__cell {
   text-align: center;
   padding-left: 1px;
   padding-right: 1px;
 }
 
-::v-deep .el-table td.el-table__cell{
+::v-deep .el-table td.el-table__cell {
   padding-left: 1px;
   padding-right: 1px;
 }
-::v-deep .el-table .cell{
+
+::v-deep .el-table .cell {
   padding-left: 1px;
   padding-right: 1px;
 }
 
 
-::v-deep input[type="number"]::-webkit-inner-spin-button, 
+::v-deep input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none !important;
   margin: 0 !important;
 }
-
 </style>
 
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 2fdb954..bf6b8af 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -49,7 +49,7 @@
         <el-table-column prop="nationId" label="民族">
           <template slot-scope="scope">
             <div>
-              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+              {{ ldddw(dict.nation, "nationId", scope.row.nationId, "displayName") }}
             </div>
           </template>
         </el-table-column>
@@ -61,7 +61,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="100" />
+        <el-table-column prop="email" label="邮箱" width="180" />
         <el-table-column prop="mobileTelephone" label="手机" width="100" />
         <el-table-column prop="telephone" label="电话" width="100" />
         <el-table-column prop="address" label="地址" width="300" />
@@ -269,6 +269,7 @@ export default {
       this.patientRegister.patientRegisterAbs = [];
       this.dialogVisible = true;      
       this.editTimes++; //触发表单窗口，数据更新
+      this.getPatientRegisterAbs();
     },
 
     edit() {
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index d9facb4..92a63fe 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -99,6 +99,7 @@ export default {
               return prev;
             }
           }, 0);
+          sums[index] = Math.round(sums[index],2);
           sums[index] += ' 元';
         } else {
           sums[index] = 'N/A';
diff --git a/src/store/index.js b/src/store/index.js
index b7cf56d..3b82a41 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -257,37 +257,53 @@ export default new Vuex.Store({
     //获取体检人员所选组合项目
     getPatientRegisterAbs(context, id) {
       //console.log(`vuex getPatientRegisterAbs /api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, context.state.dict.asbItemAll)
-      getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then(
-        (res) => {
-          console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
-          if (res.code == 1) {
-            let patientRegisterAbs = []
-            res.data.forEach(e => {
-              e.standTotal = e.amount * e.standardPrice
-              e.total = e.amount * e.chargePrice
-              patientRegisterAbs.push(e)
-            });
-            context.commit("setData", {
-              key: "patientRegister.patientRegisterAbs",
-              value:patientRegisterAbs,
-            });
-
-            context.commit("setData", {
-              key: "dict.asbItem",
-              value: arrayReduce(
-                [...context.state.dict.asbItem],
-                [...context.state.patientRegister.patientRegisterAbs],
-                "id=asbitemId"
-              ),
-            });
-            context.commit("setData", {
-              key: "dict.asbItemQuick",
-              value: arrayReduce([...context.state.dict.asbItemAll],[...context.state.patientRegister.patientRegisterAbs],"id=asbitemId"),
-            });
-            //console.log(`getPatientRegisterAbs ${id}`,context.state.dict.asbItem)
+      if(id){
+        getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then(
+          (res) => {
+            console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
+            if (res.code == 1) {
+              let patientRegisterAbs = []
+              res.data.forEach(e => {
+                e.standTotal = e.amount * e.standardPrice
+                e.total = e.amount * e.chargePrice
+                patientRegisterAbs.push(e)
+              });
+              context.commit("setData", {
+                key: "patientRegister.patientRegisterAbs",
+                value:patientRegisterAbs,
+              });
+  
+              context.commit("setData", {
+                key: "dict.asbItem",
+                value: arrayReduce(
+                  [...context.state.dict.asbItem],
+                  [...context.state.patientRegister.patientRegisterAbs],
+                  "id=asbitemId"
+                ),
+              });
+              context.commit("setData", {
+                key: "dict.asbItemQuick",
+                value: arrayReduce([...context.state.dict.asbItemAll],[...context.state.patientRegister.patientRegisterAbs],"id=asbitemId"),
+              });
+              //console.log(`getPatientRegisterAbs ${id}`,context.state.dict.asbItemQuick)
+            }
           }
-        }
-      );
+        );
+      }else{
+        context.commit("setData", {
+          key: "patientRegister.patientRegisterAbs",
+          value:[],
+        });
+
+        context.commit("setData", {
+          key: "dict.asbItem",
+          value: [...context.state.dict.asbItemAll],
+        });
+        context.commit("setData", {
+          key: "dict.asbItemQuick",
+          value: [...context.state.dict.asbItemAll],
+        });
+      }      
     },
 
     //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 6a218e2..56b0a82 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -119,8 +119,8 @@ export default {
 
       //民族
       getapi("/api/app/nation/in-filter").then((res) => {
-        if (res.code == 1) {
-          this.dict.nation = res.data.items;
+        if (res.code != - 1) {
+          this.dict.nation = res.data;
         }
       });