seo

src/components/customerOrg/customerOrgGroupAsbitem.vue

@@ -556,7 +556,7 @@ export default {
         if (this.customerOrgGroup.forSexId == 'A' && this.customerOrgGroup.maritalStatusId == 'A') {
           break;
         } else {
-          if (this.customerOrgGroup.forSexId != 'A'){
+          if (this.customerOrgGroup.forSexId != 'A') {
             if (!(asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U')) {
               if (asbItemChoosed[i].forSexId != this.customerOrgGroup.forSexId) {
                 message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
@@ -566,11 +566,14 @@ export default {
             }
           }
           // 再判断婚姻
-          if (!(checked || asbItemChoosed[i].maritalStatusId == 'A' || asbItemChoosed[i].maritalStatusId == 'U')) {
-            if (asbItemChoosed[i].maritalStatusId != this.customerOrgGroup.maritalStatusId) {
-              message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
-              checked = false
-              asbItemChoosed.splice(i, 1)
+          if (checked) {
+            console.log('maritalStatusId', asbItemChoosed[i].maritalStatusId, this.customerOrgGroup.maritalStatusId)
+            if (!(asbItemChoosed[i].maritalStatusId == 'A' || asbItemChoosed[i].maritalStatusId == 'U')) {
+              if (asbItemChoosed[i].maritalStatusId != this.customerOrgGroup.maritalStatusId) {
+                message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+                checked = false
+                asbItemChoosed.splice(i, 1)
+              }
             }
           }
         }
@@ -1065,7 +1068,7 @@ export default {
     // 快速复制/粘贴 分组项目
     btnPastGroupAsbitem() {
       let lfind = -1, lfind2 = -1
-
+      let unPasteAble = []
       this.dataTransOpts.copyGroupAsbitem.forEach(e => {
         lfind = arrayExistObj(this.customerOrgGroupAsbitems, 'asbitemId', e.asbitemId)
         if (lfind == -1) {
@@ -1077,29 +1080,37 @@ export default {
               this.customerOrgGroupAsbitems.push(pojo)
             } else {
               let pasteAble = true  // 默认可复制
-              if (this.customerOrgGroup.forSexId != 'A'){
+              if (this.customerOrgGroup.forSexId != 'A') {
                 if (!(this.dict.asbItemAll[lfind2].forSexId == 'A' || this.dict.asbItemAll[lfind2].forSexId == 'U')) {
                   if (this.dict.asbItemAll[lfind2].forSexId != this.customerOrgGroup.forSexId) {
-                    this.$message.warning({showClose:true,message:`${this.dict.asbItemAll[lfind2].displayName} 不适合当前性别`})
+                    unPasteAble.push(this.dict.asbItemAll[lfind2].displayName)                    
                     pasteAble = false
                   }
                 }
               }
               // 再判断婚姻
-              if (!(checked || this.dict.asbItemAll[lfind2].maritalStatusId == 'A' || this.dict.asbItemAll[lfind2].maritalStatusId == 'U')) {
-                if (this.dict.asbItemAll[lfind2].maritalStatusId != this.customerOrgGroup.maritalStatusId) {
-                  this.$message.warning({showClose:true,message:`${this.dict.asbItemAll[lfind2].displayName} 不适合当前婚姻状态`})
-                  pasteAble = false                  
+              if (pasteAble) {
+                if (!(this.dict.asbItemAll[lfind2].maritalStatusId == 'A' || this.dict.asbItemAll[lfind2].maritalStatusId == 'U')) {
+                  if (this.dict.asbItemAll[lfind2].maritalStatusId != this.customerOrgGroup.maritalStatusId) {
+                    unPasteAble.push(this.dict.asbItemAll[lfind2].displayName)
+                    pasteAble = false
+                  }
                 }
               }
-              if(pasteAble) this.customerOrgGroupAsbitems.push(pojo)
+              if (pasteAble) this.customerOrgGroupAsbitems.push(pojo)
             }
           }
         }
       });
       this.dataTransOpts.copyGroupAsbitem = []
       this.refAsbItemByChoosed()
-      this.$message.success({ showClose: true, message: '操作成功！' })
+
+      if(unPasteAble.length > 0){
+        this.$message.warning({ showClose: true, message: `操作成功！  部份项目不适合当前的性别或婚姻状况：${unPasteAble.toString()}`})
+      }else{
+        this.$message.success({ showClose: true, message: `操作成功！`})
+      }
+      
     },
 
     // 检查项目互斥

src/components/report/BtnReport.vue

@@ -182,6 +182,10 @@ export default {
                 { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
                 { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
                 { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
+                { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
+                { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
+                { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
+                { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
             ],
         };
     },

src/components/report/PatientRegisterListNobtn.vue

@@ -145,6 +145,10 @@ export default {
         { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
         { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
         { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
+        { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
+        { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
+        { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
+        { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
       ],
 
     };
@@ -395,7 +399,9 @@ export default {
 
 
       console.log('/api/app/patientregister/getlistinfilter', body)
-      postapi('/api/app/patientregister/getlistinfilter', body)
+      // 带收费信息 /api/app/PeisReport/GetPatientRegisterReportWithCharge
+      // 不带收费信息 /api/app/patientregister/getlistinfilter
+      postapi('/api/app/PeisReport/GetPatientRegisterReportWithCharge', body)
         .then((res) => {
           if (res.code != -1) {
             this.patientRegister.prList = this.prListTrans(res.data.items);            
@@ -484,8 +490,9 @@ export default {
       if (this.patientRegister.query.medicalConclusionId && this.patientRegister.query.medicalConclusionId.length > 0) body.medicalConclusionIds = this.patientRegister.query.medicalConclusionId
 
       //console.log('/api/app/peisreport/getpatientregisterreport',body)
-
-      postapi('/api/app/peisreport/getpatientregisterreport', body).then(res => {
+      // 带收费信息 /api/app/PeisReport/GetPatientRegisterReportWithCharge
+      // 不带收费信息 /api/app/patientregister/getlistinfilter
+      postapi('/api/app/PeisReport/GetPatientRegisterReportWithCharge', body).then(res => {
         if (res.code > -1) {
 
           if (this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo) {