Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/advice.js

     method: 'get',
     params: params
   })
+}
+
+export function getPatientsByName(params){
+   
+  return request({
+    url:"/api/schedule/getpatientbyname",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getDocAdviceByPatientId(params){
+  
+  return request({
+    url:"/api/schedule/getdocadvicebypatientid",
+    method:"get",
+    params:params,
+  })
 }

src/api/role/admin.js

   })
 }
 
-export function CreateQianshuUserName(data){
+export function CreateQianshuUserName(admin_user_id,data){
   
   return request({
-    url:"/api/device/createqianshuusername",
+    url:"/api/device/createqianshuusername?admin_user_id="+admin_user_id,
     method:"Post",
     data:data,
   })

src/router/modules/dialysis.js

         noCache: true
       }
     },
+    {
+      path: '/dialysis/patientDoctorAdvice',
+      component: () => import('@/xt_pages/dialysis/patientDoctorAdvice'),
+      name: '医嘱统计',
+      meta: {
+        title: '医嘱统计',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/longDoctorAdvice',
       component: () => import('@/xt_pages/dialysis/longDoctorAdvice'),

src/xt_pages/dialysis/batch_print/batch_print_order.vue

               岁
             </div>
             <div class="inline_block" style="margin-left: 25px">
-              科室：
+              科室22：
               <check-box
                 text="门诊透析"
                 :checked="record.patient.source == 1"
                     <div class="row" style="padding: 2px 0;">
                       <div class="inline_block">
                         抗凝方式：
-                        <check-box
-                          text="普通肝素"
-                          :checked="
-                            isCheckBoxChecked(
-                              record.prescription,
-                              'anticoagulant',
-                              2
-                            )
-                          "
-                        ></check-box>
+                        <check-box text="普通肝素" :checked="isCheckBoxChecked(record.prescription,'anticoagulant',2)"></check-box>
+                        <check-box text="肝素钙注射液" :checked="isCheckBoxChecked(record.prescription,'anticoagulant',14)"></check-box>
                         （ 首剂
+                        <div class="under_line" style="width: 50px;">
+                          {{isCheckBoxChecked( record.prescription,"anticoagulant",2)? record.prescription.anticoagulant_shouji: ""}}
+                          {{isCheckBoxChecked( record.prescription,"anticoagulant",14)? record.prescription.anticoagulant_shouji: ""}}
+                        </div>
+                        mg&nbsp; 维持
                         <div class="under_line" style="width: 50px;">
                           {{
                             isCheckBoxChecked(
                               "anticoagulant",
                               2
                             )
-                              ? record.prescription.anticoagulant_shouji
+                              ? record.prescription.anticoagulant_weichi
                               : ""
                           }}
-                        </div>
-                        mg&nbsp; 维持
-                        <div class="under_line" style="width: 50px;">
                           {{
                             isCheckBoxChecked(
                               record.prescription,
                               "anticoagulant",
-                              2
+                              14
                             )
                               ? record.prescription.anticoagulant_weichi
                               : ""
                             "
                           ></check-box>
                         </span>
-                        <div class="under_line" style="width: 40px;">
+                        <div class="under_line" style="width: 50px;">
                           <span v-if="record.prescription.anticoagulant == 3"
                             >{{
                               isCheckBoxChecked(
                                 : ""
                             }}
                           </span>
+                          <span v-if="record.prescription.anticoagulant == 14"
+                            >{{
+                              isCheckBoxChecked(
+                                record.prescription,
+                                "anticoagulant",
+                                14
+                              )
+                                ? record.prescription.anticoagulant_zongliang
+                                : ""
+                            }}
+                          </span>
                         </div>
                         IU
                         <check-box
                         "
                       ></check-box>
                       （ 科室
-                      <div class="under_line" style="width: 200px;"></div>
+                      <div class="under_line" style="width: 200px;">
+                        {{ record.assessment_after_dislysis.inpatient_department }}
+                      </div>
                       交待病房护士/患者/陪人观察内容：
                       <check-box
                         text="意识状态"

src/xt_pages/dialysis/dialysisPrintOrder.vue

           scanStyles: false,
         });
 
+
+        console.log("printjswowoowowowwoow",style12)
+
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/newDoctorAdvice.vue

         return searchArray
       },
      handleSelect(val) {
-       console.log("val323223232323232323",val)
+      
        this.patient_id = val.id
        this.listQuery.keyword = val.name
        this.requestSchedualDoctors(this.time)

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

                   <tbody>
                     <tr>
                       <td width="70">抗凝方式:</td>
-                      <td width="80">
+                      <td width="80" v-if="prescription.anticoagulant == 2 ">
                         <label-box :isChecked="prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>
                       </td>
+                      <td width="120" v-if="prescription.anticoagulant == 14">
+                        <label-box :isChecked="prescription.anticoagulant == 14 ? true : false" showValue="肝素钙注射液"></label-box>
+                      </td>
                       <td width="10">(</td>
                       <td width="35">首剂</td>
                       <td width="50">
                         <div class="under-line">
                           &nbsp;
                           <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_shouji }}</span>
+                          <span v-if="prescription.anticoagulant == 14">{{ prescription.anticoagulant_shouji }}</span>
                         </div>
                       </td>
                       <td width="50">mg</td>
                         <div class="under-line">
                           &nbsp;
                           <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi }}</span>
+                          <span v-if="prescription.anticoagulant == 14">{{ prescription.anticoagulant_weichi }}</span>
                         </div>
                       </td>
                       <td width="40">mg/h</td>
                       <td width="60">
                         <div class="under-line">
                           &nbsp;
