seo

src/components/doctorCheck/ButtonList.vue

@@ -604,13 +604,14 @@ export default {
                     this.$message.error({ showClose: true, message: `项目明细删除失败，原因：${err}` });
                 }
             });
-
         },
 
         // 历次结果
         btnCheckHistory() {
             if (!this.doctorCheck.prBase.id) return;
             this.dialogVisibleCheckHistory = true;
+            this.dataTransOpts.refresh.sumDoctor.M++    //刷新历次明细
+            this.dataTransOpts.plus.OccDisease++    //刷新图文报告
         },
 
         //体检报告

src/components/doctorCheck/PatientRegisterBase.vue

@@ -7,7 +7,7 @@
       </div>
       <div>
         <span class="query">档案号</span>
-        <el-input placeholder="档案号" v-model="prBase.patientNo" size="small" style="width: 100px;" clearable />
+        <el-input placeholder="档案号" v-model="prBase.patientNo" size="small" style="width: 90px;" clearable />
       </div>
       <div>
         <span class="query">姓名</span>
@@ -21,6 +21,14 @@
         <span class="query">检验条码</span>
         <el-input placeholder="检验条码" v-model="prBase.lisNo" size="small" style="width: 120px;" clearable />
       </div>
+      <div>
+        <span class="query">身份证</span>
+        <el-input placeholder="身份证号" v-model="prBase.idNo" size="small" style="width: 150px;" clearable/>
+      </div>
+      <div>
+        <span class="query">手机</span>
+        <el-input placeholder="手机号" v-model="prBase.mobileTelephone" style="width: 120px;" size="small" clearable/>
+      </div>
       <div>
         <span class="query">性别</span>
         <!--
@@ -28,11 +36,7 @@
           <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
         -->
-        <el-input v-model="prBase.sexName" size="small" style="width: 80px;" disabled />
-      </div>
-      <div>
-        <span class="query">身份证</span>
-        <el-input v-model="prBase.idNo" size="small" style="width: 150px;" disabled />
+        <el-input v-model="prBase.sexName" size="small" style="width: 40px;" disabled />
       </div>      
       <div>
         <span class="query">年龄</span>
@@ -49,7 +53,7 @@
           <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
         -->
-        <el-input v-model="prBase.maritalStatusName" size="small" style="width: 80px;" disabled />
+        <el-input v-model="prBase.maritalStatusName" size="small" style="width: 40px;" disabled />
       </div>
       <div>
         <span class="query">体检日期</span>
@@ -58,11 +62,11 @@
       </div>
       <div>
         <span class="query">单位</span>
-        <el-input :value="prBase.customerOrgParentName" style="width: 120px;" size="small" disabled />
+        <el-input v-model="prBase.customerOrgParentName" style="width: 150px;" size="small" disabled />
       </div>
       <div>
         <span class="query">部门</span>
-        <el-input :value="prBase.customerOrgName" style="width: 120px;" size="small" disabled />
+        <el-input v-model="prBase.customerOrgName" style="width: 120px;" size="small" disabled />
       </div>
       <div>
         <span class="query">体检类别</span>
@@ -71,7 +75,7 @@
           <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
         -->
-        <el-input :value="prBase.medicalTypeName" style="width: 100px;" size="small" disabled />
+        <el-input v-model="prBase.medicalTypeName" style="width: 100px;" size="small" disabled />
       </div>
       <div>
         <span class="query">人员类别</span>
@@ -80,7 +84,7 @@
           <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
         -->
-        <el-input :value="prBase.personnelTypeName" style="width: 100px;" size="small" disabled />
+        <el-input v-model="prBase.personnelTypeName" style="width: 100px;" size="small" disabled />
       </div>
       <div>
         <span class="query">民族</span>
@@ -89,11 +93,7 @@
           <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
         -->
-        <el-input :value="prBase.nationName" style="width: 100px;" size="small" disabled />
-      </div>
-      <div>
-        <span class="query">手机</span>
-        <el-input :value="prBase.mobileTelephone" style="width: 120px;" size="small" disabled />
+        <el-input v-model="prBase.nationName" style="width: 80px;" size="small" disabled />
       </div>      
     </div>
 
@@ -217,7 +217,34 @@ export default {
       })
     },
 
