XMLWAN 2 лет назад
Родитель
Сommit
822c087cf3

+ 11 - 0
src/router/modules/patient.js Просмотреть файл

258
       title: 'firstDisease',
258
       title: 'firstDisease',
259
       noCache: true
259
       noCache: true
260
     }
260
     }
261
+  },
262
+  {
263
+    path: '/patient/patient/firstDisease/print',
264
+    component: () => import('@/xt_pages/user/firstDiseasePrint'),
265
+    hidden: true,
266
+    is_menu: false,
267
+    name: 'firstDiseasePrint',
268
+    meta: {
269
+      title: 'firstDiseasePrint',
270
+      noCache: true
271
+    }
261
   }
272
   }
262
 
273
 
263
   ]
274
   ]

+ 0 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue Просмотреть файл


+ 2 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Просмотреть файл

934
                               : "/"
934
                               : "/"
935
                           }}
935
                           }}
936
                         </div>
936
                         </div>
937
-                        L
937
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469">ml</span> 
938
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469">L</span>
938
                       </div>
939
                       </div>
939
                       <div class="inline_block" style="flex: 1">
940
                       <div class="inline_block" style="flex: 1">
940
                         干体重:
941
                         干体重:

+ 2 - 2
src/xt_pages/dialysis/bloodPresssWatch.vue Просмотреть файл

1436
       this.listQuery.schedul_time = date.getTime();
1436
       this.listQuery.schedul_time = date.getTime();
1437
       var start_month = moment().startOf('month').format('YYYY-MM-DD')
1437
       var start_month = moment().startOf('month').format('YYYY-MM-DD')
1438
       var start_time = this.getTimestamp(start_month) 
1438
       var start_time = this.getTimestamp(start_month) 
1439
-      console.log("stat_time-------",start_time)
1439
+     
1440
       this.listQuery.start_time = start_time
1440
       this.listQuery.start_time = start_time
1441
       var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
1441
       var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
1442
       var end_time = this.getTimestamp(end_month)
1442
       var end_time = this.getTimestamp(end_month)
1443
       this.listQuery.end_time = end_time
1443
       this.listQuery.end_time = end_time
1444
-      console.log("listQuery---------",this.listQuery)
1444
+     
1445
       this.getAllZone();
1445
       this.getAllZone();
1446
       this.getSchedualPatientList();
1446
       this.getSchedualPatientList();
1447
       this.getTemplateInfo();
1447
       this.getTemplateInfo();

+ 12 - 13
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue Просмотреть файл

213
                 </template>
213
                 </template>
214
               </el-table-column>
214
               </el-table-column>
215
 
215
 
216
-              <!--<el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
217
-              <!--<template slot-scope="scope">-->
218
-              <!--<span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>-->
219
-              <!--</template>-->
220
-              <!--</el-table-column>-->
216
+              <el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
217
+              <template slot-scope="scope">
218
+              <span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>
219
+              </template>
220
+             </el-table-column>
221
             </el-table>
221
             </el-table>
222
           </el-col>
222
           </el-col>
223
         </el-row>
223
         </el-row>
538
             </el-form-item>
538
             </el-form-item>
539
           </el-col>
539
           </el-col>
540
         </el-row>
540
         </el-row>
541
-        <!--<el-row>-->
542
-        <!--<el-col :span="12">-->
543
-        <!--<el-form-item label="医嘱嘱托 :" prop="delivery_way">-->
544
-        <!--<el-input v-model="nameForm.remark"></el-input>-->
545
-        <!--</el-form-item>-->
546
-        <!--</el-col>-->
547
-
548
-        <!--</el-row>-->
541
+       <el-row>
542
+       <el-col :span="12">
543
+      <el-form-item label="医嘱嘱托 :" prop="delivery_way">
544
+     <el-input v-model="nameForm.remark"></el-input>
545
+      </el-form-item>
546
+      </el-col>
547
+    </el-row>
549
       </el-form>
548
       </el-form>
550
       <div slot="footer" class="dialog-footer">
