Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
+    //host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/router/modules/patient.js

@@ -258,6 +258,17 @@ export default {
       title: 'firstDisease',
       noCache: true
     }
+  },
+  {
+    path: '/patient/patient/firstDisease/print',
+    component: () => import('@/xt_pages/user/firstDiseasePrint'),
+    hidden: true,
+    is_menu: false,
+    name: 'firstDiseasePrint',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
   }
 
   ]

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -934,7 +934,8 @@
                               : "/"
                           }}
                         </div>
-                        L
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469">ml</span> 
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469">L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1436,12 +1436,12 @@ export default {
       this.listQuery.schedul_time = date.getTime();
       var start_month = moment().startOf('month').format('YYYY-MM-DD')
       var start_time = this.getTimestamp(start_month) 
-      console.log("stat_time-------",start_time)
+     
       this.listQuery.start_time = start_time
       var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
       var end_time = this.getTimestamp(end_month)
       this.listQuery.end_time = end_time
-      console.log("listQuery---------",this.listQuery)
+     
       this.getAllZone();
       this.getSchedualPatientList();
       this.getTemplateInfo();

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -213,11 +213,11 @@
                 </template>
               </el-table-column>
 
-              <!--<el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
-              <!--<template slot-scope="scope">-->
-              <!--<span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>-->
-              <!--</template>-->
-              <!--</el-table-column>-->
+              <el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
+              <template slot-scope="scope">
+              <span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>
+              </template>
+             </el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -538,14 +538,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--<el-row>-->
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="医嘱嘱托 :" prop="delivery_way">-->
-        <!--<el-input v-model="nameForm.remark"></el-input>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
-
-        <!--</el-row>-->
+       <el-row>
+       <el-col :span="12">
+      <el-form-item label="医嘱嘱托 :" prop="delivery_way">
+     <el-input v-model="nameForm.remark"></el-input>
+      </el-form-item>
+      </el-col>
+    </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="nameFormVisible = false">取消</el-button>

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -190,7 +190,7 @@
                 align="center"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.parent_row == 0">{{
+                  <span>{{
                     scope.row.remark
                   }}</span>
                 </template>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1647,6 +1647,7 @@
 
       },
       showInnerDialog: function(val) {
+       
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
@@ -1654,7 +1655,7 @@
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-
+           
             this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break
@@ -1716,19 +1717,70 @@ mu
         }
       },
       innerDialogComfirm: function(val) {
+      
+
         this.InnerDialogProps.visibility = false
         switch (val.type) {
+
           case 'dialyzer_perfusion_apparatus':
-            this.dialysisPrescription.dialyzer_perfusion_apparatus = val.value.join(',')
+            var newArr = []
+            if(this.dialyzerPerfusionApparatus!=null && this.dialyzerPerfusionApparatus.length>0){
+              for(let i=0;i<this.dialyzerPerfusionApparatus.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                   if(this.dialyzerPerfusionApparatus[i].name == val.value[j]){
+                     newArr.push(val.value[j])
+                   }
+                }
+              }
+            } 
+            if(newArr!=null && newArr.length>0){
+              
+              this.dialysisPrescription.dialyzer_perfusion_apparatus = newArr.join(',')
+            }else{
+              this.dialysisPrescription.dialyzer_perfusion_apparatus = ""
+            }
+           
             break
           case 'blood':
+            
             this.dialysisPrescription.blood = val.value.join(',')
             break
           case 'dialyzers':
-            this.dialysisPrescription.dialysis_dialyszers = val.value.join(',')
+            
+            var newArr = []
+            if(this.dialyzers!=null && this.dialyzers.length >0){
+              for(let i=0;i<this.dialyzers.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                  if(this.dialyzers[i].specification_name == val.value[j]){
+                      newArr.push(val.value[j])
+                  }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length >0){
+             this.dialysisPrescription.dialysis_dialyszers = newArr.join(',')
+            }else{
+              this.dialysisPrescription.dialysis_dialyszers = ""
+            }
+            
             break
           case 'irrigations':
-            this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
+            var newArr = []
+            if(this.irrigations!=null && this.irrigations.length >0){
+              for(let i=0;i<this.irrigations.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                  if(this.irrigations[i].specification_name == val.value[j]){
+                     newArr.push(val.value[j])
+                  }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length>0){
+             this.dialysisPrescription.dialysis_irrigation = newArr.join(',')
+            }else{
+              this.dialysisPrescription.dialysis_irrigation = ""
+            }
+            
             break
           case 'plasma_separator':
             this.dialysisPrescription.plasma_separator = val.value.join(',')

src/xt_pages/user/components/PatientForm.vue

@@ -255,7 +255,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家属电话 : " prop="homeTelephone">
+                <el-form-item label="家属电话 : " prop="homeTelephone"  class="is-required">
                   <el-input
                     v-model="form.homeTelephone"
                     maxlength="20"
@@ -441,7 +441,7 @@
               </el-col>
 
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家庭住址 : " prop="homeAddress">
+                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
                   <el-input v-model="form.homeAddress"></el-input>
                 </el-form-item>
               </el-col>
@@ -1336,10 +1336,10 @@ export default {
         age: [{ required: true, message: "请填写年龄", trigger: "blur" }],
         firstDialysisDate: [
           { required: true, message: "请选择日期", trigger: "blur" }
-        ]
-
-        // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
-        // homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
+        ],
+      
+        homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
+        homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
       },
       adminUserOptions:[],
     };

src/xt_pages/user/firstDisease.vue

@@ -514,7 +514,7 @@
        this.getlist()
       },
       print(){
-        this.$router.push({path:"/patient/patient/hospitalSummary/print?id="+this.form.id+"&patient_id="+this.patient_id})
+        this.$router.push({path:"/patient/patient/firstDisease/print?id="+this.form.id+"&patient_id="+this.patient_id})
       },
       tableRow(){
 

src/xt_pages/user/vascularAccess.vue

@@ -9,7 +9,7 @@
       <el-table class="oictable" :data="tableData" border style="width:100%">
       <el-table-column prop="start_time" label="建立日期" width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ getTime(scope.row.start_time, "{y}-{m}-{d}")}}</span>