-    //按条码号查个人数据
+    //按条码号、档案、身份证  查个人数据
+    onQueryByOnlyNo(noType){
+      let noVal = this.prBase[noType]  //唯一号的值
+      if(!noVal) return
+      let body = {}
+      body[noType] = noVal
+
+      let patientRegister = {id:''}
+      patientRegister[noType] = noVal
+      this.dataTransOpts.tableS.patient_register = deepCopy(patientRegister)
+
+      postapi('/api/app/patientregister/GetAlreadyRegisterPatientRegisterByNo', body)
+        .then((res) => {
+          if (res.code > -1) {
+            this.dataTransOpts.tableS.patient_register = res.data
+            if (this.dataTransOpts.tableS.patient_register.completeFlag != '3') this.dataTransOpts.tableS.patient_register.summaryDoctorId = this.userId
+            if (this.dataTransOpts.tableS.patient_register.completeFlag == '3' && this.dataTransOpts.tableS.patient_register.isAudit == 'N') {
+              this.dataTransOpts.tableS.patient_register.auditDoctorId = this.userId
+            }
+            // console.log('res.data',res.data)
+            // console.log('this.dataTransOpts.tableS.patient_register',this.dataTransOpts.tableS.patient_register)
+          }
+          this.afterFind(this.dataTransOpts.tableS.patient_register)
+        });
+
+    },
+
+    /*  合并到 onQueryByOnlyNo
     onQueryByPatientRegisterNo() {
       let patientRegisterNo = this.prBase.patientRegisterNo
       if (!patientRegisterNo) return
@@ -268,8 +295,51 @@ export default {
           this.afterFind(this.dataTransOpts.tableS.patient_register)
         });
     },
-
+    */   
     //按手机号或姓名查找客户信息