549
       <div slot="footer" class="dialog-footer">
551
         <el-button @click="nameFormVisible = false">取消</el-button>
550
         <el-button @click="nameFormVisible = false">取消</el-button>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue Просмотреть файл

190
                 align="center"
190
                 align="center"
191
               >
191
               >
192
                 <template slot-scope="scope">
192
                 <template slot-scope="scope">
193
-                  <span v-if="scope.row.parent_row == 0">{{
193
+                  <span>{{
194
                     scope.row.remark
194
                     scope.row.remark
195
                   }}</span>
195
                   }}</span>
196
                 </template>
196
                 </template>

+ 56 - 4
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Просмотреть файл

1647
 
1647
 
1648
       },
1648
       },
1649
       showInnerDialog: function(val) {
1649
       showInnerDialog: function(val) {
1650
+       
1650
         this.InnerDialogProps.visibility = true
1651
         this.InnerDialogProps.visibility = true
1651
         switch (val) {
1652
         switch (val) {
1652
           case '5': // 透析器/灌流器
1653
           case '5': // 透析器/灌流器
1654
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
1655
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
1655
             this.InnerDialogProps.titles = '透析器/灌流器'
1656
             this.InnerDialogProps.titles = '透析器/灌流器'
1656
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
1657
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
1657
-
1658
+           
1658
             this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
1659
             this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
1659
             this.InnerDialogProps.isShowTextArea = false
1660
             this.InnerDialogProps.isShowTextArea = false
1660
             break
1661
             break
1716
         }
1717
         }
1717
       },
1718
       },
