Browse Source

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

csx 4 years ago
parent
commit
6531e7476e

+ 2 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -634,7 +634,7 @@
634 634
             let two_count = 0
635 635
             let three_count = 0
636 636
             for (let i = 0; i < response.data.data.list.length; i++) {
637
-              // console.log('99999999', response.data.data.list)
637
+              console.log('99999999', response.data.data.list)
638 638
 
639 639
               if (response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 || response.data.data.list[i].info.prescription_status == 2) {
640 640
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
@@ -988,6 +988,7 @@
988 988
   .mainCenter {
989 989
     display: flex;
990 990
     flex: 1;
991
+    height:100%;
991 992
   }
992 993
 
993 994
   .costBox {

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -31,7 +31,7 @@
31 31
               </el-option>
32 32
             </el-select>
33 33
           </el-form-item>
34
-          <el-form-item label="病类型:" prop="name" label-position="right">
34
+          <el-form-item label="病类型:" prop="name" label-position="right">
35 35
 
36 36
             <el-select style="width:100%;" v-model="state1" placeholder="">
37 37
               <el-option

+ 164 - 186
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue View File

@@ -50,6 +50,22 @@
50 50
       <el-form-item label="家庭住址: " prop="name">
51 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-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
55
+         <el-option
56
+            v-for="item in wayOptions"
57
+           :key="item.id"
58
+           :label="item.name"
59
+           :value="item.id"
60
+          />
61
+        </el-select>
62
+      </el-form-item>
63
+      <el-form-item label="诊断: " prop="name">
64
+        <el-input v-model="patientInfo.health_care_no" placeholder=""></el-input>
65
+      </el-form-item>
66
+      <el-form-item label="过敏史: " prop="name">
67
+        <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
68
+      </el-form-item>
53 69
     </el-form>
54 70
     <div class="mainTitle">体格信息:</div>
55 71
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
@@ -74,6 +90,8 @@
74 90
     </el-form>
75 91
     <div class="mainTitle">病历信息:</div>
76 92
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
93
+     
94
+
77 95
       <el-form-item label="发病日期: " prop="name">
78 96
         <el-date-picker
79 97
           style="width:100%;"
@@ -85,189 +103,131 @@
85 103
       <el-form-item label="" prop="name">
86 104
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
87 105
       </el-form-item>
88
-      <el-row :gutter = "20">
89
-        <el-col :span="24">
90
-          <el-form-item label="主诉:">
91
-              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
92
-                  <el-option
93
-                    v-for="(item, index) in tabledata"
94
-                    :label="item.title"
95
-                    :value="item.content"
96
-                    :key="index"
97
-                  ></el-option>
98
-              </el-select>
99
-          </el-form-item>
100
-      </el-col>
101
-      <el-col :span="24">
102
-        <el-form-item  prop="name" style="width:100%;">
103
-          <el-input
104
-            type="textarea"
105
-            :rows="2"
106
-            placeholder="请输入内容"
107
-            v-model="case_history.chief_conplaint">
108
-          </el-input>
109
-        </el-form-item>
110
-      </el-col>
111
-      </el-row>
112
-      <el-row :gutter="20">
113
-        <el-col :span="24">
114
-           <el-form-item label="现病史:">
115
-              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
116
-                  <el-option
117
-                    v-for="(item, index) in tabledataOne"
118
-                    :label="item.title"
119
-                    :value="item.content"
120
-                    :key="index"
121
-                  ></el-option>
122
-              </el-select>
123
-          </el-form-item>
124
-        </el-col>
125
-        <el-col :span="24">
126
-          <el-form-item  prop="name" style="width:100%;">
127
-            <el-input
128
-              type="textarea"
129
-              :rows="2"
130
-              placeholder="请输入内容"
131
-              v-model="case_history.history_of_present_illness">
132
-            </el-input>
133
-          </el-form-item>
134
-        </el-col>
135
-      </el-row>
136
-      <el-row :gutter="20">
137
-         <el-col :span="24">
138
-           <el-form-item label="既往史:">
139
-            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
140
-                  <el-option
141
-                    v-for="(item, index) in tabledataTwo"
142
-                    :label="item.title"
143
-                    :value="item.content"
144
-                    :key="index"
145
-                  ></el-option>
146
-             </el-select>
147
-            </el-form-item>
148
-         </el-col>
149
-         <el-col :span="24">
150
-            <el-form-item  prop="name" style="width:100%;">
151
-              <el-input
152
-                type="textarea"
153
-                :rows="2"
154
-                placeholder="请输入内容"
155
-                v-model="case_history.past_history">
156
-              </el-input>
157
-           </el-form-item>
158
-         </el-col>
159
-      </el-row>
160
-     <el-row :gutter="24">
161
-       <el-col :span="20">
162
-          <el-form-item label="个人史:">
163
-            <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
164
-                  <el-option
165
-                    v-for="(item, index) in tabledataThree"
166
-                    :label="item.title"
167
-                    :value="item.content"
168
-                    :key="index"
169
-                  ></el-option>
170
-             </el-select>
171
-            </el-form-item>
172
-       </el-col>
173
-       <el-col :span="20">
174
-        <el-form-item  prop="name" style="width:100%;">
175
-          <el-input
176
-            type="textarea"
177
-            :rows="2"
178
-            placeholder="请输入内容"
179
-            v-model="case_history.personal_history">
180
-          </el-input>
181
-        </el-form-item>
182
-      </el-col>
183
-     </el-row>
184
-     <el-row :gutter="24">
185
-       <el-col :span="20">
186
-          <el-form-item  label="家族史:">
187
-            <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
188
-                  <el-option
189
-                    v-for="(item, index) in tabledataFour"
190
-                    :label="item.title"
191
-                    :value="item.content"
192
-                    :key="index"
193
-                  ></el-option>
194
-             </el-select>
195
-         </el-form-item>
196
-       </el-col>
197
-        <el-col :span="20">
198
-          <el-form-item prop="name" style="width:100%;">
199
-            <el-input
200
-              type="textarea"
201
-              :rows="2"
202
-              placeholder="请输入内容"
203
-              v-model="case_history.family_history">
204
-            </el-input>
205
-          </el-form-item>
206
-       </el-col>
207
-     </el-row>
208
-     <el-row :gutter="24">
209
-       <el-col :span="20">
210
-          <el-form-item label="诊断信息:">
211
-            <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
212
-                  <el-option
213
-                    v-for="(item, index) in tabledataFive"
214
-                    :label="item.title"
215
-                    :value="item.content"
216
-                    :key="index"
217
-                  ></el-option>
218
-             </el-select>
219
-         </el-form-item>
220
-       </el-col>
221
-       <el-col :span="20">
222
-        <el-form-item  prop="name" style="width:100%;">
223
-          <el-input
224
-            type="textarea"
225
-            :rows="2"
226
-            placeholder="请输入内容"
227
-            v-model="case_history.diagnostic">
228
-          </el-input>
106
+      <el-form-item label="" prop="name" style="visibility: hidden;">
107
+        <div></div>
108
+      </el-form-item>
109
+      <el-form-item label="主诉:" style="width:49%;">
110
+        <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
111
+            <el-option
112
+              v-for="(item, index) in tabledata"
113
+              :label="item.title"
114
+              :value="item.content"
115
+              :key="index"
116
+            ></el-option>
117
+        </el-select>
118
+        <el-input
119
+          type="textarea"
120
+          :rows="2"
121
+          placeholder="请输入内容"
122
+          v-model="case_history.chief_conplaint">
123
+        </el-input>
124
+      </el-form-item>
125
+      <el-form-item label="现病史:" style="width:49%;">
126
+        <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:100%;margin-bottom:10px;">
127
+          <el-option
128
+            v-for="(item, index) in tabledataOne"
129
+            :label="item.title"
130
+            :value="item.content"
131
+            :key="index"
132
+          ></el-option>
133
+        </el-select>
134
+        <el-input
135
+          type="textarea"
136
+          :rows="2"
137
+          placeholder="请输入内容"
138
+          v-model="case_history.history_of_present_illness">
139
+        </el-input>
140
+      </el-form-item>
141
+      <el-form-item label="既往史:" style="width:49%;">
142
+        <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:100%;margin-bottom:10px;">
143
+          <el-option
144
+            v-for="(item, index) in tabledataTwo"
145
+            :label="item.title"
146
+            :value="item.content"
147
+            :key="index"
148
+          ></el-option>
149
+        </el-select>
150
+        <el-input
151
+          type="textarea"
152
+          :rows="2"
153
+          placeholder="请输入内容"
154
+          v-model="case_history.past_history">
155
+        </el-input>
156
+      </el-form-item>
157
+      <el-form-item label="个人史:" style="width:49%;">
158
+        <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:100%;margin-bottom:10px;">
159
+          <el-option
160
+            v-for="(item, index) in tabledataThree"
161
+            :label="item.title"
162
+            :value="item.content"
163
+            :key="index"
164
+          ></el-option>
165
+        </el-select>
166
+        <el-input
167
+          type="textarea"
168
+          :rows="2"
169
+          placeholder="请输入内容"
170
+          v-model="case_history.personal_history">
171
+        </el-input>
172
+      </el-form-item>
173
+      <el-form-item  label="家族史:" style="width:49%;">
174
+        <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:100%;margin-bottom:10px;">
175
+          <el-option
176
+            v-for="(item, index) in tabledataFour"
177
+            :label="item.title"
178
+            :value="item.content"
179
+            :key="index"
180
+          ></el-option>
181
+        </el-select>
182
+        <el-input
183
+          type="textarea"
184
+          :rows="2"
185
+          placeholder="请输入内容"
186
+          v-model="case_history.family_history">
187
+        </el-input>
188
+      </el-form-item>
189
+      <el-form-item label="诊断信息:" style="width:49%;">
190
+        <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:100%;margin-bottom:10px;">
191
+          <el-option
192
+            v-for="(item, index) in tabledataFive"
193
+            :label="item.title"
194
+            :value="item.content"
195
+            :key="index"
196
+          ></el-option>
197
+        </el-select>
198
+        <el-input
199
+          type="textarea"
200
+          :rows="2"
201
+          placeholder="请输入内容"
202
+          v-model="case_history.diagnostic">
203
+        </el-input>
204
+      </el-form-item>
205
+
206
+      <el-form-item label="医嘱:" style="width:49%;">
207
+        <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:100%;margin-bottom:10px;">
208
+          <el-option
209
+            v-for="(item, index) in tabledataSix"
210
+            :label="item.title"
211
+            :value="item.content"
212
+            :key="index"
213
+          ></el-option>
214
+        </el-select>
215
+        <el-input
216
+          type="textarea"
217
+          :rows="2"
218
+          placeholder="请输入内容"
219
+          v-model="case_history.doctor_advice">
220
+        </el-input>
221
+      </el-form-item>
222
+
223
+      <el-form-item label ="备注"  prop="name" style="width:49%;">
224
+        <el-input
225
+          type="textarea"
226
+          :rows="2"
227
+          placeholder="请输入内容"
228
+          v-model="case_history.remark">
229
+        </el-input>
229 230
       </el-form-item>
230
-       </el-col>
231
-     </el-row>
232
-
233
-     <el-row :gutter="24">
234
-       <el-col :span="20">
235
-         <el-form-item label="医嘱:">
236
-            <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
237
-                  <el-option
238
-                    v-for="(item, index) in tabledataSix"
239
-                    :label="item.title"
240
-                    :value="item.content"
241
-                    :key="index"
242
-                  ></el-option>
243
-             </el-select>
244
-         </el-form-item>
245
-       </el-col>
246
-       <el-col :span="20">
247
-        <el-form-item  prop="doctor_advice" style="width:100%;">
248
-          <el-input
249
-            type="textarea"
250
-            :rows="2"
251
-            placeholder="请输入内容"
252
-            v-model="case_history.doctor_advice">
253
-          </el-input>
254
-        </el-form-item>
255
-       </el-col>
256
-     </el-row>
257
-
258
-        <el-form-item label ="备注"  prop="name" style="width:100%;">
259
-          <el-input
260
-            type="textarea"
261
-            :rows="2"
262
-            placeholder="请输入内容"
263
-            v-model="case_history.remark">
264
-          </el-input>
265
-        </el-form-item>
266
-    
267
-    
268
-     
269
-    
270
-    
271 231
     </el-form>
272 232
 
273 233
   </div>
@@ -341,7 +301,10 @@
341 301
         valueFour:'',
342 302
         valueFive:'',
343 303
         valueSix:'',
344
-        valueSeven:''
304
+        valueSeven:'',
305
+        diagnoses:[],
306
+        state1:"",
307
+        diagnose:""
345 308
       }
346 309
     },
347 310
     methods: {
@@ -390,7 +353,9 @@
390 353
             "diagnostic":this.case_history.diagnostic,
391 354
             "breathing":this.case_history.breathing,
392 355
             "doctor_advice":this.case_history.doctor_advice,
393
-            "remark":this.case_history.remark
356
+            "remark":this.case_history.remark,
357
+            "sick":this.case_history.sick,
358
+            "diagnose":this.case_history.diagnose
394 359
           }
395 360
 
396 361
           createCaseHistory(params).then(response => {
@@ -425,6 +390,8 @@
425 390
                 this.case_history.diagnostic = templatedetail.diagnostic
426 391
                 this.case_history.doctor_advice = templatedetail.doctor_advice
427 392
                 this.case_history.remark = templatedetail.remark
393
+                this.sick = templatedetail.sick
394
+                this.diagnose = templatedetail.diagnose
428 395
               }
429 396
           })
