Kaynağa Gözat

518合并代码

XMLWAN 2 yıl önce
ebeveyn
işleme
80808da60b

+ 8 - 0
src/api/config.js Dosyayı Görüntüle

@@ -186,3 +186,11 @@ export function changeStockSetting(params) {
186 186
     params: params
187 187
   })
188 188
 }
189
+
190
+export function changeAdviceConfig(params) {
191
+  return request({
192
+    url: '/api/changeadviceconfig',
193
+    method: 'get',
194
+    params: params
195
+  })
196
+}

+ 0 - 8
src/api/his/his.js Dosyayı Görüntüle

@@ -17,7 +17,6 @@ export function getPatientInfo(params) {
17 17
 }
18 18
 
19 19
 export function createCaseHistory(params) {
20
-  console.log('params', params)
21 20
   return request({
22 21
     url: '/api/doctorworkstation/casehistory/create',
23 22
     method: 'get',
@@ -630,8 +629,6 @@ export function getHisHospitalDetailInfo(params) {
630 629
   })
631 630
 }
632 631
 
633
-
634
-
635 632
 export function getMonthHisHospitalDetailInfo(params) {
636 633
   return request({
637 634
     url: '/api/monthhospitaldetail/get',
@@ -640,8 +637,6 @@ export function getMonthHisHospitalDetailInfo(params) {
640 637
   })
641 638
 }
642 639
 
643
-
644
-
645 640
 export function getYidiClearRecord(params) {
646 641
   return request({
647 642
     url: '/api/his/getyidiclear',
@@ -658,6 +653,3 @@ export function getBatchPrint(params) {
658 653
   })
659 654
 }
660 655
 
661
-
662
-
663
-

+ 28 - 8
src/xt_pages/data/basicConfig.vue Dosyayı Görüntüle

@@ -23,6 +23,8 @@
23 23
           <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方同步到透析医嘱后,同一个患者,门诊医生站开的药品类处方自动同步到透析管理临时医嘱中,同时在透析管理中,给患者开长期医嘱和临时医嘱的功能失效,医生只能在门诊医生站开处方,只有同时使用门诊管理和透析管理的机构方可开启。</p>
24 24
           <p style="margin-top:20px;">门诊处方同步到透析医嘱:
25 25
           <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
26
+          <p style="margin-top:20px;">门诊处方和临时医嘱同步到透析医嘱:
27
+          <el-switch v-model="is_open_advice_xt_his" @change="changeFuncSix"></el-switch>
26 28
           </p>
27 29
         </div>
28 30
 
@@ -90,7 +92,7 @@
90 92
 
91 93
 <script>
92 94
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
93
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting} from '@/api/config'
95
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig} from '@/api/config'
94 96
 
95 97
 export default {
96 98
   name: "printTemplate",
@@ -109,6 +111,7 @@ export default {
109 111
       is_open_print:false,
110 112
       is_open_xt_his_project: false,
111 113
       is_open_is_type:false,
114
+      is_open_advice_xt_his:false,
112 115
     };
113 116
   },
114 117
   methods: {
@@ -136,6 +139,12 @@ export default {
136 139
               this.is_open_is_type = false
137 140
             }
138 141
 
142
+            if(response.data.data.is_open_advice == 1){
143
+              this.is_open_advice_xt_his = true
144
+            }else{
145
+              this.is_open_advice_xt_his = false
146
+            }
147
+
139 148
           } else {
140 149
             this.$message.error(response.data.msg)
141 150
           }
@@ -205,10 +214,7 @@ export default {
205 214
         )
206 215
       }
207 216
     },