1718
       innerDialogComfirm: function(val) {
1719
       innerDialogComfirm: function(val) {
1720
+      
1721
+
1719
         this.InnerDialogProps.visibility = false
1722
         this.InnerDialogProps.visibility = false
1720
         switch (val.type) {
1723
         switch (val.type) {
1724
+
1721
           case 'dialyzer_perfusion_apparatus':
1725
           case 'dialyzer_perfusion_apparatus':
1722
-            this.dialysisPrescription.dialyzer_perfusion_apparatus = val.value.join(',')
1726
+            var newArr = []
1727
+            if(this.dialyzerPerfusionApparatus!=null && this.dialyzerPerfusionApparatus.length>0){
1728
+              for(let i=0;i<this.dialyzerPerfusionApparatus.length;i++){
1729
+                for(let j=0;j<val.value.length;j++){
1730
+                   if(this.dialyzerPerfusionApparatus[i].name == val.value[j]){
1731
+                     newArr.push(val.value[j])
1732
+                   }
1733
+                }
1734
+              }
1735
+            } 
1736
+            if(newArr!=null && newArr.length>0){
1737
+              
1738
+              this.dialysisPrescription.dialyzer_perfusion_apparatus = newArr.join(',')
1739
+            }else{
1740
+              this.dialysisPrescription.dialyzer_perfusion_apparatus = ""
1741
+            }
1742
+           
1723
             break
1743
             break
1724
           case 'blood':
1744
           case 'blood':
1745
+            
1725
             this.dialysisPrescription.blood = val.value.join(',')
1746
             this.dialysisPrescription.blood = val.value.join(',')
1726
             break
1747
             break
1727
           case 'dialyzers':
1748
           case 'dialyzers':
1728
-            this.dialysisPrescription.dialysis_dialyszers = val.value.join(',')
1749
+            
1750
+            var newArr = []
1751
+            if(this.dialyzers!=null && this.dialyzers.length >0){
1752
+              for(let i=0;i<this.dialyzers.length;i++){
1753
+                for(let j=0;j<val.value.length;j++){
1754
+                  if(this.dialyzers[i].specification_name == val.value[j]){
1755
+                      newArr.push(val.value[j])
1756
+                  }
1757
+                }
1758
+              }
1759
+            }
1760
+            if(newArr!=null && newArr.length >0){
1761
+             this.dialysisPrescription.dialysis_dialyszers = newArr.join(',')
1762
+            }else{
1763
+              this.dialysisPrescription.dialysis_dialyszers = ""
1764
+            }
1765
+            
1729
             break
1766
             break
1730
           case 'irrigations':
1767
           case 'irrigations':
1731
-            this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
1768
+            var newArr = []
1769
+            if(this.irrigations!=null && this.irrigations.length >0){
1770
+              for(let i=0;i<this.irrigations.length;i++){
1771
+                for(let j=0;j<val.value.length;j++){
1772
+                  if(this.irrigations[i].specification_name == val.value[j]){
1773
+                     newArr.push(val.value[j])
1774
+                  }
1775
+                }
1776
+              }
1777
+            }
1778
+            if(newArr!=null && newArr.length>0){
1779
+             this.dialysisPrescription.dialysis_irrigation = newArr.join(',')
1780
+            }else{
1781
+              this.dialysisPrescription.dialysis_irrigation = ""
1782
+            }
1783
+            
1732
             break
1784
             break
1733
           case 'plasma_separator':
1785
           case 'plasma_separator':
1734
             this.dialysisPrescription.plasma_separator = val.value.join(',')
1786
             this.dialysisPrescription.plasma_separator = val.value.join(',')

+ 6 - 6
src/xt_pages/user/components/PatientForm.vue Просмотреть файл

255
                 </el-form-item>
255
                 </el-form-item>
256
               </el-col>
256
               </el-col>
257
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
257
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
258
-                <el-form-item label="家属电话 : " prop="homeTelephone">
258
+                <el-form-item label="家属电话 : " prop="homeTelephone"  class="is-required">
259
                   <el-input
259
                   <el-input
260
                     v-model="form.homeTelephone"
260
                     v-model="form.homeTelephone"
261
                     maxlength="20"
261
                     maxlength="20"
441
               </el-col>
441
               </el-col>
442
 
442
 
443
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
443
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
444
-                <el-form-item label="家庭住址 : " prop="homeAddress">
444
+                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
445
                   <el-input v-model="form.homeAddress"></el-input>
445
                   <el-input v-model="form.homeAddress"></el-input>
446
                 </el-form-item>
446
                 </el-form-item>
447
               </el-col>
447
               </el-col>
1336
         age: [{ required: true, message: "请填写年龄", trigger: "blur" }],
1336
         age: [{ required: true, message: "请填写年龄", trigger: "blur" }],
1337
         firstDialysisDate: [
1337
         firstDialysisDate: [
1338
           { required: true, message: "请选择日期", trigger: "blur" }
1338
           { required: true, message: "请选择日期", trigger: "blur" }
1339
-        ]
1340
-
1341
-        // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
1342
-        // homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
1339
+        ],
1340
+      
1341
+        homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
1342
+        homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
1343
       },
1343
       },
1344
       adminUserOptions:[],
1344
       adminUserOptions:[],
1345
     };
1345
     };

+ 1 - 1
src/xt_pages/user/firstDisease.vue Просмотреть файл

514
        this.getlist()
514
        this.getlist()
515
       },
515
       },
516
       print(){
516
       print(){
517
-        this.$router.push({path:"/patient/patient/hospitalSummary/print?id="+this.form.id+"&patient_id="+this.patient_id})
517
+        this.$router.push({path:"/patient/patient/firstDisease/print?id="+this.form.id+"&patient_id="+this.patient_id})
518
       },
518
       },
