label seo

src/components/patientRegister/PatientLis.vue

@@ -463,24 +463,6 @@ export default {
       };
 
       if (isPreview) {        
-        /*
-        postapi(
-          `/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
-        )
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = { lisRequest: res.data };
-              console.log(
-                "JSON.stringify(toOutShell)",
-                JSON.stringify(toOutShell)
-              );
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
-            }
-          })
-          .catch((err) => {
-            this.$message.warning(err);
-          });
-        */
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
             if (JSON.parse(res).code < 0) {
@@ -492,38 +474,6 @@ export default {
             this.$message.warning({ showClose: true, message: `${err}` });
           });
       } else {        
-        /*
-        postapi(
-          `/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
-        )
-          .then((res) => {
-            if (res.code != -1) {
-              toOutShell.ReportTable = { lisRequest: res.data };
-              console.log(
-                "JSON.stringify(toOutShell)",
-                JSON.stringify(toOutShell)
-              );
-              return this.$peisAPI.print(JSON.stringify(toOutShell));
-            }
-          })
-          .then((res) => {
-            if (JSON.parse(res).code >= 0) {
-              //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
-              // {
-              //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
-              //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-              //   "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-              // }
-              return postapi("/api/app/lisrequest/updatelisrequestisprint", {
-                operateType: 1,
-                patientRegisterId: prId,
-              });
-            }
-          })
-          .catch((err) => {
-            this.$message.warning(err);
-          });
-        */
         this.$peisAPI.print(JSON.stringify(toOutShell))
           .then(res => {
             if (JSON.parse(res).code < 0) {

src/components/patientRegister/PatientPacsRequest.vue

@@ -48,7 +48,7 @@ export default {
         routeUrlorPageName: 'patientLis', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
       },
-      pacsRequest:[], // 检查申请单
+      pacsRequest: [], // 检查申请单
       chooseRows: [], // 选中的行
     };
   },
@@ -129,7 +129,7 @@ export default {
       }
 
       if (isPreview) {
-        this.pacsPrint(this.chooseRows[0].registerCheckId,"0004",isPreview)
+        this.pacsPrint(this.chooseRows[0].registerCheckId, "0004", isPreview)
         return
       }
 
@@ -137,10 +137,10 @@ export default {
       for (let i = 0; i < this.chooseRows.length; i++) {
         let e = this.chooseRows[i];
         try {
-          await this.pacsPrint(e.registerCheckId,"0004",isPreview)
+          await this.pacsPrint(e.registerCheckId, "0004", isPreview)
         } catch (error) {
           console.log(`打印条码或更新条码打印状态失败，原因：${error}`)
-          this.$message.warning({ showClose: true, message: `打印条码或更新条码打印状态失败，原因：${error}`})
+          this.$message.warning({ showClose: true, message: `打印条码或更新条码打印状态失败，原因：${error}` })
         }
       }
     },
@@ -180,7 +180,7 @@ export default {
         try {
           let lres = await this.$peisAPI.print(JSON.stringify(toOutShell))
           let Jres = JSON.parse(lres)
-          if(Jres.code < 0){
+          if (Jres.code < 0) {
             err = Jres.message
             console.log('打印检查条码错误', err)
             this.$message.error({ showClose: true, message: `打印检查条码错误 ${err}` });
@@ -198,7 +198,7 @@ export default {
       this.pacsRequest = []
       if (!patientRegisterId) return
       // console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
-      postapi(`/api/app/PrintReport/getpacsnoreport?PatientRegisterId=${patientRegisterId}`)
+      postapi('/api/app/PrintReport/getpacsnoreport', { patientRegisterId })
         .then(res => {
           if (res.code > -1) {
             this.pacsRequest = res.data
@@ -215,7 +215,7 @@ export default {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        if(newVal != oldVal) this.retrieve_pacs_request(this.dataTransOpts.tableS.patient_register.id)
+        if (newVal != oldVal) this.retrieve_pacs_request(this.dataTransOpts.tableS.patient_register.id)
       }
     },
   }

src/components/patientRegister/PatientRegisterEdit.vue

@@ -422,6 +422,7 @@
         <div v-show="checkPagePriv(pagePriv.privs, '复制新增')" class="btn">
           <el-button type="primary" class="commonbutton" @click="rdCopy">复制新增</el-button>
         </div>
+
         <div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btn">
           <el-button type="success" class="commonbutton" @click="btnSubmit('form', true)">保存</el-button>
         </div>
@@ -751,6 +752,7 @@ export default {
       dialogOrg: false,
 
       printing: false, // 是否打印中，控制一次只能有一个任务
+      completeFlag:'0', // 默认预登记，首次正式登记或者预登记转正式登记，提示打印条码与指引单
     };
   },
 
@@ -950,9 +952,6 @@ export default {
       this.dialogOrg = false
     },
 
-
-
-
     // 获取登记信息 初始form表单数据
     async initFormData(patientRegisterId) {
       this.peisid = window.sessionStorage.getItem('peisid');
@@ -976,12 +975,14 @@ export default {
         this.form.customerOrgParentId = customerOrgParentId //体检父单位
         this.form.customerOrgName = customerOrgName
         this.handleFormData()
+        this.completeFlag = '0'
       } else {
         // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
         postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId }).then(res => {
           if (res.code > -1) {
             // this.form = res.data  这种方式，会造成 checkbox 值变化不响应，故取消
             this.form = res.data
+            this.completeFlag = this.form.completeFlag
             this.handleFormData()
           }
         })
@@ -1484,13 +1485,13 @@ export default {
               //一般读身份证照片时，会出现这种情况
               if (this.peoplePhoto && this.peoplePhoto.indexOf("data:image") > -1) await savePeoplePhoto(res.data.id, this.peoplePhoto);
 
-              // 保存即发送收费申请
-              if (this.LocalConfig.patientRegister.immediateToHisCharge) {
+              // 保存即发送收费申请 正式登记的才发送申请
+              if (this.form.completeFlag != '0' && this.LocalConfig.patientRegister.immediateToHisCharge) {
                 await this.immediateToHisCharge(this.form.id)
               }
 
-              // 新增保存时，提示是否打条码 (预登记一般不打条码)
-              if (!body.id && this.form.completeFlag != '0') {
+              // 首次正式登记或者预登记转正式登记，提示打印条码与指引单
+              if (this.completeFlag == '0' && this.form.completeFlag != '0') {
                 if (Array.isArray(this.LocalConfig.patientRegister.printGuideLabel) && this.LocalConfig.patientRegister.printGuideLabel.length > 0) {
                   this.$confirm("是否打印 指引单、检验条码及 Pacs 条码?", "提示", {
                     confirmButtonText: "是",
@@ -1509,9 +1510,12 @@ export default {
                       }
                     })
                     .catch((err) => {                      
-                      // if (err == "cancel") {
-                      //   this.$message.info({ showClose: true, message: "已取消操作" });
-                      // }
+                      if (err != "cancel") {
+                        console.log(err)
+                      }
+                    })
+                    .finally(() => {
+                      this.completeFlag = this.form.completeFlag
                     });
                 }
               }

src/components/patientRegister/PatientRegisterList.vue

@@ -1260,7 +1260,7 @@ export default {
         ],
         BusinessCode: row.id
       };
-
+      console.log('this.$peisAPI.print',toOutShell)
       if (isPreview) {
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {