sumdoct

src/components/doctorCheck/ButtonList.vue

@@ -68,7 +68,7 @@
         
 
         <div v-show="doctorCheck.doctorCheckDialogVisible" 
-          :style="`border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`">
+          :style="`z-index:30001;border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`">
           
           <PatientRegisterList win="doctorCheck" :winAbsolute="true"/>
           

src/components/doctorCheck/PatientRegisterBase.vue

@@ -300,7 +300,8 @@ export default {
       let patientRegisterNo = this.prBase.patientRegisterNo
       let body = {
         sType:1,
-        patientRegisterNo
+        patientRegisterNo,
+        isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
       }      
       console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
       postapi('/api/app/patientregister/getpatientregisterorpatient',body)
@@ -320,7 +321,8 @@ export default {
       let patientNo = this.prBase.patientNo
       let body = {
         sType:2,
-        patientNo
+        patientNo,
+        isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
       }      
       console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
       postapi('/api/app/patientregister/getpatientregisterorpatient',body)      
@@ -338,7 +340,8 @@ export default {
     //按手机号或姓名查找客户信息
     getlistinfilterByName(v){
       let body={
-        patientName:v
+        patientName:v,
+        isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
       }
       this.patientRegisterChoosed = null
 

src/components/doctorCheck/PatientRegisterList.vue

@@ -30,7 +30,7 @@
         <span>检查状态：</span>
         <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
           size="small">
-          <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
+          <el-option v-for="item in local.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
         <el-select v-model="patientRegister.query.isAudit" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
@@ -104,7 +104,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="email" label="邮箱" width="100" />
+      <el-table-column prop="email" label="邮箱" width="150" />
       <el-table-column prop="mobileTelephone" label="手机" width="100" />
       <el-table-column prop="telephone" label="电话" width="100" />
       <el-table-column prop="address" label="地址" width="300" />
@@ -174,7 +174,7 @@
 import moment from "moment";
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+import { dddw, objCopy, arrayReduce,deepCopy } from "../../utlis/proFunc"
 
 
 import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
@@ -195,7 +195,8 @@ export default {
         query:{
           haveImage:false,
           checkAsb:'', //检查项目          
-        }
+        },
+        completeFlag:[]
       },
 
       quickAsb: [],
@@ -224,6 +225,8 @@ export default {
         }
       });
 
+      this.local.completeFlag = deepCopy(this.dict.completeFlag)
+      this.local.completeFlag.splice(0,1) //预记选项去掉
     },
     
      //快速选择组合项目时，调整可按拼间简码及简称查找
@@ -329,6 +332,7 @@ export default {
       if(this.local.query.haveImage) body.isPicture = 'Y'
 
       body.maxResultCount = 1000 
+      body.isFilterPreRegistration = 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
       // "patientName": "string",
       // "sexId": "string",
       // "isAudit": "string",

src/components/sumDoctorCheck/ButtonList.vue

@@ -41,7 +41,7 @@
        
 
         <div v-show="sumDoctorCheck.sumDoctorCheckDialogVisible" 
-          :style="`border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`">
+          :style="`z-index:30001;border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`">
           
           <PatientRegisterList win="sumDoctorCheck" :winAbsolute="true"/>
           

src/components/sumDoctorCheck/SumAsbItemStatus.vue

@@ -2,27 +2,27 @@
   <div style="display: flex;height:90px;">
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:9px;color: #F56C6C;">未检组合项目：</div>
-      <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
+      <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">        
         <el-tag type="danger" style="margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{ item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:9px;color: #909399;">弃检组合项目：</div>
-      <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
+      <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag type="info" style="margin-left: 5px;" v-for="item in data.giveUpAsbitem" :key="item"
           size="mini">{{ item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:9px;color: #409EFF;">组合项目已检但无值的明细项目：</div>
-      <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
+      <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag style="margin-left: 5px;" v-for="item in data.checkedNullValueItem" :key="item"
           size="mini">{{ item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:9px;color: #E6A23C;">组合项目已检但弃检的明细项目：</div>
-      <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
+      <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag type="warning" style="margin-left: 5px;" v-for="item in data.checkedGiveUpItem" :key="item"
           size="mini">{{ item }}</el-tag>
       </div>

src/components/sumDoctorCheck/SumDiagnosis.vue

@@ -150,7 +150,7 @@ export default {
 
 
     deleteRow(index) {
-      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+      this.$confirm("此操作将删除该记录, 是否继续?", "提示", {
         confirmButtonText: "是",
         cancelButtonText: "否",
         type: "warning",
@@ -163,10 +163,13 @@ export default {
             this.sumDoctorCheck.suggestionList.splice(i, 1)
           }
         }
-
         this.sumDoctorCheck.diagnosisList.splice(index, 1)
       }).catch((err) => {
-        //
+        if(err == 'cancel'){
+          console.log(`已取消 ${err}`)
+        }else{
+          this.$message.error(`操作失败 ${err}`)
+        }
       });
 
     },

src/request/commonapi.js

@@ -179,9 +179,9 @@ export const barcodedraganddrop = (data) => {
 // 组和项目获取列表
 export const groupsandlist = (data) => {
   return request({
-    url: "/api/app/asbitem/in-filter",
-    method: "get",
-    params: data,
+    url: "/api/app/asbitem/getasbitemlist",
+    method: "post",
+    data,
   });
 };
 // 组合项目新增

src/views/fee-settings/Asbitem.vue

@@ -1240,10 +1240,10 @@ export default {
       getapi("/api/app/organization-units/by-code-all").then((res) => {
         this.organizationUnitdata = res.data;
       });
-      //获取组合项目
-      getapi("/api/app/asbitem/in-filter").then((res) => {
-        this.asbitemdata = res.data.items;
-      });
+      //获取组合项目 {isFilterActive:'Y'}
+      postapi('/api/app/asbitem/getasbitemlist').then(res =>{
+        this.asbitemdata = res.data
+      })     
       //获取适用性别
       getapi("/api/app/for-sex").then((res) => {
         this.forsexdata = res.data;