430 397
         },
@@ -538,7 +505,18 @@
538 505
           }
539 506
         }
540 507
       },
541
-     
508
+      getInitData() {
509
+        getInitData().then(response => {
510
+          if (response.data.state == 0) {
511
+            this.$message.error(response.data.msg)
512
+            return false
513
+          } else {
514
+            this.sick = response.data.data.sick
515
+            this.diagnoses = response.data.data.diagnose
516
+          }
517
+        })
518
+
519
+      },
542 520
     },
543 521
     created(){
544 522
        this.getlist()
@@ -549,7 +527,7 @@
549 527
        }else if(this.patientInfo.gender = 2){
550 528
           this.patientInfo.gender = '女'
551 529
         }
552
-     
530
+     this.getInitData()
553 531
     },
554 532
     watch:{
555 533
       detalid:function(val){

+ 30 - 5
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

@@ -35,10 +35,16 @@
35 35
               <p>日期:{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
36 36
           </div>
37 37
           <div class="actionBar">
38
-                 <p>审核:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
38
+                 <!-- <p>审核:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
39 39
                  <p>配对:</p>
40 40
                  <p>核对:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
41 41
                  <p>发药:{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
42
+                 <p>药费:{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
43
+
44
+                 <p>审核:</p>
45
+                 <p>配对:</p>
46
+                 <p>核对:</p>
47
+                 <p>发药:</p>
42 48
                  <p>药费:{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
43 49
           </div>
44 50
           <div style="page-break-after:always"></div>
@@ -152,11 +158,29 @@ export default {
152 158
        }
153 159
        return name
154 160
      },
155
-     getTotalOne(id) {
156
-        console.log("处方数据",this.prescriptions)
161
+    getTotalOne(id) {
162
+
157 163
         var total = 0
158 164
         var addtotal = 0
159 165
         for (let i = 0; i < this.prescriptions.length; i++) {
166
+          if(id == this.prescriptions[i].id){
167
+            if (this.prescriptions[i].project != null) {
168
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
169
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
170
+              }
171
+            }
172
+
173
+            if (this.prescriptions[i].additionalcharge != null) {
174
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
175
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
176
+              }
177
+            }
178
+              addtotal =  Math.floor(addtotal * 100) / 100
179
+        }
180
+       
181
+       }
182
+
183
+      for (let i = 0; i < this.prescriptions.length; i++) {
160 184
           if(id == this.prescriptions[i].id){
161 185
             if (this.prescriptions[i].advices != null) {
162 186
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
@@ -172,8 +196,9 @@ export default {
172 196
               addtotal =  Math.floor(addtotal * 100) / 100
173 197
         }
174 198
        }
175
-       return total + addtotal
176
-      }, 
199
+
200
+        return total + addtotal
201
+      },
177 202
 
178 203
 
179 204
    },