208
-
209
-
210 217
     changeFuncTwo(){
211
-      console.log("3333333",this.is_open_monitor)
212 218
       var is_open = 0
213 219
       if(this.is_open_monitor == true){
214 220
           is_open = 1
@@ -219,7 +225,6 @@ export default {
219 225
       let params = {
220 226
          is_open:is_open,
221 227
        }
222
-     console.log("params",params)
223 228
       postMonitorIsOpen(params).then(response=>{
224 229
          if(response.data.state == 1){
225 230
             var config = response.data.data.config
@@ -232,7 +237,6 @@ export default {
232 237
       getMonitorConfig().then(response=>{
233 238
          if(response.data.state == 1){
234 239
            var config =  response.data.data.config
235
-           console.log("config",config)
236 240
            if (config.is_open == 1) {
237 241
               this.is_open_monitor = true
238 242
            }
@@ -277,7 +281,6 @@ export default {
277 281
     },
278 282
 
279 283
     changeFuncPrint(val){
280
-      console.log("val22222",val)
281 284
       var is_open  = 0
282 285
       if(val == true){
283 286
          is_open = 1
@@ -302,7 +305,6 @@ export default {
302 305
       getDataPrintList().then(response=>{
303 306
          if(response.data.state ==1){
304 307
            var dataPrint = response.data.data.dataPrint
305
-           console.log("列表数据",dataPrint)
306 308
            if(dataPrint.is_open == 1){
307 309
               this.is_open_print = true
308 310
            }
@@ -328,6 +330,24 @@ export default {
328 330
            this.$message.success("保存成功!")
329 331
         }
330 332
       })
333
+    },
334
+    changeFuncSix(){
335
+      var is_advice_open = 2
336
+      if(this.is_open_advice_xt_his == false){
337
+        is_advice_open = 2
338
+      }
339
+      if(this.is_open_advice_xt_his == true){
340
+        is_advice_open = 1
341
+      }
342
+      var params = {
343
+        is_advice_open:is_advice_open,
344
+      }
345
+      changeAdviceConfig(params).then(response=>{
346
+         if(response.data.state == 1){
347
+          var msg =  response.data.data.msg
348
+          this.$message.success("保存成功!")
349
+         }
350
+      })
331 351
     }
332 352
 
333 353
   },

+ 23 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Dosyayı Görüntüle

@@ -1135,6 +1135,7 @@
1135 1135
                             执行人签名
1136 1136
                           </td>
1137 1137
                           <td style="font-size: 16px" width="10%">时间</td>
1138
+                          <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对者</td>
1138 1139
                         </tr>
1139 1140
                         <!-- <template v-for="group in doctor_advices" > -->
1140 1141
                         <tr
@@ -1238,6 +1239,28 @@
1238 1239
                               getTime(advice[0].execution_time, " {h}:{i}")
1239 1240
                             }}</span>
1240 1241
                           </td>
1242
+
1243
+                          <td height="35px" v-if="org_id == 10223">
1244
+                            <span
1245
+                              v-if="
1246
+                                setAdminUserES(advice[0], 'checker') ==
1247
+                                  ''
1248
+                              "
1249
+                              >{{
1250
+                                getAdminUser(advice[0], "checker")
1251
+                              }}</span
1252
+                            >
1253
+                            <img
1254
+                              class="es-img"
1255
+                              :src="
1256
+                                setAdminUserES(advice[0], 'checker')
1257
+                              "
1258
+                              alt=""
1259
+                              srcset=""
1260
+                              v-else
1261
+                              style="height: 40px;"
1262
+                            />
1263
+                          </td>
1241 1264
                         </tr>
1242 1265
                         <!-- </template> -->
1243 1266
                       </tbody>

+ 18 - 0
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Dosyayı Görüntüle

@@ -687,6 +687,18 @@
687 687
             </template>
688 688
           </el-table-column>
689 689
 
690
+          <el-table-column
691
+            prop="heparin"
692
+            align="center"
693
+            label="血容量(L)"
694
+            width="140"
695
+            v-if="isShow('血容量')"
696
+          >
697
+            <template slot-scope="scope">
698
+              {{ scope.row.accumulated_blood_volume }}
699
+            </template>
700
+          </el-table-column>
701
+
690 702
           <el-table-column
691 703
             prop="heparin"
692 704
             align="center"
@@ -1312,6 +1324,12 @@
1312 1324
             </el-form-item>
1313 1325
           </el-col>
1314 1326
 
1327
+          <el-col :span="8" v-if="isShow('血容量')">
1328
+            <el-form-item label="血容量(L):">
1329
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
1330
+            </el-form-item>
1331
+          </el-col>
1332
+
1315 1333
           <el-col :span="8" v-if="isShow('血温监测')">
1316 1334
             <el-form-item label="血温监测">
1317 1335
               <el-input v-model="form.blood_temperature"></el-input>

+ 2 - 0
src/xt_pages/dialysis/details/dialysisMonitoring.vue Dosyayı Görüntüle

@@ -33,6 +33,7 @@
33 33
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
34 34
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
35 35
           <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
36
+          <th v-if="isShow('血容量')" width="92px">血容量(ml)</th>
36 37
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
37 38
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
38 39
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>
@@ -80,6 +81,7 @@
80 81
             <span v-if="monitor.monitor_anticoagulant_value!=''">({{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }})</span>
81 82
           </td>
82 83
           <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
84
+          <th v-if="isShow('血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
83 85
           <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
84 86
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
85 87
           <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>

+ 5 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Dosyayı Görüntüle

@@ -667,6 +667,7 @@
667 667
                         <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
668 668
                         <td style="font-size: 16px" width="10%">执行人签名</td>
669 669
                         <td style="font-size: 16px" width="10%">时间</td>
670
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对护士</td>
670 671
                       </tr>
671 672
                       <!-- <template v-for="group in doctor_advices" > -->
672 673
 
@@ -708,6 +709,10 @@
708 709
                         <td height="32px">
709 710
                           <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
710 711
                         </td>
712
+                        <td height="32px" v-if="org_id == 10223">
713
+                          <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker) }}</span>
714
+                          <img style="height:30px" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else />
715
+                        </td>
711 716
                       </tr>
712 717
                       <!-- </template> -->
713 718
                     </tbody>

+ 97 - 16
src/xt_pages/hospitalStation/components/deskRecord.vue Dosyayı Görüntüle

@@ -11,16 +11,16 @@
11 11
     <div class="mainTitle">基本信息:</div>
12 12
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
13 13
       <el-form-item label="姓名:" prop="name">
14
-        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
14
+        <el-input v-model="patientInfo.name" placeholder="姓名" :disabled="true"></el-input>
15 15
       </el-form-item>
16 16
       <el-form-item label="性别: " prop="name">
17
-        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
17
+        <el-input v-model="patientInfo.gender" placeholder="性别" :disabled="true"></el-input>
18 18
       </el-form-item>
19 19
       <el-form-item label="年龄: " prop="name">
20
-        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
20
+        <el-input v-model="patientInfo.age" placeholder="年龄" :disabled="true"></el-input>
21 21
       </el-form-item>
22 22
       <el-form-item label="证件号:" prop="name">
23
-        <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
23
+        <el-input v-model="patientInfo.id_card_no" placeholder="证件号" :disabled="true"></el-input>
24 24
       </el-form-item>
25 25
       <el-form-item label="出生日期: " prop="name">
26 26
         <el-date-picker
@@ -32,7 +32,7 @@
32 32
         </el-date-picker>
33 33
       </el-form-item>
34 34
       <el-form-item label="联系电话: " prop="name">
35
-        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
35
+        <el-input v-model="patientInfo.phone" placeholder="联系电话" :disabled="true"></el-input>
36 36
       </el-form-item>
37 37
       <el-form-item label="医保类型: " prop="name">
38 38
         <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
@@ -45,33 +45,79 @@
45 45
         </el-select>
46 46
       </el-form-item>
47 47
       <el-form-item label="医保证号: " prop="name">
48
-        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
48
+        <el-input v-model="patientInfo.health_care_no" placeholder="医保证号" :disabled="true"></el-input>
49 49
       </el-form-item>
50 50
       <el-form-item label="家庭住址: " prop="name">
51
-        <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
51
+        <el-input v-model="patientInfo.home_address" placeholder="家庭住址" :disabled="true"></el-input>
52 52
       </el-form-item>
53
-      <el-form-item label="过敏史: " prop="name">
54
-        <el-input v-model="allergic_history" placeholder=""></el-input>
53
+      <el-form-item label="药物过敏史: " prop="name">
54
+        <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
55 55
       </el-form-item>
56
+<!-- 
57
+  <el-form-item label="初始透析日期: " prop="name">
58
+         <el-date-picker
59
+          :disabled="true"
60
+          style="width:100%;"
61
+          v-model="first_dialysis_date"
62
+          type="date"
63
+          placeholder="选择日期">
64
+        </el-date-picker>
65
+      </el-form-item>
66
+
67
+      <el-form-item label="工作单位: " prop="name">
68
+         <el-input v-model="patientInfo.work_unit" placeholder="工作单位"  :disabled="true"></el-input>
69
+      </el-form-item>
70
+
71
+      <el-form-item label="原发病: " prop="name">
72
+        <el-input v-model="primary_disease" placeholder="原发病"></el-input>
73
+      </el-form-item>
74
+      
75
+  
76
+
77
+      <el-form-item label="确诊肾衰日期: " prop="name">
78
+         <el-date-picker
79
+          format="yyyy-MM-dd"
80
+          value-format="yyyy-MM-dd"
81
+          style="width:100%;"
82
+          v-model="confirm_failure_date"
83
+          type="date"
84
+          placeholder="选择日期">
85
+        </el-date-picker>
86
+      </el-form-item>
87
+     
88
+
89
+
90
+      <el-form-item label="体格检查: " prop="name">
91
+        <el-input v-model="physical_examination" placeholder="体格检查"></el-input>
92
+      </el-form-item>
93
+
94
+       <el-form-item label="专科检查: " prop="name">
95
+        <el-input v-model="special_inspection" placeholder="专科检查"></el-input>
96
+      </el-form-item>
97
+
98
+      <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
99
+        <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
100
+      </el-form-item> -->
101
+
56 102
     </el-form>
57 103
     <div class="mainTitle">体格信息:</div>
58 104
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
59 105
       <el-form-item label="体温:" prop="temperature">
60
-        <el-input v-model="case_history.temperature" placeholder=""></el-input>
106
+        <el-input v-model="case_history.temperature" placeholder="体温"></el-input>
61 107
         <span>℃</span>
62 108
       </el-form-item>
63 109
       <el-form-item label="脉搏: " prop="pulse">
64
-        <el-input v-model="case_history.pulse" placeholder=""></el-input>
110
+        <el-input v-model="case_history.pulse" placeholder="脉搏"></el-input>
65 111
         (次/分)
66 112
       </el-form-item>
67 113
       <el-form-item label="呼吸: " prop="breathing">
68
-        <el-input v-model="case_history.breathing" placeholder=""></el-input>
114
+        <el-input v-model="case_history.breathing" placeholder="呼吸"></el-input>
69 115
         (次/分)
70 116
       </el-form-item>
71 117
       <el-form-item label="血压:" prop="name">
72
-        <el-input v-model="case_history.sbp" placeholder=""></el-input>
118
+        <el-input v-model="case_history.sbp" placeholder="血压"></el-input>
73 119
         /
74
-        <el-input v-model="case_history.dbp" placeholder=""></el-input>
120
+        <el-input v-model="case_history.dbp" placeholder="血压"></el-input>
75 121
         mmHg
76 122
       </el-form-item>
77 123
     </el-form>
@@ -314,6 +360,14 @@
314 360
         diagnoses:[],
315 361
         sick:[],
316 362
         allergic_history:"",
363
+        primary_disease:"",
364
+        confirm_failure_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
365
+        drug_allergy_history:"",
366
+        start_dialysis_date:"",
367
+        physical_examination:"",
368
+        special_inspection:"",
369
+        lab_apparatus:"",
370
+        first_dialysis_date:"",
317 371
         form:{
318 372
           id:0,
319 373
         },
@@ -371,6 +425,12 @@
371 425
             "diagnose":this.case_history.diagnose,
372 426
             "allergic_history":this.allergic_history,
373 427
             "id":this.form.id,
428
+            "primary_disease":this.primary_disease,
429
+            "confirm_failure_date":this.confirm_failure_date,
430
+            "drug_allergy_history":this.drug_allergy_history,
431
+            "physical_examination":this.physical_examination,
432
+            "special_inspection":this.special_inspection,
433
+            "lab_apparatus":this.lab_apparatus,
374 434
           };
375 435
           console.log("prams222",params);
376 436
           createCaseHistory(params).then(response => {
@@ -381,6 +441,14 @@
381 441
             } else {
382 442
               var caseHistory = response.data.data.caseHistory;
383 443
               console.log("caseHistory",caseHistory);
444
+              
445
+              this.primary_disease = caseHistory.primary_disease
446
+              this.confirm_failure_date = this.getTime(caseHistory.confirm_failure_date)
447
+              this.drug_allergy_history = caseHistory.drug_allergy_history
448
+              this.physical_examination = caseHistory.physical_examination
449
+              this.special_inspection = caseHistory.special_inspection
450
+              this.lab_apparatus = caseHistory.lab_apparatus
451
+
384 452
               this.$message.success("保存成功");
385 453
               this.doctor_advice = "";
386 454
               this.remark = "";
@@ -538,16 +606,22 @@
538 606
       },
539 607
     },
540 608
     created(){
609
+     
541 610
        this.getlist();
542 611
        this.getInitData();
543 612
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
544
-       console.log("232322323",this);
613
+       console.log("232322323",this.case_history);
545 614
        if(this.patientInfo.gender = 1){
546 615
          this.patientInfo.gender = '男'
547 616
        }else if(this.patientInfo.gender = 2){
548 617
           this.patientInfo.gender = '女'
549 618
         }
550
-
619
+      this.primary_disease = this.case_history.primary_disease
620
+      this.confirm_failure_date = this.case_history.confirm_failure_date
621
+      this.drug_allergy_history = this.case_history.drug_allergy_history
622
+      this.physical_examination = this.case_history.physical_examination
623
+      this.special_inspection = this.case_history.special_inspection
624
+      this.lab_apparatus = this.case_history.lab_apparatus
551 625
     },
552 626
     watch:{
553 627
       detalid:function(val){
@@ -579,7 +653,14 @@
579 653
           }
580 654
           this.form.id = this.case_history.id;
581 655
           this.allergic_history = this.case_history.allergic_history;
656
+          this.primary_disease = this.case_history.primary_disease
657
+          this.confirm_failure_date = this.case_history.confirm_failure_date
658
+          this.drug_allergy_history = this.case_history.drug_allergy_history
659
+          this.physical_examination = this.case_history.physical_examination
660
+          this.special_inspection = this.case_history.special_inspection
661
+          this.lab_apparatus = this.case_history.lab_apparatus
582 662
           this.watchSign++
663
+
583 664
         },
584 665
         deep:true
585 666
       },

+ 65 - 6
src/xt_pages/hospitalStation/doctorDesk.vue Dosyayı Görüntüle

@@ -14,7 +14,6 @@
14 14
                         :editable="false"
15 15
                         style="width: 100%;"
16 16
                         type="date"
17
-                        :picker-options="pickerOptions"
18 17
                         placeholder="选择开始时间"
19 18
                         align="right"
20 19
                         format="yyyy-MM-dd"
@@ -1102,6 +1101,7 @@
1102 1101
             this.patientInfo = response.data.data.xt_info
1103 1102
             this.hisPatientInfo = response.data.data.his_info
1104 1103
             this.case_history = response.data.data.case_history
1104
+            console.log("电子比你2333223232323232323232323",this.case_history)
1105 1105
             this.info = response.data.data.info
1106 1106
             this.last_info = response.data.data.last_info
1107 1107
             this.schedule = response.data.data.schedule
@@ -1157,7 +1157,15 @@
1157 1157
             } else {
1158 1158
               this.case_history.is_infect = false
1159 1159
             }
1160
-
1160
+            
1161
+            this.case_history.primary_disease = this.case_history.primary_disease
1162
+            this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
1163
+            this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
1164
+            this.case_history.physical_examination = this.case_history.physical_examination
1165
+            this.case_history.special_inspection = this.case_history.special_inspection
1166
+            this.case_history.lab_apparatus = this.case_history.lab_apparatus
1167
+         
1168
+          
1161 1169
             //处方相关
1162 1170
             this.prescriptionList = response.data.data.prescription
1163 1171
 
@@ -1557,6 +1565,14 @@
1557 1565
                   } else {
1558 1566
                     this.case_history.is_infect = false
1559 1567
                   }
1568
+
1569
+                  this.case_history.primary_disease = this.case_history.primary_disease
1570
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
1571
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
1572
+                  this.case_history.physical_examination = this.case_history.physical_examination
1573
+                  this.case_history.special_inspection = this.case_history.special_inspection
1574
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
1575
+                
1560 1576
                   this.prescriptionList = response.data.data.prescription
1561 1577
 
1562 1578
                   if (response.data.data.prescription.length > 0) {
@@ -2034,6 +2050,13 @@
2034 2050
                   } else {
2035 2051
                     this.case_history.is_infect = false
2036 2052
                   }
2053
+
2054
+                   this.case_history.primary_disease = this.case_history.primary_disease
2055
+                   this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
2056
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
2057
+                   this.case_history.physical_examination = this.case_history.physical_examination
2058
+                   this.case_history.special_inspection = this.case_history.special_inspection
2059
+                   this.case_history.lab_apparatus = this.case_history.lab_apparatus
2037 2060
                   this.prescriptionList = response.data.data.prescription
2038 2061
 
2039 2062
                   if (response.data.data.prescription.length > 0) {
@@ -2491,6 +2514,12 @@
2491 2514
                 } else {
2492 2515
                   this.case_history.is_infect = false
2493 2516
                 }
2517
+                this.case_history.primary_disease = this.case_history.primary_disease
2518
+                this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
2519
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
2520
+                this.case_history.physical_examination = this.case_history.physical_examination
2521
+                this.case_history.special_inspection = this.case_history.special_inspection
2522
+                this.case_history.lab_apparatus = this.case_history.lab_apparatus
2494 2523
                 this.prescriptionList = response.data.data.prescription
2495 2524
 
2496 2525
                 if (response.data.data.prescription.length > 0) {
@@ -3007,7 +3036,13 @@
3007 3036
                   } else {
3008 3037
                     this.case_history.is_infect = false
3009 3038
                   }
3010
-                  this.prescriptionList = response.data.data.prescription
3039
+                   this.case_history.primary_disease = this.case_history.primary_disease
3040
+                    this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
3041
+                    this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
3042
+                    this.case_history.physical_examination = this.case_history.physical_examination
3043
+                    this.case_history.special_inspection = this.case_history.special_inspection
3044
+                    this.case_history.lab_apparatus = this.case_history.lab_apparatus
3045
+                 this.prescriptionList = response.data.data.prescription
3011 3046
 
3012 3047
                   if (response.data.data.prescription.length > 0) {
3013 3048
                     for (let i = 0; i < response.data.data.prescription.length; i++) {
@@ -3340,6 +3375,12 @@
3340 3375
                     this.case_history.sick_type = ''
3341 3376
                   }
3342 3377
                   this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
3378
+                  this.case_history.primary_disease = this.case_history.primary_disease
3379
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
3380
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
3381
+                  this.case_history.physical_examination = this.case_history.physical_examination
3382
+                  this.case_history.special_inspection = this.case_history.special_inspection
3383
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
3343 3384
                   if (this.case_history.is_infect == 1) {
3344 3385
                     this.case_history.is_infect = true
3345 3386
                   } else {
@@ -3440,7 +3481,12 @@
3440 3481
                     this.case_history.is_infect = false
3441 3482
                   }
3442 3483
                   this.prescriptionList = response.data.data.prescription
3443
-
3484
+                  this.case_history.primary_disease = this.case_history.primary_disease
3485
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
3486
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
3487
+                  this.case_history.physical_examination = this.case_history.physical_examination
3488
+                  this.case_history.special_inspection = this.case_history.special_inspection
3489
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
3444 3490
                   if (response.data.data.prescription.length > 0) {
3445 3491
                     for (let i = 0; i < response.data.data.prescription.length; i++) {
3446 3492
                       var prescription = response.data.data.prescription[i]
@@ -3768,6 +3814,12 @@
3768 3814
                     this.case_history.sick_type = ''
3769 3815
                   }
3770 3816
                   this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
3817
+                  this.case_history.primary_disease = this.case_history.primary_disease
3818
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
3819
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
3820
+                  this.case_history.physical_examination = this.case_history.physical_examination
3821
+                  this.case_history.special_inspection = this.case_history.special_inspection
3822
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
3771 3823
                   if (this.case_history.is_infect == 1) {
3772 3824
                     this.case_history.is_infect = true
3773 3825
                   } else {
@@ -3938,7 +3990,9 @@
3938 3990
         }
3939 3991
       },
3940 3992
       handleClick() {
3941
-        if (this.titleType == '电子处方') {
3993
+        console.log("hhahdf adf adf ",this.titleType)
3994
+         console.log("radio ",this.radio)
3995
+        if (this.titleType == '电子处方' || this.titleType == "电子病历") {
3942 3996
           if (this.radio == 1) {
3943 3997
             this.un_cure_data.map(item => {
3944 3998
               if (item.id == this.patientid) {
@@ -3959,7 +4013,6 @@
3959 4013
             })
3960 4014
           }
3961 4015
         }
3962
-
3963 4016
       },
3964 4017
       savePrint() {
3965 4018
         //处方
@@ -4134,6 +4187,12 @@
4134 4187
             }
4135 4188
 
4136 4189
             this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
4190
+            this.case_history.primary_disease = this.case_history.primary_disease
4191
+            this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
4192
+            this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
4193
+            this.case_history.physical_examination = this.case_history.physical_examination
4194
+            this.case_history.special_inspection = this.case_history.special_inspection
4195
+            this.case_history.lab_apparatus = this.case_history.lab_apparatus
4137 4196
             if (this.case_history.is_infect == 1) {
4138 4197
               this.case_history.is_infect = true
4139 4198
             } else {

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Dosyayı Görüntüle

@@ -3023,7 +3023,7 @@
3023 3023
                    good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
3024 3024
                 }
3025 3025
               }
3026
-               console.log("耗材列表2323232322332",good_info)
3026
+               
3027 3027
               let obj = {
3028 3028
                 id: good_info[i].id,
3029 3029
                 project_name: good_info[i].good_name,

+ 94 - 35
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue Dosyayı Görüntüle

@@ -11,13 +11,13 @@
11 11
     <div class="mainTitle">基本信息:</div>
12 12
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
13 13
       <el-form-item label="姓名:" prop="name">
14
-        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
14
+        <el-input v-model="patientInfo.name" placeholder="姓名" :disabled="true"></el-input>
15 15
       </el-form-item>
16 16
       <el-form-item label="性别: " prop="name">
17
-        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
17
+        <el-input v-model="patientInfo.gender" placeholder="性别" :disabled="true"></el-input>
18 18
       </el-form-item>
19 19
       <el-form-item label="年龄: " prop="name">
20
-        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
20
+        <el-input v-model="patientInfo.age" placeholder="年龄" :disabled="true"></el-input>
21 21
       </el-form-item>
22 22
       <el-form-item label="证件号:" prop="name">
23 23
         <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
@@ -32,7 +32,7 @@
32 32
         </el-date-picker>
33 33
       </el-form-item>
34 34
       <el-form-item label="联系电话: " prop="name">
35
-        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
35
+        <el-input v-model="patientInfo.phone" placeholder="联系电话" :disabled="true"></el-input>
36 36
       </el-form-item>
37 37
       <el-form-item label="医保类型: " prop="name">
38 38
         <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
@@ -45,45 +45,56 @@
45 45
         </el-select>
46 46
       </el-form-item>
47 47
       <el-form-item label="医保证号: " prop="name">
48
-        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
48
+        <el-input v-model="patientInfo.health_care_no" placeholder="医保证号" :disabled="true"></el-input>
49 49
       </el-form-item>
50 50
       <el-form-item label="家庭住址: " prop="name">
51
-        <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
51
+        <el-input v-model="patientInfo.home_address" placeholder="家庭住址" :disabled="true"></el-input>
52 52
       </el-form-item>
53
-      <el-form-item label="过敏史: " prop="name">
54
-        <el-input v-model="allergic_history" placeholder=""></el-input>
53
+      <el-form-item label="药物过敏史: " prop="name">
54
+        <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
55 55
       </el-form-item>
56
-<!-- 
56
+     
57
+      <!-- <el-form-item label="初始透析日期: " prop="name">
58
+         <el-date-picker
59
+          :disabled="true"
60
+          style="width:100%;"
61
+          v-model="first_dialysis_date"
62
+          type="date"
63
+          placeholder="选择日期">
64
+        </el-date-picker>
65
+      </el-form-item>
66
+
57 67
       <el-form-item label="工作单位: " prop="name">
58
-        <el-input v-model="allergic_history" placeholder=""></el-input>
68
+         <el-input v-model="patientInfo.work_unit" placeholder="工作单位"  :disabled="true"></el-input>
59 69
       </el-form-item>
60 70
 
61 71
       <el-form-item label="原发病: " prop="name">
62
-        <el-input v-model="allergic_history" placeholder=""></el-input>
72
+        <el-input v-model="primary_disease" placeholder="原发病"></el-input>
63 73
       </el-form-item>
74
+      
75
+  
64 76
 
65 77
       <el-form-item label="确诊肾衰日期: " prop="name">
66
-        <el-input v-model="allergic_history" placeholder=""></el-input>
67
-      </el-form-item>
68
-
69
-     <el-form-item label="药物过敏史: " prop="name">
70
-        <el-input v-model="allergic_history" placeholder=""></el-input>
71
-      </el-form-item>
72
-
73
-       <el-form-item label="初始透析日期: " prop="name">
74
-        <el-input v-model="allergic_history" placeholder=""></el-input>
78
+         <el-date-picker
79
+          style="width:100%;"
80
+          format="yyyy-MM-dd"
81
+          value-format="yyyy-MM-dd"
82
+          v-model="confirm_failure_date"
83
+          type="date"
84
+          placeholder="选择日期">
85
+        </el-date-picker>
75 86
       </el-form-item>
76
-
77
-       <el-form-item label="体格检查: " prop="name">
78
-        <el-input v-model="allergic_history" placeholder=""></el-input>
87
+     
88
+      <el-form-item label="体格检查: " prop="name">
89
+        <el-input v-model="physical_examination" placeholder="体格检查"></el-input>
79 90
       </el-form-item>
80 91
 
81 92
        <el-form-item label="专科检查: " prop="name">
82
-        <el-input v-model="allergic_history" placeholder=""></el-input>
93
+        <el-input v-model="special_inspection" placeholder="专科检查"></el-input>
83 94
       </el-form-item>
84 95
 
85
-        <el-form-item label="实验室及器械检查: " prop="name">
86
-        <el-input v-model="allergic_history" placeholder=""></el-input>
96
+      <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
97
+        <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
87 98
       </el-form-item> -->
88 99
 
89 100
     </el-form>
@@ -278,6 +289,7 @@
278 289
   import {  createCaseHistory,getInitData } from '@/api/his/his'
279 290
   import { getDataConfig } from "@/utils/data";
280 291
   import { getTemplateDetail,getMedicalTemplateList } from "@/api/project/project"
292
+  import { uParseTime } from '@/utils/tools'
281 293
   export default {
282 294
     props: {
283 295
       case_history: Object,
@@ -347,6 +359,15 @@
347 359
         diagnoses:[],
348 360
         sick:[],
349 361
         allergic_history:"",
362
+        primary_disease:"",
363
+        confirm_failure_date:"",
364
+        drug_allergy_history:"",
365
+        start_dialysis_date:"",
366
+        physical_examination:"",
367
+        special_inspection:"",
368
+        lab_apparatus:"",
369
+        first_dialysis_date:"",
370
+        work_unit:"",
350 371
         form:{
351 372
           id:0,
352 373
         },
@@ -404,9 +425,14 @@
404 425
             "diagnose":this.case_history.diagnose,
405 426
             "allergic_history":this.allergic_history,
406 427
             "id":this.form.id,
428
+            "primary_disease":this.primary_disease,
429
+            "confirm_failure_date":this.confirm_failure_date,
430
+            "drug_allergy_history":this.drug_allergy_history,
431
+            "physical_examination":this.physical_examination,
432
+            "special_inspection":this.special_inspection,
433
+            "lab_apparatus":this.lab_apparatus,
407 434
           }
408
-          console.log("prams222",params)
409
-         
435
+          console.log("param233322332232323",params)
410 436
           createCaseHistory(params).then(response => {
411 437
             if (response.data.state == 0) {
412 438
               this.$message.error("患者病历已存在")
@@ -415,6 +441,16 @@
415 441
             } else {
416 442
               var caseHistory = response.data.data.caseHistory
417 443
               console.log("caseHistory",caseHistory)
444
+              var historyInfo = response.data.data.historyInfo
445
+              console.log("historyInfo",historyInfo)
446
+              this.primary_disease = caseHistory.primary_disease
447
+              this.confirm_failure_date = this.getTime(caseHistory.confirm_failure_date)
448
+              this.drug_allergy_history = caseHistory.drug_allergy_history
449
+              this.physical_examination = caseHistory.physical_examination
450
+              this.special_inspection = caseHistory.special_inspection
451
+              this.lab_apparatus = caseHistory.lab_apparatus
452
+              this.form.id = historyInfo.id
453
+
418 454
               this.$message.success("保存成功")
419 455
               this.doctor_advice = ""
420 456
               this.remark = ""
@@ -432,7 +468,6 @@
432 468
               if(response.data.state == 1){
433 469
                 var templatedetail =  response.data.data.templateDetail
434 470
                 console.log("templatedetail",templatedetail)
435
-
436 471
                 this.case_history.chief_conplaint =  templatedetail.chief_conplaint
437 472
                 this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness
438 473
                 this.case_history.past_history =  templatedetail.past_history
@@ -443,7 +478,7 @@
443 478
                 this.case_history.remark = templatedetail.remark
444 479
                 this.case_history.sick = templatedetail.sick
445 480
                 this.case_history.diagnose = templatedetail.diagnose
446
-
481
+              
447 482
               }
448 483
           })
449 484
         },
@@ -570,26 +605,44 @@
570 605
         })
571 606
 
572 607
       },
608
+      getTime(val) {
609
+         if(val == ""){
610
+          return ""
611
+         }else {
612
+          return uParseTime(val, '{y}-{m}-{d}')
613
+         }
614
+      },
573 615
     },
574 616
     created(){
617
+      
575 618
        this.getlist()
576 619
        this.getInitData()
577 620
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
578
-       this.allergic_history = this.case_history.allergic_history
621
+      
622
+   
623
+      
579 624
        if(this.patientInfo.gender = 1){
580 625
          this.patientInfo.gender = '男'
581 626
        }else if(this.patientInfo.gender = 2){
582 627
           this.patientInfo.gender = '女'
583 628
         }
584
-
629
+      
630
+      this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
631
+      
632
+      this.primary_disease = this.case_history.primary_disease
633
+      this.confirm_failure_date = this.case_history.confirm_failure_date
634
+      this.drug_allergy_history = this.case_history.drug_allergy_history
635
+      this.physical_examination = this.case_history.physical_examination
636
+      this.special_inspection = this.case_history.special_inspection
637
+      this.lab_apparatus = this.case_history.lab_apparatus
585 638
     },
586 639
     watch:{
587 640
       detalid:function(val){
588 641
         this.getTemplateDetail(val)
642
+
589 643
       },
590 644
       'patientInfo.gender':{
591 645
         handler(newName, oldName){
592
-          console.log('newName',newName)
593 646
           if(newName == 1){
594 647
             this.patientInfo.gender = '男'
595 648
           }else if(newName == 2){
@@ -601,7 +654,7 @@
601 654
       },
602 655
       case_history:{
603 656
         handler(val){
604
-          console.log("南京人明",this.case_history)
657
+          
605 658
           this.allergic_history = this.case_history.allergic_history
606 659
           if(this.case_history.breathing == 0){
607 660
             this.case_history.breathing = ""
@@ -613,7 +666,13 @@
613 666
             this.case_history.diagnose = ""
614 667
           }
615 668
           this.form.id = this.case_history.id
616
-
669
+          
670
+          this.primary_disease = this.case_history.primary_disease
671
+          this.confirm_failure_date = this.case_history.confirm_failure_date
672
+          this.drug_allergy_history = this.case_history.drug_allergy_history
673
+          this.physical_examination = this.case_history.physical_examination
674
+          this.special_inspection = this.case_history.special_inspection
675
+          this.lab_apparatus = this.case_history.lab_apparatus
617 676
           this.watchSign++
618 677
         },
619 678
         deep:true

+ 274 - 7
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Dosyayı Görüntüle

@@ -14,7 +14,6 @@
14 14
             :editable="false"
15 15
             style="width: 100%;"
16 16
             type="date"
17
-            :picker-options="pickerOptions"
18 17
             placeholder="选择开始时间"
19 18
             align="right"
20 19
             format="yyyy-MM-dd"
@@ -1333,6 +1332,7 @@ export default {
1333 1332
 
1334 1333
       }
1335 1334
       this.isloading = true
1335
+      console.log("param32323232323323223233232332",params)
1336 1336
       getPatientInfo(params).then(response => {
1337 1337
         if (response.data.state == 0) {
1338 1338
           this.$message.error(response.data.msg)
@@ -1366,6 +1366,7 @@ export default {
1366 1366
           this.patientInfo = response.data.data.xt_info
1367 1367
           this.hisPatientInfo = response.data.data.his_info
1368 1368
           this.case_history = response.data.data.case_history
1369
+        
1369 1370
           this.info = response.data.data.info
1370 1371
           this.last_info = response.data.data.last_info
1371 1372
           this.schedule = response.data.data.schedule
@@ -1422,6 +1423,14 @@ export default {
1422 1423
             this.case_history.is_infect = false
1423 1424
           }
1424 1425
 
1426
+           this.case_history.allergic_history = this.case_history.allergic_history
1427
+           this.case_history.primary_disease = this.case_history.primary_disease
1428
+           this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
1429
+           this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
1430
+           this.case_history.physical_examination = this.case_history.physical_examination
1431
+           this.case_history.special_inspection = this.case_history.special_inspection
1432
+           this.case_history.lab_apparatus = this.case_history.lab_apparatus
1433
+
1425 1434
           //处方相关
1426 1435
           this.prescriptionList = response.data.data.prescription
1427 1436
 
@@ -1712,7 +1721,7 @@ export default {
1712 1721
 
1713 1722
     choosePatient(val) {
1714 1723
       if (this.titleType == '电子病历') {
1715
-        if (this.$refs.child.watchSign > 2) {
1724
+        if (this.$refs.child!=undefined && this.$refs.child.watchSign > 2) {
1716 1725
           this.$confirm('是否保存当前病例', '保存', {
1717 1726
             confirmButtonText: '确 定',
1718 1727
             cancelButtonText: '取 消',
@@ -1743,6 +1752,7 @@ export default {
1743 1752
                 '-' +
1744 1753
                 (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
1745 1754
                 ':' + (min < 10 ? '0' + min : min)
1755
+          
1746 1756
             getPatientInfo(params).then(response => {
1747 1757
               if (response.data.state == 0) {
1748 1758
                 this.$message.error(response.data.msg)
@@ -1776,6 +1786,45 @@ export default {
1776 1786
                 this.patientInfo = response.data.data.xt_info
1777 1787
                 this.hisPatientInfo = response.data.data.his_info
1778 1788
                 this.case_history = response.data.data.case_history
1789
+                
1790
+                if(this.case_history.primary_disease == ""){
1791
+                   this.case_history.primary_disease = ""
1792
+                }else{
1793
+                  this.case_history.primary_disease = this.case_history.primary_disease
1794
+                }
1795
+                
1796
+                if(this.case_history.confirm_failure_date <=0){
1797
+                  this.case_history.confirm_failure_date = ""
1798
+                }else{
1799
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
1800
+                }
1801
+
1802
+                if(this.case_history.drug_allergy_history ==""){
1803
+                   this.case_history.drug_allergy_history = ""
1804
+                }else{
1805
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
1806
+                }
1807
+                 
1808
+                if(this.case_history.physical_examination ==""){
1809
+                  this.case_history.physical_examination = ""
1810
+                }else{
1811
+                 this.case_history.physical_examination = this.case_history.physical_examination
1812
+                }
1813
+                if(this.case_history.special_inspection == ""){
1814
+                  this.case_history.special_inspection = ""
1815
+                }else{
1816
+                  this.case_history.special_inspection = this.case_history.special_inspection
1817
+                }
1818
+                 
1819
+                if(this.case_history.lab_apparatus == ""){
1820
+                  this.case_history.lab_apparatus = ""
1821
+                }else{
1822
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
1823
+                }
1824
+               
1825
+               
1826
+                
1827
+               
1779 1828
                 this.info = response.data.data.info
1780 1829
                 this.last_info = response.data.data.last_info
1781 1830
                 this.schedule = response.data.data.schedule
@@ -1829,6 +1878,8 @@ export default {
1829 1878
                 } else {
1830 1879
                   this.case_history.is_infect = false
1831 1880
                 }
1881
+
1882
+
1832 1883
                 this.prescriptionList = response.data.data.prescription
1833 1884
 
1834 1885
                 if (response.data.data.prescription.length > 0) {
@@ -2282,6 +2333,8 @@ export default {
2282 2333
                 this.patientInfo = response.data.data.xt_info
2283 2334
                 this.hisPatientInfo = response.data.data.his_info
2284 2335
                 this.case_history = response.data.data.case_history
2336
+
2337
+             
2285 2338
                 this.info = response.data.data.info
2286 2339
                 this.last_info = response.data.data.last_info
2287 2340
 
@@ -2334,6 +2387,42 @@ export default {
2334 2387
                 } else {
2335 2388
                   this.case_history.is_infect = false
2336 2389
                 }
2390
+
2391
+               if(this.case_history.primary_disease == ""){
2392
+                   this.case_history.primary_disease = ""
2393
+                }else{
2394
+                  this.case_history.primary_disease = this.case_history.primary_disease
2395
+                }
2396
+                
2397
+                if(this.case_history.confirm_failure_date <=0){
2398
+                  this.case_history.confirm_failure_date = ""
2399
+                }else{
2400
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
2401
+                }
2402
+
2403
+                if(this.case_history.drug_allergy_history ==""){
2404
+                   this.case_history.drug_allergy_history = ""
2405
+                }else{
2406
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
2407
+                }
2408
+                 
2409
+                if(this.case_history.physical_examination ==""){
2410
+                  this.case_history.physical_examination = ""
2411
+                }else{
2412
+                 this.case_history.physical_examination = this.case_history.physical_examination
2413
+                }
2414
+                if(this.case_history.special_inspection == ""){
2415
+                  this.case_history.special_inspection = ""
2416
+                }else{
2417
+                  this.case_history.special_inspection = this.case_history.special_inspection
2418
+                }
2419
+                 
2420
+                if(this.case_history.lab_apparatus == ""){
2421
+                  this.case_history.lab_apparatus = ""
2422
+                }else{
2423
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
2424
+                }
2425
+
2337 2426
                 this.prescriptionList = response.data.data.prescription
2338 2427
 
2339 2428
                 if (response.data.data.prescription.length > 0) {
@@ -2768,6 +2857,7 @@ export default {
2768 2857
               this.patientInfo = response.data.data.xt_info
2769 2858
               this.hisPatientInfo = response.data.data.his_info
2770 2859
               this.case_history = response.data.data.case_history
2860
+             
2771 2861
               this.info = response.data.data.info
2772 2862
               this.last_info = response.data.data.last_info
2773 2863
 
@@ -2820,6 +2910,32 @@ export default {
2820 2910
               } else {
2821 2911
                 this.case_history.is_infect = false
2822 2912
               }
2913
+
2914
+                    
2915
+             if(this.case_history.primary_disease == ""){
2916
+                   this.case_history.primary_disease = ""
2917
+              }
2918
+                
2919
+            
2920
+               this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
2921
+                
2922
+
2923
+                if(this.case_history.drug_allergy_history ==""){
2924
+                   this.case_history.drug_allergy_history = ""
2925
+                }
2926
+                 
2927
+                if(this.case_history.physical_examination ==""){
2928
+                  this.case_history.physical_examination = ""
2929
+                }
2930
+                if(this.case_history.special_inspection == ""){
2931
+                  this.case_history.special_inspection = ""
2932
+                }
2933
+                 
2934
+                if(this.case_history.lab_apparatus == ""){
2935
+                  this.case_history.lab_apparatus = ""
2936
+                }
2937
+
2938
+
2823 2939
               this.prescriptionList = response.data.data.prescription
2824 2940
 
2825 2941
               if (response.data.data.prescription.length > 0) {
@@ -3213,7 +3329,7 @@ export default {
3213 3329
           this.$refs.child.watchSign = 0
3214 3330
         }
3215 3331
       } else {
3216
-
3332
+       
3217 3333
         var nowDate = new Date()
3218 3334
         var nowYear = nowDate.getFullYear()
3219 3335
         var nowMonth = nowDate.getMonth() + 1
@@ -3313,6 +3429,43 @@ export default {
3313 3429
                 this.patientInfo = response.data.data.xt_info
3314 3430
                 this.hisPatientInfo = response.data.data.his_info
3315 3431
                 this.case_history = response.data.data.case_history
3432
+                console.log("999923923323232",this.case_history)
3433
+               
3434
+               if(this.case_history.primary_disease == ""){
3435
+                   this.case_history.primary_disease = ""
3436
+                }else{
3437
+                  this.case_history.primary_disease = this.case_history.primary_disease
3438
+                }
3439
+                
3440
+                if(this.case_history.confirm_failure_date <=0){
3441
+                  this.case_history.confirm_failure_date = ""
3442
+                }else{
3443
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
3444
+                }
3445
+
3446
+                if(this.case_history.drug_allergy_history ==""){
3447
+                   this.case_history.drug_allergy_history = ""
3448
+                }else{
3449
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
3450
+                }
3451
+                 
3452
+                if(this.case_history.physical_examination ==""){
3453
+                  this.case_history.physical_examination = ""
3454
+                }else{
3455
+                 this.case_history.physical_examination = this.case_history.physical_examination
3456
+                }
3457
+                if(this.case_history.special_inspection == ""){
3458
+                  this.case_history.special_inspection = ""
3459
+                }else{
3460
+                  this.case_history.special_inspection = this.case_history.special_inspection
3461
+                }
3462
+                 
3463
+                if(this.case_history.lab_apparatus == ""){
3464
+                  this.case_history.lab_apparatus = ""
3465
+                }else{
3466
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
3467
+                }
3468
+
3316 3469
                 this.doctors = response.data.data.doctors
3317 3470
                 this.department = response.data.data.department
3318 3471
                 this.schedule = response.data.data.schedule
@@ -3323,7 +3476,7 @@ export default {
3323 3476
                   }
3324 3477
                 }
3325 3478
 
3326
-                this.case_history = response.data.data.case_history
3479
+              
3327 3480
                 this.info = response.data.data.info
3328 3481
                 this.last_info = response.data.data.last_info
3329 3482
 
@@ -3789,6 +3942,14 @@ export default {
3789 3942
                 this.patientInfo = response.data.data.xt_info
3790 3943
                 this.hisPatientInfo = response.data.data.his_info
3791 3944
                 this.case_history = response.data.data.case_history
3945
+                
3946
+                this.case_history.primary_disease = this.case_history.primary_disease
3947
+                this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
3948
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
3949
+                this.case_history.physical_examination = this.case_history.physical_examination
3950
+                this.case_history.special_inspection = this.case_history.special_inspection
3951
+                this.case_history.lab_apparatus = this.case_history.lab_apparatus
3952
+
3792 3953
                 var month_prescriptions = response.data.data.month_prescriptions
3793 3954
                 this.setMonthPrescription(month_prescriptions)
3794 3955
                 this.doctors = response.data.data.doctors
@@ -3801,7 +3962,6 @@ export default {
3801 3962
                   }
3802 3963
                 }
3803 3964
 
3804
-                this.case_history = response.data.data.case_history
3805 3965
                 this.info = response.data.data.info
3806 3966
                 this.last_info = response.data.data.last_info
3807 3967
 
@@ -3891,6 +4051,42 @@ export default {
3891 4051
                 this.patientInfo = response.data.data.xt_info
3892 4052
                 this.hisPatientInfo = response.data.data.his_info
3893 4053
                 this.case_history = response.data.data.case_history
4054
+                
4055
+                if(this.case_history.primary_disease == ""){
4056
+                   this.case_history.primary_disease = ""
4057
+                }else{
4058
+                  this.case_history.primary_disease = this.case_history.primary_disease
4059
+                }
4060
+                
4061
+                if(this.case_history.confirm_failure_date <=0){
4062
+                  this.case_history.confirm_failure_date = ""
4063
+                }else{
4064
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
4065
+                }
4066
+
4067
+                if(this.case_history.drug_allergy_history ==""){
4068
+                   this.case_history.drug_allergy_history = ""
4069
+                }else{
4070
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
4071
+                }
4072
+                 
4073
+                if(this.case_history.physical_examination ==""){
4074
+                  this.case_history.physical_examination = ""
4075
+                }else{
4076
+                 this.case_history.physical_examination = this.case_history.physical_examination
4077
+                }
4078
+                if(this.case_history.special_inspection == ""){
4079
+                  this.case_history.special_inspection = ""
4080
+                }else{
4081
+                  this.case_history.special_inspection = this.case_history.special_inspection
4082
+                }
4083
+                 
4084
+                if(this.case_history.lab_apparatus == ""){
4085
+                  this.case_history.lab_apparatus = ""
4086
+                }else{
4087
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
4088
+                }
4089
+
3894 4090
                 this.info = response.data.data.info
3895 4091
                 this.last_info = response.data.data.last_info
3896 4092
                 this.schedule = response.data.data.schedule
@@ -4251,6 +4447,42 @@ export default {
4251 4447
                 this.patientInfo = response.data.data.xt_info
4252 4448
                 this.hisPatientInfo = response.data.data.his_info
4253 4449
                 this.case_history = response.data.data.case_history
4450
+
4451
+                if(this.case_history.primary_disease == ""){
4452
+                   this.case_history.primary_disease = ""
4453
+                }else{
4454
+                  this.case_history.primary_disease = this.case_history.primary_disease
4455
+                }
4456
+                
4457
+                if(this.case_history.confirm_failure_date <=0){
4458
+                  this.case_history.confirm_failure_date = ""
4459
+                }else{
4460
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
4461
+                }
4462
+
4463
+                if(this.case_history.drug_allergy_history ==""){
4464
+                   this.case_history.drug_allergy_history = ""
4465
+                }else{
4466
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
4467
+                }
4468
+                 
4469
+                if(this.case_history.physical_examination ==""){
4470
+                  this.case_history.physical_examination = ""
4471
+                }else{
4472
+                 this.case_history.physical_examination = this.case_history.physical_examination
4473
+                }
4474
+                if(this.case_history.special_inspection == ""){
4475
+                  this.case_history.special_inspection = ""
4476
+                }else{
4477
+                  this.case_history.special_inspection = this.case_history.special_inspection
4478
+                }
4479
+                 
4480
+                if(this.case_history.lab_apparatus == ""){
4481
+                  this.case_history.lab_apparatus = ""
4482
+                }else{
4483
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
4484
+                }
4485
+
4254 4486
                 this.info = response.data.data.info
4255 4487
                 this.last_info = response.data.data.last_info
4256 4488
                 this.schedule = response.data.data.schedule
@@ -4468,10 +4700,9 @@ export default {
4468 4700
       }
4469 4701
     },
4470 4702
     handleClick() {
4471
-      if (this.titleType == '电子处方') {
4703
+      if (this.titleType == '电子处方' || this.titleType == '电子病历') {
4472 4704
         if (this.radio == 1) {
4473 4705
           this.un_cure_data.map(item => {
4474
-            console.log('~~~~~~~~')
4475 4706
             if (item.id == this.patientid) {
4476 4707
               console.log('~~~~~~~~22222222')
4477 4708
 
@@ -4618,6 +4849,42 @@ export default {
4618 4849
           this.patientInfo = response.data.data.xt_info
4619 4850
           this.hisPatientInfo = response.data.data.his_info
4620 4851
           this.case_history = response.data.data.case_history
4852
+
4853
+            if(this.case_history.primary_disease == ""){
4854
+                this.case_history.primary_disease = ""
4855
+            }else{
4856
+              this.case_history.primary_disease = this.case_history.primary_disease
4857
+            }
4858
+            
4859
+            if(this.case_history.confirm_failure_date <=0){
4860
+              this.case_history.confirm_failure_date = ""
4861
+            }else{
4862
+              this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
4863
+            }
4864
+
4865
+            if(this.case_history.drug_allergy_history ==""){
4866
+                this.case_history.drug_allergy_history = ""
4867
+            }else{
4868
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
4869
+            }
4870
+              
4871
+            if(this.case_history.physical_examination ==""){
4872
+              this.case_history.physical_examination = ""
4873
+            }else{
4874
+              this.case_history.physical_examination = this.case_history.physical_examination
4875
+            }
4876
+            if(this.case_history.special_inspection == ""){
4877
+              this.case_history.special_inspection = ""
4878
+            }else{
4879
+              this.case_history.special_inspection = this.case_history.special_inspection
4880
+            }
4881
+              
4882
+            if(this.case_history.lab_apparatus == ""){
4883
+              this.case_history.lab_apparatus = ""
4884
+            }else{
4885
+              this.case_history.lab_apparatus = this.case_history.lab_apparatus
4886
+            }
4887
+
4621 4888
           this.info = response.data.data.info
4622 4889
           this.last_info = response.data.data.last_info
4623 4890
           this.schedule = response.data.data.schedule

+ 10 - 3
src/xt_pages/outpatientTool/components/drugDetail.vue Dosyayı Görüntüle

@@ -58,7 +58,7 @@
58 58
            
59 59
             <el-table-column align="center" prop="total" label="操作">
60 60
                 <template slot-scope="scope">
61
-                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id)">使用明细</div>
61
+                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id,scope.row.max_unit,scope.row.min_unit)">使用明细</div>
62 62
                 </template>
63 63
             </el-table-column>
64 64
 
@@ -96,7 +96,8 @@
96 96
             </el-table-column>
97 97
             <el-table-column align="center" prop="name" label="数量">
98 98
                 <template slot-scope="scope">
99
-                    {{scope.row.prescribing_number/min_number}}
99
+                  <span v-if="scope.row.prescribing_number_unit == max_unit">{{scope.row.prescribing_number/min_number}}</span>   
100
+                  <span v-if="scope.row.prescribing_number_unit == min_unit && max_unit!=min_unit">{{scope.row.prescribing_number}}</span>   
100 101
                 </template>
101 102
             </el-table-column>
102 103
             <el-table-column align="center" prop="name" label="单位">
@@ -150,6 +151,8 @@ import { min } from 'moment'
150 151
        min_number:0,
151 152
        drug_type:"",
152 153
        drug_id:0,
154
+       max_unit:"",
155
+       min_unit:"",
153 156
       }
154 157
     },
155 158
     methods:{
@@ -285,10 +288,14 @@ import { min } from 'moment'
285 288
         }
286 289
         return max_str + min_str
287 290
        },
288
-       jump(val,min_number,drug_id){
291
+       jump(val,min_number,drug_id,max_unit,min_unit){
292
+         console.log("max_unit23232233",max_unit)
293
+         console.log("min_unit23232233",min_unit)
289 294
          this.dialogVisible = true
290 295
          this.tableList= val
291 296
          this.min_number = min_number
297
+         this.max_unit = max_unit
298
+         this.min_unit = min_unit
292 299
          this.drug_id = drug_id
293 300
        },
294 301
        getPatientName(id){

+ 16 - 2
src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue Dosyayı Görüntüle

@@ -21,7 +21,7 @@
21 21
               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
22 22
               <td style="line-height:18px;" width="100">规格<br>型号</td>
23 23
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
24
-            
24
+              <td style="line-height:18px;" width="80">经销商</td>
25 25
               <td style="line-height:18px;" width="80">进货价</td>
26 26
               <td style="line-height:18px;" width="80">入库<br>数量</td>
27 27
               <td style="line-height:18px;" width="80">单位</td>
@@ -43,6 +43,7 @@
43 43
                  <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
44 44
               </td>
45 45
               <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
46
+              <td style="line-height: 18px">{{ getDeatl(item.dealer) }}</td>
46 47
               <td style="line-height:18px">
47 48
                   {{item.price}}
48 49
               </td>
@@ -64,7 +65,9 @@
64 65
             </tr>
65 66
             <tr>
66 67
               <td>合计</td>
67
-              <td colspan="12" style="text-align:right;">{{getAllPrince(it.id).toFixed(2)}}</td>
68
+              <td colspan="7" style="text-align:center"></td>
69
+              <td style="text-align:center">{{getAllPrince(it.id).toFixed(2)}}</td>
70
+              <td colspan="6" style="text-align:center"></td>
68 71
             </tr>
69 72
             </tbody>
70 73
           </table>
@@ -282,6 +285,7 @@
282 285
             return false;
283 286
             } else {
284 287
              this.manufacturer = response.data.data.manufacturer;
288
+             this.dealer = response.data.data.dealer
285 289
               this.getList()
286 290
             }
287 291
         });
@@ -358,6 +362,16 @@
358 362
           }
359 363
         }
360 364
         return count
365
+      },
366
+       getDeatl(id){
367
+       
368
+        var dealer_name = ""
369
+        for(let i=0;i<this.dealer.length;i++){
370
+          if(id == this.dealer[i].id){
371
+            dealer_name = this.dealer[i].dealer_name
372
+          }
373
+        }
374
+        return dealer_name
361 375
       }
362 376
     },
363 377
     created() {

+ 19 - 4
src/xt_pages/stock/stockInOrderDetailPrint.vue Dosyayı Görüntüle

@@ -32,6 +32,7 @@
32 32
                                     <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
33 33
                                     <td style="line-height:18px;" width="80">规格<br>型号</td>
34 34
                                     <td style="line-height:18px;" width="80">生产<br>厂商</td>
35
+                                    <td style="line-height:18px;" width="80">经销商</td>
35 36
                                     <td style="line-height:18px;" width="80">单位</td>
36 37
                                     <td style="line-height:18px;" width="80">进货价</td>
37 38
                                     <td style="line-height:18px;" width="80">入库<br>数量</td> 
@@ -50,6 +51,7 @@
50 51
                                     <td style="line-height:18px;">{{ item.license_number }}</td>
51 52
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
52 53
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
54
+                                    <td style="line-height:18px;">{{ getDeatl(item.dealer) }}</td>
53 55
                                     <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
54 56
                                     <td style="line-height:18px;">{{item.price}}</td>
55 57
                                     <td style="line-height:18px;">{{item.warehousing_count}}</td> 
@@ -63,7 +65,9 @@
63 65
                                 </tr>
64 66
                                 <tr>
65 67
                                   <td>合计</td>
66
-                                  <td colspan="12" style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
68
+                                  <td colspan="7" style="text-align:center;"></td>
69
+                                  <td style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
70
+                                  <td colspan="6" style="text-align:center"></td>
67 71
                                </tr>
68 72
                             </tbody>
69 73
                         </table>
@@ -180,6 +184,7 @@ export default {
180 184
                   if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
181 185
                      this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
182 186
                   }
187
+                
183 188
                } 
184 189
             }
185 190
              console.log("商品信息",this.goodInfo)
@@ -297,9 +302,9 @@ export default {
297 302
      getManufacturer(id){
298 303
          let name = ""
299 304
          for(let i=0;i<this.goodInfo.length;i++){
300
-             if(id == this.goodInfo[i].id){
301
-                name  =this.goodInfo[i].manufacturer_name
302
-             }
305
+            if(id == this.goodInfo[i].id){
306
+              name  =this.goodInfo[i].manufacturer_name
307
+            }
303 308
          }
304 309
          return name
305 310
       },
@@ -348,6 +353,16 @@ export default {
348 353
           }
349 354
         }
350 355
         return total_price
356
+      },
357
+      getDeatl(id){
358
+        console.log("23323233223",id)
359
+        var dealer_name = ""
360
+        for(let i=0;i<this.dealer.length;i++){
361
+          if(id == this.dealer[i].id){
362
+            dealer_name = this.dealer[i].dealer_name
363
+          }
364
+        }
365
+        return dealer_name
351 366
       }
352 367
     },
353 368
     created(){