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

src/api/patient.js

@@ -1057,4 +1057,13 @@ export function updatePatientFallassment(params){
     method:"get",
     params:params,
   })
+}
+
+export function savePatientCritaicalInformed(data){
+
+  return request({
+    url:"/api/patient/savepatientcritaicalinformed",
+    method:"post",
+    data:data,
+  })
 }

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -812,7 +812,7 @@
         return week;
       },
       toBiaoqian(){
-        this.$router.push({path:"/dialysis/hisLongSignPrint?selected_date="+this.selected_date+"&schedule_type="+this.schedule_type+"&partition_id="+this.query.partition_id})
+        this.$router.push({path:"/dialysis/hisLongSignPrint?selected_date="+this.selected_date+"&schedule_type="+this.query.schedule_type+"&partition_id="+this.query.partition_id})
       }
     }
   }

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -315,7 +315,7 @@
         }
      },
       printAction: function() {
-        if(this.org_id != 10490 && this.org_id != 0){
+        if(this.org_id != 10490 && this.org_id != 0 && this.org_id!=10602){
           const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 0px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 0px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
             printable: 'print_content',

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -151,7 +151,6 @@ export default {
       }
     },
     getSpecialName(drug_id){
-        console.log("drug_id woowow",drug_id)
         var name = ""
         for(let i=0;i<this.drugList.length;i++){
             if(drug_id == this.drugList[i].id){
@@ -200,6 +199,28 @@ export default {
         this.adviceList = adviceList
 
         var longHisAdviceList = response.data.data.longHisAdviceList
+
+
+        var tablelist = response.data.data.tablelist
+        console.log("tablelsit",tablelist)
+
+        var hisArr= []
+        if(tablelist!=null && tablelist.length > 0){
+         for(let i=0;i<tablelist.length;i++){
+            if(tablelist[i].his_prescription_template!=null){
+            if(tablelist[i].his_prescription_template.his_prescription_info!=null){
+            for(let j=0;j<tablelist[i].his_prescription_template.his_prescription_info.length>0;j++){
+                if(tablelist[i].his_prescription_template.his_prescription_info[j].his_advice!=null){
+                    for(let z=0;z<tablelist[i].his_prescription_template.his_prescription_info[j].his_advice.length>0;z++){
+                      hisArr.push(tablelist[i].his_prescription_template.his_prescription_info[j].his_advice[z])
+                    }
+                }
+             }
+           }
+          }
+         }
+        }
+      console.log("hisArr223323323223",hisArr)
         
         if(this.org_id!=10571 && this.org_id!=0){
             for(let i=0;i<list.length;i++){
@@ -213,15 +234,15 @@ export default {
 
         if(this.org_id ==10571 || this.org_id == 0){
             for(let i=0;i<list.length;i++){
-                for(let j=0;j<longHisAdviceList.length;j++){
-                    if(list[i].patient_id == longHisAdviceList[j].patient_id){
-                        list[i].his_advice_list.push(longHisAdviceList[j])
+                for(let j=0;j<hisArr.length;j++){
+                    if(list[i].patient_id == hisArr[j].patient_id){
+                        list[i].his_advice_list.push(hisArr[j])
                     }
                 }
              }
         }
        
-
+        console.log("list-------------",list)
         this.list = list
       
         var druglist = response.data.data.drugList

src/xt_pages/user/Informed/components/criticalpatient_informed.vue

@@ -81,7 +81,7 @@
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button type="primary" @click="savePatientCritaicalInformed">确 定</el-button>
         </span>
       </el-dialog>
 
@@ -91,7 +91,7 @@
 <script>
 import print from "print-js";
 import Editor from '@/components/Editor'
-import { getPatientDetailInformedconsent  } from '@/api/patient'
+import { getPatientDetailInformedconsent,savePatientCritaicalInformed  } from '@/api/patient'
 import { jsGetAge, uParseTime } from "@/utils/tools";
 const content=`<p style='position: relative;padding-left: 2em;margin-top: 10px;margin-bottom: 4px '>
   <span style='position: absolute;top: 0px;left: 0;'>一、</span>该知情同意书将向您介绍危重患者接受血液净化治疗选择相关事宜，你有权知道危重患者接受血液净化治疗存在的风险、预期效果及对人体等影响，请您仔细阅读，提出与治疗有关的任何疑问。决定是否同意对患者实施血液净化治疗。
@@ -204,6 +204,17 @@ export default{
       },
       bianji(){
         this.dialogVisible=true
+      },
+      savePatientCritaicalInformed(){
+        var params = {
+          content:this.$refs.editor.content
+        }
+       savePatientCritaicalInformed(params).then(response=>{
+          if(response.data.state ==1){
+            var patientCritical = response.data.data.patientCritical
+            this.$message.success("保存成功!")
+          }
+       })
       }
   },
   created(){

src/xt_pages/user/components/PatientSidebar.vue

@@ -204,68 +204,68 @@ export default {
             },
           ]
         },
-        // {
-        //   name: '5',
-        //   label: '评估工具',
-        //   children: [
-        //     {
-        //       name: '5-1',
-        //       label: '跌倒评估'
-        //     },
-        //     {
-        //       name: '5-2',
-        //       label: '小儿跌倒风险评估'
-        //     },
-        //     {
-        //       name: '5-3',
-        //       label: '压疮风险评估'
-        //     },
-        //     {
-        //       name: '5-4',
-        //       label: 'OH压疮评估'
-        //     },
-        //     {
-        //       name: '5-5',
-        //       label: '日常生活能力评估'
-        //     },
-        //     {
-        //       name: '5-6',
-        //       label: '导管脱落风险评估'
-        //     },
-        //     {
-        //       name: '5-7',
-        //       label: 'RASS及疼痛评估'
-        //     },
-        //     {
-        //       name: '5-8',
-        //       label: '营养状况评估'
-        //     },
-        //     {
-        //       name: '5-9',
-        //       label: '约束告知单'
-        //     },
-        //     {
-        //       name: '5-10',
-        //       label: '心理评估'
-        //     },
-        //     {
-        //       name: '5-11',
-        //       label: '瘙痒评估'
-        //     },
-        //     {
-        //       name: '5-12',
-        //       label: '血液透析患者评估'
-        //     },
-        //     {
-        //       name: '5-13',
-        //       label: 'Glasgow昏迷评分量表'
-        //     },
-        //     {
-        //       name: '5-14',
-        //       label: '肌力评估表'
-        //     },
-        //    ]
-        //  },
+        {
+          name: '5',
+          label: '评估工具',
+          children: [
+            {
+              name: '5-1',
+              label: '跌倒评估'
+            },
+            {
+              name: '5-2',
+              label: '小儿跌倒风险评估'
+            },
+            {
+              name: '5-3',
+              label: '压疮风险评估'
+            },
+            {
+              name: '5-4',
+              label: 'OH压疮评估'
+            },
+            {
+              name: '5-5',
+              label: '日常生活能力评估'
+            },
+            {
+              name: '5-6',
+              label: '导管脱落风险评估'
+            },
+            {
+              name: '5-7',
+              label: 'RASS及疼痛评估'
+            },
+            {
+              name: '5-8',
+              label: '营养状况评估'
+            },
+            {
+              name: '5-9',
+              label: '约束告知单'
+            },
+            {
+              name: '5-10',
+              label: '心理评估'
+            },
+            {
+              name: '5-11',
+              label: '瘙痒评估'
+            },
+            {
+              name: '5-12',
+              label: '血液透析患者评估'
+            },
+            {
+              name: '5-13',
+              label: 'Glasgow昏迷评分量表'
+            },
+            {
+              name: '5-14',
+              label: '肌力评估表'
+            },
+           ]
+         },
         {
           name: '6',
           label: '文书管理',