+            <span>{{ getTime(scope.row.start_time)}}</span>
           </template>
      </el-table-column>
       <el-table-column prop="blood_access_part_opera_id" label="血管通路" align="center" width="120">
@@ -34,13 +34,13 @@
       </el-table-column>
       <el-table-column prop="date" label="首次启用日期" width="120" align="center">
           <template slot-scope="scope">
-            <span>{{ getTime(scope.row.first_start_time, "{y}-{m}-{d}")}}</span>
+            <span>{{ getTime(scope.row.first_start_time)}}</span>
           </template>
       </el-table-column>
      
        <el-table-column prop="date" label="停用日期" align="center" width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time, "{y}-{m}-{d}")}}</span>
+            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time)}}</span>
              <span v-if="scope.row.stop_time<0"></span>
           </template>
       </el-table-column>
@@ -673,12 +673,24 @@
            }  
         })   
       },
-     getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp);
-        }
-        return "";
-     },
+   //   getTime(value, temp) {
+        
+   //      if (value != undefined) {
+   //          return uParseTime(value, temp);
+   //      }
+
+   //      return "";
+   //   },
+     getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
      handleUpdateAdviceTemplate(id){
         getVascularAccessByDetail(id).then(response=>{
            if(response.data.state ==1){
@@ -739,7 +751,7 @@
               }
              this.form.blood_access_part_opera_id = blood_part
 
-             this.form.first_start_time = this.getTime(accessDetail.first_start_time,"{y}-{m}-{d}")
+             this.form.first_start_time = this.getTime(accessDetail.first_start_time)
 
              var inflow_id = 0
              for(let i=0;i<this.optionsPass.length;i++){
@@ -749,9 +761,9 @@
              }
              this.form.inflow_pass = inflow_id
              this.form.remark = accessDetail.remark
-             this.form.start_time = this.getTime(accessDetail.start_time,"{y}-{m}-{d}")
+             this.form.start_time = this.getTime(accessDetail.start_time)
              this.form.stop_reason = accessDetail.stop_reason
-             this.form.stop_time = this.getTime(accessDetail.stop_time,"{y}-{m}-{d}")
+             this.form.stop_time = this.getTime(accessDetail.stop_time)
  
              this.form.user_status = accessDetail.user_status
              this.form.other_vascular = accessDetail.other_vascular