+                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 3">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
+                          <span v-if="prescription.anticoagulant == 14">{{ prescription.anticoagulant_zongliang }}</span>
                         </div>
                       </td>
                       <td width="20" v-if="isShowZero">mg</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

     },
 
     toUpload() {
-        let dom = document.getElementById("dialysis-print-box-64");
+       
+        let dom = document.getElementById("dialysis-print-box-64")
         //调用方法下载
         html2canvas(dom, {
           useCORS: true, //允许跨域
 
           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
           console.log("base63",newBase64Data)
-          this.viewPdf(newBase64Data)
 
-          var data = {
-            name:newBase64Data,
-          }
-          UploadPrintOrder(data).then(response=>{
-            if(response.data.state == 1){
-              var sign =  response.data.data.sign
-              console.log("SIGNWWOOWWO")
-              this.$message.success("保存成功!")
-            }
-          })
+          const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+          this.openPdf(blob);
+          // this.viewPdf(newBase64Data)
+          
+          // var data = {
+          //   name:newBase64Data,
+          // }
+          // UploadPrintOrder(data).then(response=>{
+          //   if(response.data.state == 1){
+          //     var sign =  response.data.data.sign
+          //     console.log("SIGNWWOOWWO")
+          //     this.$message.success("保存成功!")
+          //   }
+          // })
           
           // this.viewPdf(newBase64Data)
           //保存到pdf，名字是stone
         window.open(fileURL);//打开ppf文件
       }
     },
-    base64ToBlob(code) {
-      code = code.replace(/[\n\r]/g, '');// 检查base64字符串是否符合base64编码
-      // atob() 方法用于解码使用 base-64 编码的字符串。
-      const raw = window.atob(code);
-      const rawLength = raw.length;
-      const uInt8Array = new Uint8Array(rawLength);
-      for (let i = 0; i < rawLength; ++i) {
-      // 将解码后的逐个字符转换成Unicode序号，放入Unit8Array数组
-        uInt8Array[i] = raw.charCodeAt(i);
-      }
-      // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
-      return new Blob([uInt8Array], { type: 'application/pdf' });
-    },
+    // base64ToBlob(code) {
+    //   code = code.replace(/[\n\r]/g, '');// 检查base64字符串是否符合base64编码
+    //   // atob() 方法用于解码使用 base-64 编码的字符串。
+    //   const raw = window.atob(code);
+    //   const rawLength = raw.length;
+    //   const uInt8Array = new Uint8Array(rawLength);
+    //   for (let i = 0; i < rawLength; ++i) {
+    //   // 将解码后的逐个字符转换成Unicode序号，放入Unit8Array数组
+    //     uInt8Array[i] = raw.charCodeAt(i);
+    //   }
+    //   // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
+    //   return new Blob([uInt8Array], { type: 'application/pdf' });
+    // },
     compare (property) {
       return function (a, b) {
           var value1 = a[property]
           return value1 - value2
       }
     },
+
+    openPdf(blob) {
+      const objectUrl = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = objectUrl;
+      a.target = '_blank';
+      a.click();
+      URL.revokeObjectURL(objectUrl);
+    },
+     base64ToBlob(base64Data, contentType) {
+      contentType = contentType || '';
+      const sliceSize = 1024;
+      const byteCharacters = window.atob(base64Data);
+      const bytesLength = byteCharacters.length;
+      const slicesCount = Math.ceil(bytesLength / sliceSize);
+      const byteArrays = new Array(slicesCount);
+
+      for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+        const begin = sliceIndex * sliceSize;
+        const end = Math.min(begin + sliceSize, bytesLength);
+
+        const bytes = new Array(end - begin);
+        for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+          bytes[i] = byteCharacters[offset].charCodeAt(0);
+        }
+        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      }
+
+      return new Blob(byteArrays, {
+        type: contentType
+      });
+    },
+
+  
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/role/admin.vue

               </el-button>
             </span> -->
 
-            <!-- <span>
+           <!-- <span>
               <el-button type="primary" size="small" @click="toQianShu(scope.row.user_id,scope.row.user_name)">
                     <span>创建签署人用户</span>
               </el-button>
               <el-button type="primary" size="small" @click="toYinZhang(scope.row.user_id,scope.row.user_name)">
                     <span>创建个人印章</span>
               </el-button>
-            </span>
-
+            </span>  -->
+<!-- 
             <span>
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
                     <span>创建企业印章</span>
               </el-button>
-            </span> -->
+            </span>  -->
             <el-tooltip
               class="item"
               effect="dark"
       })
     },
    
-    toQianShu(){
-      CreateQianshuUserName().then(response=>{
+    toQianShu(admin_user_id){
+       
+      CreateQianshuUserName(admin_user_id).then(response=>{
          if(response.data.state==1){
           var sign =  response.data.data.sign
           var userId =  response.data.data.userId
+          this.$message.success("签署成功!")
          }
       }) 
     },

src/xt_pages/role/components/AdminInfoForm.vue

        </el-form-item>
     </el-col>
     <el-col :span="8">
-       <el-form-item label="工号:">
+       <el-form-item label="身份证(工号):">
            <el-input v-model="form.job_number" style="width:180px;"></el-input>
        </el-form-item>
     </el-col>

src/xt_pages/user/inspection.vue

 
 
 
-                  if(this.org_id == 10121){
+                  if(this.org_id == 10121 || this.org_id ==10278 || this.org_id ==10138){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{