新分支

src/api/new_stock/stock.js

@@ -16,3 +16,31 @@ export function GetDrugChangeStock(params) {
 
   })
 }
+
+
+export function getHisDrugCodeQueryList(params){
+
+  return request({
+    url:"/api/drug/gethisdrugcodequery",
+    method:"get",
+    params:params
+  })
+}
+
+export function createUploadDrugCode(params){
+ 
+  return request({
+    url:"/api/drug/createuploaddrugcode",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getPatientDrugCode(params){
+ 
+  return request({
+    url:"/api/drug/getpatientdrugcode",
+    method:"Get",
+    params:params,
+  })
+}

src/router/modules/hisTool.js

@@ -101,7 +101,7 @@ export default {
     //   component: () => import('@/xt_pages/outpatientTool/fapiao'),
     //   name: 'faPiao',
     //   meta: { title: 'faPiao', noCache: true }
-    // }, 
+    // },
     {
       path: '/hisTool/yidiClear',
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
@@ -203,6 +203,16 @@ export default {
             noCache: true
           },
         },
+        //药品查询
+        {
+          path: '/outpatientTool/drugCodeQuery',
+          component: () => import('@/xt_pages/outpatientTool/drugCodeQuery'),
+          name: 'drugCodeQuery',
+          meta: {
+            title: '药品追溯',
+            noCache: true
+          },
+        },
     // {
     //   path: '/fapiao/settle',
     //   component: () => import('@/xt_pages/fapiao/settleDetail'),

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -265,6 +265,11 @@
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
+        <span style="font-size: 17px">请选择是否发药时上传追溯码</span>
+        <span style="display: block; padding: 18px 25px">
+          <el-radio v-model="is_drug_open" label="1">是</el-radio>
+          <el-radio v-model="is_drug_open" label="2">否</el-radio>
+        </span>
         <div
           style="
             height: 50px;
@@ -301,6 +306,8 @@
         <el-button type="primary" @click="saveTextArea()">确 定</el-button>
       </span>
       </el-dialog>
+
+
     </div>
 
     <patient-print
@@ -388,7 +395,9 @@ export default {
       drug_code:0,
       currentRow:{},
       currentIndex:0,
-
+      is_drug_open:"2",
+      textarea:"",
+    
     };
   },
   watch: {},
@@ -760,12 +769,15 @@ export default {
           this.dialogVisible = true;
           var config = response.data.data.config;
           this.is_open = config.is_open.toString();
+          var codeConfig = response.data.data.codeConfig
+          this.is_drug_open = codeConfig.is_open.toString()
         }
       });
     },
     SaveSetting() {
       var params = {
         is_open: parseInt(this.is_open),
+        is_drug_open:parseInt(this.is_drug_open)
       };
       SaveSetting(params).then((response) => {
         if (response.data.state == 1) {
@@ -875,7 +887,9 @@ export default {
       }
    
 
-    }
+    },
+    
+    
   },
 };
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -843,6 +843,40 @@
                             </td>
                           </tr>
                         </template>
+
+                        <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index" v-if="org_id == 0 || org_id ==10206">
+                        <td height="32px;padding:1px 1px">
+                            <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                            </span>
+                        </td>
+                        <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+                            <span style="padding-left:5px;display:inline-block;">
+                              <span v-if="advice.type ==2">{{ advice && advice.project ? advice.project.project_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
+                              <span v-if="advice.type ==3">{{ advice && advice.good_info ? advice.good_info.good_name : '' }}  {{ advice && advice.good_info ? advice.good_info.specification_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
+                            </span>
+                        </td>
+
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'doctor') == ''">
+                                {{getAdminUser(advice, 'doctor')}}
+                            </span>
+                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'doctor')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
+                                {{getAdminUser(advice, 'execution_staff')}}
+                            </span>
+                            <span v-else>
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                        </td>
+                        </tr>
                       </tbody>
                     </table>
                   </td>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -941,7 +941,7 @@
                             record.prescription &&
                             record.prescription.displace_liqui_value
                               ? record.prescription.displace_liqui_value
-                              : "/"
+                              : "0"
                           }}
                           </span>
                         </div>

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -1147,6 +1147,42 @@
                             <span v-if="record.prescription.anticoagulant == 7"
                               >&nbsp;低分子肝素钠</span
                             >