+    onQueryByNotOnlyNo(valType){
+      let noVal = this.prBase[valType]  //唯一号的值
+      if(!noVal) return
+
+      let body = {
+        isFilterPreRegistration: 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
+      }
+      let noType = valType
+      if(valType == 'mobileTelephone') noType='phone'
+      body[noType] = noVal
+
+      let patientRegister = {id:''}
+      patientRegister[valType] = noVal
+      this.dataTransOpts.tableS.patient_register = deepCopy(patientRegister)
+
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then(res => {
+          if (res.code > -1) {
+            if (res.data.items.length == 1) {
+              this.dataTransOpts.tableS.patient_register = res.data.items[0]
+              if (this.dataTransOpts.tableS.patient_register.completeFlag != '3') this.dataTransOpts.tableS.patient_register.summaryDoctorId = this.userId
+              if (this.dataTransOpts.tableS.patient_register.completeFlag == '3' && this.dataTransOpts.tableS.patient_register.isAudit == 'N') {
+                this.dataTransOpts.tableS.patient_register.auditDoctorId = this.userId
+              }
+              this.dataTransOpts.refresh.patient_register.S++
+              // this.getPatientRegister(res.data.items[0].id)
+
+            } else if (res.data.items.length > 1) {
+              this.PatientRegisterList = res.data.items
+              this.dialogWin.PatientRegisterForChoose = true // 弹窗
+              this.dataTransOpts.plus.PatientRegisterForChoose++
+            } else {
+              this.afterFind(this.dataTransOpts.tableS.patient_register)
+            }
+          }
+        })
+
+      
+
+    },
+
+    /* 合并到 onQueryByNotOnlyNo
+    //按姓名查找客户信息
     getlistinfilterByName(v) {
       let body = {
         patientName: v,
@@ -309,6 +379,7 @@ export default {
       //   this.dataTransOpts.refresh.sum_diagnosis.M++
       // }, 20);
     },
+    */
     
     //根据patientRegisterNo 获取 人员信息
     getPatientRegister(patientRegisterNo) {
@@ -333,6 +404,7 @@ export default {
     
 
 
+
     lmoment(date, forMat) {
       return moment(new Date(date)).format(forMat);
     },
@@ -356,7 +428,15 @@ export default {
               let placeholder = input.getAttribute('placeholder')
               switch (placeholder) {
                 case '条码号':
-                  if (input.value) this.onQueryByPatientRegisterNo()
+                  if (input.value) this.onQueryByOnlyNo('patientRegisterNo') //this.onQueryByPatientRegisterNo()
+                  input.select()
+                  break;
+                case '档案号':
+                  if (input.value) this.onQueryByOnlyNo('patientNo') //this.onQueryByPatientNo()
+                  input.select()
+                  break;
+                case '身份证号':
+                  if (input.value) this.onQueryByOnlyNo('idNo') //this.onQueryByPatientNo()
                   input.select()
                   break;
                 case '检查条码':
@@ -367,12 +447,12 @@ export default {
                   if (input.value) this.onQueryByLisNo(input.value)
                   input.select()
                   break;                
-                case '档案号':
-                  if (input.value) this.onQueryByPatientNo()
+                case '姓名':
+                  if (input.value) this.onQueryByNotOnlyNo('patientName') //this.getlistinfilterByName(input.value)
                   input.select()
                   break;
-                case '姓名':
-                  if (input.value) this.getlistinfilterByName(input.value)
+                case '手机号':
+                  if (input.value) this.onQueryByNotOnlyNo('mobileTelephone') //this.getlistinfilterByName(input.value)
                   input.select()
                   break;
               }

src/components/doctorCheck/PatientRegisterList.vue

@@ -465,15 +465,18 @@ export default {
         this.report.dataCusOrgOCX.forEach(e => {
           let dateType = '1'
           switch (e.dateType) {            
-            case 'summaryDate':
-              dateType = '3'
-              break;
             case 'medicalStartDate':
               dateType = '2'
               break;
             case 'checkDate':
               dateType = '4'
               break;
+            case 'summaryDate':
+              dateType = '3'
+              break;
+            case 'sumCheckDate':
+              dateType = '5'
+              break;
             default:
               break;
           }

src/components/patientRegister/PatientRegisterList.vue

@@ -1487,6 +1487,9 @@ export default {
         // }
         if (this.patientRegister.query.customerOrgId)
           body.customerOrgId = this.patientRegister.query.customerOrgId;
+
+        // 获取单位体检次数与分组
+        try {
           if (
             this.patientRegister.query.customerOrgId &&
             this.patientRegister.query.customerOrgId != this.dict.personOrgId &&
@@ -1497,6 +1500,9 @@ export default {
             body.customerOrgGroupIds =
               this.patientRegister.query.customerOrgGroupIds;
           }
+        } catch (error) {
+          console.error(error)
+        }
       }
 
       if (this.patientRegister.query.sex)

src/components/patientRegister/customerOrgTreeAll.vue

@@ -67,7 +67,7 @@ export default {
 
     };
   },
-  //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
+  
   computed: {
     ...mapState(["window", "dict", "dataTransOpts", "customerOrg", "patientRegister"]),
   },

src/components/patientRegister/patientRegisterQuery.vue

@@ -76,7 +76,7 @@
       </div>
       <div v-show="dispTimes" class="query">
         <span class="spanClass">次数</span>
-        <el-select v-model="patientRegister.query.customerOrgRegister" placeholder="次数"
+        <el-select v-model="patientRegister.query.customerOrgRegister" placeholder="次数" clearable
           @change="changeCustomerOrgRegister" style="width: 50px;" size="small" value-key="id">
           <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes" :value="item">{{
             item.medicalTimes + '次' }}</el-option>

src/components/report/CusOrgOCX.vue

@@ -92,7 +92,8 @@
               <el-radio label="creationTime">登记</el-radio>
               <el-radio label="medicalStartDate">体检</el-radio>
               <el-radio label="checkDate">检查</el-radio>
-              <el-radio label="summaryDate">总检</el-radio>
+              <el-radio label="summaryDate">{{summary_check_doctor_alias[0]||'总检'}}</el-radio>
+              <el-radio label="sumCheckDate">{{summary_check_doctor_alias[1]||'审核'}}</el-radio>
             </el-radio-group>
           </div>
           <div style="margin-top: 5px;">
@@ -100,7 +101,7 @@
             <el-checkbox v-model="useCusOrg" @change="changeUseOrg" :disabled="isUnit" />
           </div>
         </div>
-        <div style="margin-left: 150px;margin-top: 5px;">
+        <div style="margin-top: 5px;">
           <el-button type="primary" @click="btnOk" class="commonbutton">确定</el-button>
         </div>
       </div>
@@ -144,6 +145,8 @@ export default {
         id: "id",
         children: "treeChildren",
       }, //树形组件的数据结构
+
+      summary_check_doctor_alias: ["总检", "审核"],
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
@@ -163,6 +166,14 @@ export default {
       this.isUnitOption = true
     }
     this.changeUseOrg(this.useCusOrg)
+
+    // 系统参数，获取 总检别名
+    postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: "summary_check_doctor_alias" })
+      .then(res => {
+        if (res.code > -1) {
+          this.summary_check_doctor_alias = JSON.parse(res.data)
+        }
+      })
   },
 
   //挂载组件完成
@@ -444,7 +455,10 @@ export default {
             cusOrgOCX += "(检查"
             break;
           case 'summaryDate':
-            cusOrgOCX += "(总检"
+            cusOrgOCX += `(${this.summary_check_doctor_alias[0] || '总检'}`
+            break;
+          case 'sumCheckDate':
+            cusOrgOCX += `(${this.summary_check_doctor_alias[1] || '审核'}`
             break;
           default:
             cusOrgOCX += "(登记"

src/components/sumDoctorCheck/CheckDetails.vue

@@ -51,7 +51,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj, getColorStr } from '@/utlis/proFunc';
 export default {
   components: {},
-  props: ["patientRegisterId","tabChoosed","refParams"],
+  props: ["patientRegisterId","tabChoosed","refParams",],
   data() {
     return {
       tableData: [],
@@ -89,7 +89,8 @@ export default {
         this.tableData = []
         return
       }
-      console.log(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${patientRegisterId}`)
+      
+      //console.log(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${patientRegisterId}`)
 
       postapi('/api/app/SumSummaryReport/GetDetailResults', { patientRegisterId })
         .then((res) => {
@@ -108,9 +109,14 @@ export default {
     mergeSummarys(array, itemKey) {
       let ret = ''
       array.forEach((e, i) => {
-        let splitStr = "<br>"
-        if (i == 0) splitStr = ""
-        return ret += splitStr + e[itemKey]
+        //let splitStr = "<br>"
+        if (i == 0){
+          ret = e[itemKey]
+        }else if (i==1) {
+          ret = `1.${ret} ${Number(i)+1}.${e[itemKey]}`
+        } else {
+          ret += ` ${Number(i)+1}.${e[itemKey]}`
+        }        
       })
       return ret
     }
@@ -123,7 +129,14 @@ export default {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch 总检--检查明细结果 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        if(newVal != oldVal && this.tabChoosed == '2') this.CheckDetails(this.dataTransOpts.tableS.patient_register.id);
+        //&& this.tabChoosed == '2'
+        if(newVal != oldVal){
+          if(this.refParams.place == 'doctor'){
+            this.CheckDetails(this.dataTransOpts.tableS.patient_register.id);
+          }else{
+            if(this.tabChoosed == '2') this.CheckDetails(this.dataTransOpts.tableS.patient_register.id);
+          }          
+        }
       }
     },
 

src/components/sumDoctorCheck/SumHistory.vue

@@ -103,7 +103,13 @@ export default {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch 总检--历次综述建议 newVal: ${newVal}, oldVal: ${oldVal} patientId: ${this.patientId}`);        
-        if(newVal != oldVal && this.tabChoosed == '6') this.SumHistory(this.patientId)
+        if(newVal != oldVal){
+          if(this.refParams.place == 'doctor'){
+            this.SumHistory(this.patientId)
+          }else{
+            if(this.tabChoosed == '6') this.SumHistory(this.patientId)
+          }
+        } 
       }
     },
 

src/components/sumDoctorCheck/SumItems.vue

@@ -232,7 +232,13 @@ export default {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch 总检--横向对比 newVal: ${newVal}, oldVal: ${oldVal} patientId: ${this.patientId} tabChoosed: ${this.tabChoosed}`);
-        if (newVal != oldVal && this.tabChoosed == '5') this.registerCheckList(this.patientId)
+        if (newVal != oldVal){
+          if(this.refParams.place == 'doctor'){
+            this.registerCheckList(this.patientId)
+          }else{
+            if(this.tabChoosed == '5') this.registerCheckList(this.patientId)
+          }
+        } 
       }
     },
   },

src/views/charge/charge.vue

@@ -809,15 +809,21 @@ export default {
     },
     //获取退费方式明细
     getChargeBackPayByChargeBackId(ChargeBackId) {
+      let curPayModeId = ''
       let lfind = -1;
       getapi(`/api/app/chargebackpay/getchargebackpayinchargebackid?ChargeBackId=${ChargeBackId}`).then(res => {
         if (res.code != - 1) {
           res.data.forEach(e => {
-            lfind = arrayExistObj(this.chargePays, 'payModeId', e.payModeId);
+            if(curPayModeId != e.payModeId) lfind = -1
+            lfind++
+            console.log('lfind',lfind)
+            lfind = arrayExistObjPos(this.chargePays, 'payModeId', e.payModeId,lfind);
             if (lfind > - 1) {
               this.chargePays[lfind].chargeMoney = e.backMoeny;
               this.chargePays[lfind].cardRegisterId = e.cardRegisterId;
+              this.chargePays[lfind].cardNo = e.cardNo;
             }
+            curPayModeId = e.payModeId
           });
         }
       });