519
       tableRow(){
519
       tableRow(){
520
 
520
 

+ 24 - 12
src/xt_pages/user/vascularAccess.vue Просмотреть файл

9
       <el-table class="oictable" :data="tableData" border style="width:100%">
9
       <el-table class="oictable" :data="tableData" border style="width:100%">
10
       <el-table-column prop="start_time" label="建立日期" width="100" align="center">
10
       <el-table-column prop="start_time" label="建立日期" width="100" align="center">
11
           <template slot-scope="scope">
11
           <template slot-scope="scope">
12
-            <span>{{ getTime(scope.row.start_time, "{y}-{m}-{d}")}}</span>
12
+            <span>{{ getTime(scope.row.start_time)}}</span>
13
           </template>
13
           </template>
14
      </el-table-column>
14
      </el-table-column>
15
       <el-table-column prop="blood_access_part_opera_id" label="血管通路" align="center" width="120">
15
       <el-table-column prop="blood_access_part_opera_id" label="血管通路" align="center" width="120">
34
       </el-table-column>
34
       </el-table-column>
35
       <el-table-column prop="date" label="首次启用日期" width="120" align="center">
35
       <el-table-column prop="date" label="首次启用日期" width="120" align="center">
36
           <template slot-scope="scope">
36
           <template slot-scope="scope">
37
-            <span>{{ getTime(scope.row.first_start_time, "{y}-{m}-{d}")}}</span>
37
+            <span>{{ getTime(scope.row.first_start_time)}}</span>
38
           </template>
38
           </template>
39
       </el-table-column>
39
       </el-table-column>
40
      
40
      
41
        <el-table-column prop="date" label="停用日期" align="center" width="100">
41
        <el-table-column prop="date" label="停用日期" align="center" width="100">
42
           <template slot-scope="scope">
42
           <template slot-scope="scope">
43
-            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time, "{y}-{m}-{d}")}}</span>
43
+            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time)}}</span>
44
              <span v-if="scope.row.stop_time<0"></span>
44
              <span v-if="scope.row.stop_time<0"></span>
45
           </template>
45
           </template>
46
       </el-table-column>
46
       </el-table-column>
673
            }  
673
            }  
674
         })   
674
         })   
675
       },
675
       },
676
-     getTime(value, temp) {
677
-        if (value != undefined) {
678
-            return uParseTime(value, temp);
679
-        }
680
-        return "";
681
-     },
676
+   //   getTime(value, temp) {
677
+        
678
+   //      if (value != undefined) {
679
+   //          return uParseTime(value, temp);
680
+   //      }
681
+
682
+   //      return "";
683
+   //   },
684
+     getTime(val) {
685
+         if(val < 0){
686
+           return ""
687
+         }
688
+         if(val == ""){
689
+          return ""
690
+         }else {
691
+          return uParseTime(val, '{y}-{m}-{d}')
692
+         }
693
+      },
682
      handleUpdateAdviceTemplate(id){
694
      handleUpdateAdviceTemplate(id){
683
         getVascularAccessByDetail(id).then(response=>{
695
         getVascularAccessByDetail(id).then(response=>{
684
            if(response.data.state ==1){
696
            if(response.data.state ==1){
739
               }
751
               }
740
              this.form.blood_access_part_opera_id = blood_part
752
              this.form.blood_access_part_opera_id = blood_part
741
 
753
 
742
-             this.form.first_start_time = this.getTime(accessDetail.first_start_time,"{y}-{m}-{d}")
754
+             this.form.first_start_time = this.getTime(accessDetail.first_start_time)
743
 
755
 
744
              var inflow_id = 0
756
              var inflow_id = 0
745
              for(let i=0;i<this.optionsPass.length;i++){
757
              for(let i=0;i<this.optionsPass.length;i++){
749
              }
761
              }
750
              this.form.inflow_pass = inflow_id
762
              this.form.inflow_pass = inflow_id
751
              this.form.remark = accessDetail.remark
763
              this.form.remark = accessDetail.remark
752
-             this.form.start_time = this.getTime(accessDetail.start_time,"{y}-{m}-{d}")
764
+             this.form.start_time = this.getTime(accessDetail.start_time)
753
              this.form.stop_reason = accessDetail.stop_reason
765
              this.form.stop_reason = accessDetail.stop_reason
754
-             this.form.stop_time = this.getTime(accessDetail.stop_time,"{y}-{m}-{d}")
766
+             this.form.stop_time = this.getTime(accessDetail.stop_time)
755
  
767
  
756
              this.form.user_status = accessDetail.user_status
768
              this.form.user_status = accessDetail.user_status
757
              this.form.other_vascular = accessDetail.other_vascular
769
              this.form.other_vascular = accessDetail.other_vascular