+                            <span v-if="record.prescription.anticoagulant == 8"
+                              >&nbsp;依诺肝素</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 9"
+                              >&nbsp;达肝素</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 10"
+                              >&nbsp;体外抗凝</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 11"
+                              >&nbsp;那屈肝素</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 12"
+                              >&nbsp;无抗凝剂</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 13"
+                              >&nbsp;那屈肝素钙</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 14"
+                              >&nbsp;肝素钙注射液</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 15"
+                              >&nbsp;甲磺酸萘莫司他</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 16"
+                              >&nbsp;低分子量肝素钙</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 17"
+                              >&nbsp;肝素钠</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 18"
+                              >&nbsp;贝米肝素钠注射液</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 19"
+                              >&nbsp;低分子量肝素钠</span
+                            >
                           </div>
                         </div>
                         <div class="inline_block" style="margin-left: 20px">
@@ -1162,7 +1198,7 @@
                                 : "/"
                             }}
                           </div>
-                          <span v-if="record.prescription.anticoagulant == 4"
+                          <span v-if="record.prescription.anticoagulant == 4 || record.prescription.anticoagulant == 15"
                             >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 3"
@@ -1207,6 +1243,9 @@
                                 : 0
                             }}
                           </div>
+                          <span v-if="record.prescription.anticoagulant == 15"
+                            >mg/h</span
+                          >
                           <span v-if="record.prescription.anticoagulant == 5"
                             >ml/h</span
                           >
@@ -1236,6 +1275,9 @@
                                 : "/"
                             }}
                           </div>
+                          <span v-if="record.prescription.anticoagulant == 15"
+                            >mg</span
+                          >
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg</span
                           >

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==10206){
+          if(this.org_id ==10206 || this.org_id == 0){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -998,6 +998,14 @@
           type="primary"
           >打印</el-button
         >
+        <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+         >
         </div>
       </template>
       <template v-if="org_template_info.template_id == 81">
@@ -2606,6 +2614,15 @@ export default {
 
 
       }
+
+      if(this.org_id == 0 || this.org_id == 10206){
+        printJS({
+          printable: "dialysis-print-box-1-2",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }
     },
 
     getNumber() {
@@ -2676,6 +2693,10 @@ export default {
             this.org_template_info = response.data.data.org_template_info;
             this.org_template_info.template_id= 80
           }
+
+          if(this.org_id == 0){
+            this.org_template_info.template_id= 80
+          }
           console.log('kkkkkkk222222',this.org_template_info);
           this.loading = false;
           //   this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -996,7 +996,7 @@
                         <span v-if="org_id!=10206&& org_id!=10510 && org_id!=0"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
-                            : "/"
+                            : "0"
                         }}
                         </span>
                       </div>
@@ -2232,12 +2232,11 @@
                             advice.execution_frequency
                           }}</span>
                           <span
-                            v-if="
-                              advice.parent_id == 0 && advice.remark.length > 0
+                            v-if="advice.parent_id == 0 && advice.remark.length > 0 && org_id!=10644
                             "
                             >({{ advice.remark }})</span
                           >
-                          <span v-if="org_id == 0 || org_id == 10644">({{ advice.remark }})</span>
+                          <span v-if="(org_id == 0 || org_id == 10644) && advice.remark.length>0" >({{ advice.remark }})</span>
                         </td>
 
                         <td height="32px">

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -755,7 +755,7 @@
                         </td>
                       </tr>
 
-                      <!-- <tr
+                     <tr
                         v-for="(advice, advice_index) in projectsOne"
                         :key="advice_index"
                       >
@@ -814,7 +814,7 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                      </tr> -->
+                      </tr> 
 
                     </tbody>
                   </table>
@@ -1378,9 +1378,9 @@
         </div>
       </div>
       <div class="row" style="margin-top: 15px">
-        <div class="inline_block" style="">
+        <div  style="">
           诊断：
-          <div class="under_line" style="width:180px;text-align: left;white-space: normal;">
+          <div class="under_line" style="width: 95%;text-align: left;white-space: normal;">
             {{ patientInfo.diagnose }}
           </div>
         </div>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))