浏览代码

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

28169 4 个月前
父节点
当前提交
898fe28b1b

+ 12 - 2
src/xt_pages/data/components/addConsumable.vue 查看文件

56
                         </div>
56
                         </div>
57
                        <div style="width:100%;display:flex;align-items:center;">
57
                        <div style="width:100%;display:flex;align-items:center;">
58
                             <el-form-item prop="dosage" class="noMargin">
58
                             <el-form-item prop="dosage" class="noMargin">
59
-                              <el-input v-model="form.dosage" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
59
+                              <el-input v-model="form.dosage" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>
60
                             </el-form-item>
60
                             </el-form-item>
61
                             <el-form-item prop="max_unit" class="noMargin">
61
                             <el-form-item prop="max_unit" class="noMargin">
62
                               <el-select v-model="form.max_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
62
                               <el-select v-model="form.max_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
94
                             </el-select>
94
                             </el-select>
95
                           </el-form-item>
95
                           </el-form-item>
96
                         </div>
96
                         </div>
97
-                       
97
+
98
                         <el-form-item label="生产厂商 : " prop="name" style="width:100%">
98
                         <el-form-item label="生产厂商 : " prop="name" style="width:100%">
99
                             <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
99
                             <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
100
                                 <el-option
100
                                 <el-option
137
                                 </el-option>
137
                                 </el-option>
138
                             </el-select>
138
                             </el-select>
139
                         </el-form-item>
139
                         </el-form-item>
140
+                      <el-form-item label="是否拆零:" prop="name">
141
+                        <el-select v-model="form.is_zero_flag" style="width:160px;" placeholder="请选择">
142
+                          <el-option
143
+                            v-for="item in options"
144
+                            :key="item.value"
145
+                            :label="item.label"
146
+                            :value="item.value">
147
+                          </el-option>
148
+                        </el-select>
149
+                      </el-form-item>
140
                         <el-form-item label="是否备案:" prop="name">
150
                         <el-form-item label="是否备案:" prop="name">
141
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
151
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
142
                                 <el-option
152
                                 <el-option

+ 23 - 3
src/xt_pages/data/components/addDrugs.vue 查看文件

26
                                       maxlength="30"></el-input>
26
                                       maxlength="30"></el-input>
27
                         </el-form-item>
27
                         </el-form-item>
28
                       </div>
28
                       </div>
29
-                      
29
+
30
                       <!-- <div v-if="org_id == 0">
30
                       <!-- <div v-if="org_id == 0">
31
                         <el-form-item label="药品规格 : ">
31
                         <el-form-item label="药品规格 : ">
32
                             <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
32
                             <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
331
                                 </el-option>
331
                                 </el-option>
332
                             </el-select>
332
                             </el-select>
333
                         </el-form-item>
333
                         </el-form-item>
334
+
335
+                      <el-form-item label="是否拆零:" prop="is_special_diseases">
336
+                        <el-select v-model="form.is_zero_flag" style="width:160px;" placeholder="请选择">
337
+                          <el-option
338
+                            v-for="(item,index) in options"
339
+                            :key="index"
340
+                            :label="item.label"
341
+                            :value="item.value">
342
+                          </el-option>
343
+                        </el-select>
344
+                      </el-form-item>
334
                         <el-form-item label="是否备案 : " prop="is_record">
345
                         <el-form-item label="是否备案 : " prop="is_record">
335
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
346
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
336
                                 <el-option
347
                                 <el-option
569
           label: '否'
580
           label: '否'
570
           }
581
           }
571
         ],
582
         ],
583
+
584
+
585
+
572
         Pharmacy: [
586
         Pharmacy: [
573
           {
587
           {
574
             value: 1,
588
             value: 1,
674
           is_project:"",
688
           is_project:"",
675
           is_show:"",
689
           is_show:"",
676
           is_self_drug:"2",
690
           is_self_drug:"2",
677
-        
691
+          is_zero_flag:"",
692
+
678
         },
693
         },
679
 
694
 
680
         rules: {
695
         rules: {
758
     },
773
     },
759
     methods: {
774
     methods: {
760
       changeText(retail_price){
775
       changeText(retail_price){
761
-       
776
+
762
         this.form.min_price = (retail_price/this.form.min_number).toFixed(2)
777
         this.form.min_price = (retail_price/this.form.min_number).toFixed(2)
763
       },
778
       },
764
       changeTextOne(min_number){
779
       changeTextOne(min_number){
878
             this.form[key] = obj[key]
893
             this.form[key] = obj[key]
879
           }
894
           }
880
 
895
 
896
+
881
           this.form.drug_classify = parseInt(this.form.drug_classify)
897
           this.form.drug_classify = parseInt(this.form.drug_classify)
882
           this.form['id'] = id
898
           this.form['id'] = id
883
           this.drug_status = []
899
           this.drug_status = []
1017
         form['is_project'] = this.form.is_project
1033
         form['is_project'] = this.form.is_project
1018
         form['is_show'] = this.form.is_show
1034
         form['is_show'] = this.form.is_show
1019
         form['is_self_drug'] = parseInt(this.form.is_self_drug)
1035
         form['is_self_drug'] = parseInt(this.form.is_self_drug)
1036
+        form['is_zero_flag'] = parseInt(this.form.is_zero_flag)
1037
+
1038
+
1039
+
1020
         return form
1040
         return form
1021
       },
1041
       },
1022
       getlist() {
1042
       getlist() {

+ 13 - 4
src/xt_pages/data/components/consumables.vue 查看文件

354
               bbx01:"",
354
               bbx01:"",
355
               bby01:"",
355
               bby01:"",
356
               is_show:"",
356
               is_show:"",
357
+              is_zero_flag:"",
358
+
357
             },
359
             },
358
             isVisibility: false,
360
             isVisibility: false,
359
           }
361
           }
779
                 this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
781
                 this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
780
               }
782
               }
781
 
783
 
784
+            if(response.data.data.goodInfo.is_zero_flag <=0){
785
+              this.goodInfo.goodInfoDialog.formValue.is_zero_flag = ''
786
+            }else{
787
+              this.goodInfo.goodInfoDialog.formValue.is_zero_flag =  response.data.data.goodInfo.is_zero_flag.toString()
788
+            }
789
+
790
+
782
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
791
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
783
 
792
 
784
           }
793
           }
1303
                 obj['default_count'] = ''
1312
                 obj['default_count'] = ''
1304
               } else {
1313
               } else {
1305
              if (key == '*默认单次用量') {
1314
              if (key == '*默认单次用量') {
1306
-               obj['default_count'] = parseInt(results[i][key].replace(/\s/g,"")) 
1315
+               obj['default_count'] = parseInt(results[i][key].replace(/\s/g,""))
1307
               }
1316
               }
1308
            }
1317
            }
1309
 
1318
 
1363
               }
1372
               }
1364
            }
1373
            }
1365
 
1374
 
1366
-         
1375
+
1367
 
1376
 
1368
            if (results[i]['医保编码'] === undefined) {
1377
            if (results[i]['医保编码'] === undefined) {
1369
                 obj['medical_insurance_number'] = ''
1378
                 obj['medical_insurance_number'] = ''
1527
           'goods':tableData
1536
           'goods':tableData
1528
         };
1537
         };
1529
         console.log("param2332323223",params)
1538
         console.log("param2332323223",params)
1530
-    
1539
+
1531
         postGoodInformation(params).then(response=>{
1540
         postGoodInformation(params).then(response=>{
1532
            if(response.data.state == 1){
1541
            if(response.data.state == 1){
1533
              var msg =  response.data.data.msg;
1542
              var msg =  response.data.data.msg;
1665
          }
1674
          }
1666
          return manufacturer_name
1675
          return manufacturer_name
1667
        }
1676
        }
1668
-      
1677
+
1669
     },
1678
     },
1670
     created() {
1679
     created() {
1671
       this.goodInfo.goodInfoDialog.formValue.is_user = "2"
1680
       this.goodInfo.goodInfoDialog.formValue.is_user = "2"

+ 23 - 8
src/xt_pages/data/components/drugs.vue 查看文件

330
           is_default: '',//是否默认
330
           is_default: '',//是否默认
331
           is_charge_predict: '',//是否收费预估项
331
           is_charge_predict: '',//是否收费预估项
332
           is_statistics_work: '',//是否统计工作量
332
           is_statistics_work: '',//是否统计工作量
333
+
333
           is_charge_use: '',//是否收费常用项
334
           is_charge_use: '',//是否收费常用项
334
           drug_code: '',
335
           drug_code: '',
335
           hosp_appr_flag:'',
336
           hosp_appr_flag:'',
388
           is_default: '',//是否默认
389
           is_default: '',//是否默认
389
           is_charge_predict: '',//是否收费预估项
390
           is_charge_predict: '',//是否收费预估项
390
           is_statistics_work: '',//是否统计工作量
391
           is_statistics_work: '',//是否统计工作量
392
+          is_zero_flag: '',//是否拆零
393
+
391
           is_charge_use: '',//是否收费常用项
394
           is_charge_use: '',//是否收费常用项
392
           drug_code: '',
395
           drug_code: '',
393
           social_security_directory_code:'',
396
           social_security_directory_code:'',
521
          }
524
          }
522
           return ''
525
           return ''
523
         }
526
         }
524
-        
527
+
525
       },
528
       },
526
       getDealer(id){
529
       getDealer(id){
527
         if (id == 0) {
530
         if (id == 0) {
535
           }
538
           }
536
           return name
539
           return name
537
         }
540
         }
538
-       
541
+
539
       },
542
       },
540
       goodInfoDialogComfirm: function(val) {
543
       goodInfoDialogComfirm: function(val) {
541
 
544
 
688
 
691
 
689
               }
692
               }
690
 
693
 
694
+              if(this.formValue.is_zero_flag <= 0){
695
+
696
+                this.formValue.is_zero_flag = ''
697
+              } else{
698
+
699
+                this.formValue.is_zero_flag = this.formValue.is_zero_flag.toString()
700
+
701
+
702
+              }
703
+
704
+
705
+
691
               if(this.formValue.is_charge_use <= 0){
706
               if(this.formValue.is_charge_use <= 0){
692
 
707
 
693
                 this.formValue.is_charge_use = ''
708
                 this.formValue.is_charge_use = ''
745
               if(this.formValue.drug_classify == 0){
760
               if(this.formValue.drug_classify == 0){
746
                  this.formValue.drug_classify = ""
761
                  this.formValue.drug_classify = ""
747
               }
762
               }
748
-           
763
+
749
               if(this.formValue.is_project<=0){
764
               if(this.formValue.is_project<=0){
750
                   this.formValue.is_project = ''
765
                   this.formValue.is_project = ''
751
               }else{
766
               }else{
1279
            }
1294
            }
1280
 
1295
 
1281
 
1296
 
1282
-           
1297
+
1283
 
1298
 
1284
            if (results[i]['限制性用药'] === undefined) {
1299
            if (results[i]['限制性用药'] === undefined) {
1285
                 obj['lmt_used_flag'] = ''
1300
                 obj['lmt_used_flag'] = ''
1519
           'drugs':tableData
1534
           'drugs':tableData
1520
         };
1535
         };
1521
         console.log("params222222222",params)
1536
         console.log("params222222222",params)
1522
-        
1537
+
1523
         postDrugInformation(params).then(response=>{
1538
         postDrugInformation(params).then(response=>{
1524
            if(response.data.state == 1){
1539
            if(response.data.state == 1){
1525
              var msg =  response.data.data.msg;
1540
              var msg =  response.data.data.msg;
1527
              this.getAllManufacturer();
1542
              this.getAllManufacturer();
1528
              this.GetAllConfig();
1543
              this.GetAllConfig();
1529
              this.$message.success("导入成功!")
1544
              this.$message.success("导入成功!")
1530
-        
1545
+
1531
            }else{
1546
            }else{
1532
              this.$message.error("导入失败,请下载日志查看")
1547
              this.$message.error("导入失败,请下载日志查看")
1533
            }
1548
            }
1592
 
1607
 
1593
 
1608
 
1594
          console.log("this.table",this.list)
1609
          console.log("this.table",this.list)
1595
-         
1610
+
1596
          for(let i=0;i<this.list.length;i++){
1611
          for(let i=0;i<this.list.length;i++){
1597
           for(let j=0;j<this.drugCategoryList.length;j++){
1612
           for(let j=0;j<this.drugCategoryList.length;j++){
1598
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
1613
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
1625
 
1640
 
1626
              }
1641
              }
1627
            }
1642
            }
1628
-           
1643
+
1629
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
1644
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
1630
 
1645
 
1631
           if(this.list[i].is_special_diseases == 1 ){
1646
           if(this.list[i].is_special_diseases == 1 ){

+ 14 - 8
src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue 查看文件

201
                       <span v-if="record.prescription.anticoagulant == 3">iu</span>
201
                       <span v-if="record.prescription.anticoagulant == 3">iu</span>
202
                       <span v-if="record.prescription.anticoagulant == 2">iu</span>
202
                       <span v-if="record.prescription.anticoagulant == 2">iu</span>
203
                       <span v-if="record.prescription.anticoagulant == 1">mg</span>;
203
                       <span v-if="record.prescription.anticoagulant == 1">mg</span>;
204
-                      </span>
204
+                    </span>
205
                   </td>
205
                   </td>
206
                 </tr>
206
                 </tr>
207
                 <tr>
207
                 <tr>
265
                         ></label-box>
265
                         ></label-box>
266
                           &nbsp; (总量:{{
266
                           &nbsp; (总量:{{
267
                             record.prescription.displace_liqui_value
267
                             record.prescription.displace_liqui_value
268
-                              ? prescription.displace_liqui_value
268
+                              ? record.prescription.displace_liqui_value
269
                               : "/"
269
                               : "/"
270
                           }}L)
270
                           }}L)
271
                       </span>&nbsp;
271
                       </span>&nbsp;
1192
           </td>
1192
           </td>
1193
         </tr>
1193
         </tr>
1194
         <tr>
1194
         <tr>
1195
-        <td style="text-align:left;margin-left:15px" colspan="6">
1196
-              <span style="margin-left:15px">质控护士签名:
1197
-              </span>
1198
-             </td>
1199
-           </tr>
1200
-         </table>
1195
+          <td style="text-align:left;margin-left:15px" colspan="6">
1196
+            <span style="margin-left:15px">质控护士签名:
1197
+            </span>
1198
+          </td>
1199
+        </tr>
1200
+        <tr>
1201
+          <td style="text-align:left;margin-left:15px" colspan="6">
1202
+            <span style="margin-left:15px">护士长/组长签名:
1203
+            </span>
1204
+          </td>
1205
+        </tr>
1206
+      </table>
1201
             <div style="margin-top:20px">
1207
             <div style="margin-top:20px">
1202
               <span style="margin-left:280px">肝素浓度:每毫升肝素生理盐水含肝素钠2.5毫克</span>
1208
               <span style="margin-left:280px">肝素浓度:每毫升肝素生理盐水含肝素钠2.5毫克</span>
1203
              </div>
1209
              </div>

+ 5 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue 查看文件

322
                            <td width="60"></td>
322
                            <td width="60"></td>
323
                             <td width="60">穿刺针:</td>
323
                             <td width="60">穿刺针:</td>
324
                             <td width="280">
324
                             <td width="280">
325
-                            <div>
326
-                                &nbsp;
325
+                            <div class="under-line">
326
+                              &nbsp;
327
+                              {{record.assessment_before_dislysis.puncture_needle ? record.assessment_before_dislysis.puncture_needle :''}}
328
+                                <!-- &nbsp;
327
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle == '16G' ? true : false" showValue="16G"></label-box>
329
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle == '16G' ? true : false" showValue="16G"></label-box>
328
                                 &nbsp;
330
                                 &nbsp;
329
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
331
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
330
                                 &nbsp;
332
                                 &nbsp;
331
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
333
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
332
                                 &nbsp;
334
                                 &nbsp;
333
-                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle == '留置针16G' ? true : false" showValue="留置针16G"></label-box>
335
+                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle == '留置针' ? true : false" showValue="留置针16G"></label-box> -->
334
                             </div>
336
                             </div>
335
                             </td>
337
                             </td>
336
                             <td></td>
338
                             <td></td>

+ 14 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue 查看文件

1086
               </span>
1086
               </span>
1087
             </td>
1087
             </td>
1088
           </tr>
1088
           </tr>
1089
+          <tr>
1090
+            <td style="text-align:left;" colspan="6">
1091
+              <span style="display:inline-block;margin-left:15px;">护士长/组长签名:
1092
+                <span v-if="setAdminUserES(dialysisOrder.quality_nurse_id) == ''">
1093
+                    {{getAdminUser(dialysisOrder.quality_nurse_id)}}
1094
+                </span>
1095
+              <span
1096
+                v-else style="align-items:center;justify-content:space-around;height:36px;"
1097
+              >
1098
+                <img style="height:30px;" :src="setAdminUserES(dialysisOrder.quality_nurse_id)" alt srcset />
1099
+              </span>
1100
+              </span>
1101
+            </td>
1102
+          </tr>
1089
         </table>
1103
         </table>
1090
 
1104
 
1091
         <!-- <div style="margin-top:20px">
1105
         <!-- <div style="margin-top:20px">

+ 6 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue 查看文件

388
                   <td width='20'></td>
388
                   <td width='20'></td>
389
                   <td width="70">穿刺针:</td>
389
                   <td width="70">穿刺针:</td>
390
                   <td width="280" style="text-align:left;">
390
                   <td width="280" style="text-align:left;">
391
-                    <div>
391
+                    <div class="under-line">
392
+                      {{predialysis.puncture_needle ? predialysis.puncture_needle :''}}
393
+                    </div>
394
+                    <!-- <div>
392
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle =='16G' ? true : false" showValue="16G"></label-box>
395
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle =='16G' ? true : false" showValue="16G"></label-box>
393
                       &nbsp;
396
                       &nbsp;
394
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
397
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
395
                       &nbsp;
398
                       &nbsp;
396
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
399
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
397
                       &nbsp;
400
                       &nbsp;
398
-                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle == '留置针16G' ? true : false" showValue="留置针16G"></label-box>
399
-                    </div>
401
+                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle == '留置针' ? true : false" showValue="留置针16G"></label-box>
402
+                    </div> -->
400
                   </td>
403
                   </td>
401
 
404
 
402
                   <td></td>
405
                   <td></td>

+ 16 - 2
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 查看文件

1307
       }],
1307
       }],
1308
       tabIndex: 1,
1308
       tabIndex: 1,
1309
       hisPatientInfo: {},
1309
       hisPatientInfo: {},
1310
+      lastHisPatientInfo: {},
1310
       schedule:{},
1311
       schedule:{},
1311
       loadingtwo: false,
1312
       loadingtwo: false,
1312
       patientTableData: [{}],
1313
       patientTableData: [{}],
1918
                 return false
1919
                 return false
1919
               } else {
1920
               } else {
1920
                 if (response.data.data.failed_code == -10) {
1921
                 if (response.data.data.failed_code == -10) {
1921
-                  if(response.data.data.failed_type && response.data.data.failed_type == 100){
1922
+                  if(4 && response.data.data.failed_type == 100){
1922
                     that.event_result = response.data.data.msg
1923
                     that.event_result = response.data.data.msg
1923
                     that.roleTableData =  that.event_result.output.result
1924
                     that.roleTableData =  that.event_result.output.result
1924
                     that.warm_type =  response.data.data.warm_type
1925
                     that.warm_type =  response.data.data.warm_type
6096
             this.loading = false
6097
             this.loading = false
6097
             this.patientInfo = response.data.data.xt_info
6098
             this.patientInfo = response.data.data.xt_info
6098
             this.hisPatientInfo = response.data.data.his_info
6099
             this.hisPatientInfo = response.data.data.his_info
6100
+            this.lastHisPatientInfo = response.data.data.last_his_patient_info
6101
+
6099
             this.info = response.data.data.info
6102
             this.info = response.data.data.info
6100
             this.order = response.data.data.order
6103
             this.order = response.data.data.order
6101
             this.schedule = response.data.data.sch
6104
             this.schedule = response.data.data.sch
6124
               if (this.info.sick_type == 0) {
6127
               if (this.info.sick_type == 0) {
6125
                 this.form.sick_type = ''
6128
                 this.form.sick_type = ''
6126
               }
6129
               }
6130
+
6131
+              if(this.org_id == 10721 && this.lastHisPatientInfo.id > 0){
6132
+                   this.form.sick_type = this.lastHisPatientInfo.sick_type
6133
+              }
6134
+
6127
             } else {
6135
             } else {
6128
               this.form.p_type = 14
6136
               this.form.p_type = 14
6129
               this.form.sick_type = this.sick[0].id
6137
               this.form.sick_type = this.sick[0].id
6134
                   this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
6142
                   this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
6135
                 }
6143
                 }
6136
               }
6144
               }
6137
-
6138
               this.sick_history = ''
6145
               this.sick_history = ''
6146
+              if(this.org_id == 10721  && this.lastHisPatientInfo.id > 0){
6147
+                this.form.sick_type = this.lastHisPatientInfo.sick_type
6148
+              }
6149
+
6139
             }
6150
             }
6151
+            console.log("this.form.sick_type")
6152
+
6153
+            console.log(this.form.sick_type)
6140
             this.addtions_charge = response.data.data.addtions_charge
6154
             this.addtions_charge = response.data.data.addtions_charge
6141
 
6155
 
6142
             if (response.data.data.prescription.length > 0 && response.data.data.prescription[0].advices.length > 0) {
6156
             if (response.data.data.prescription.length > 0 && response.data.data.prescription[0].advices.length > 0) {

+ 8 - 2
src/xt_pages/outpatientTool/components/detailStatistics.vue 查看文件

332
           for (let i = 0; i < list.length; i++) {
332
           for (let i = 0; i < list.length; i++) {
333
             for (let j = 0; j < list[i].orders.length; j++) {
333
             for (let j = 0; j < list[i].orders.length; j++) {
334
               for (let z = 0; z < list[i].orders[j].order_info.length; z++) {
334
               for (let z = 0; z < list[i].orders[j].order_info.length; z++) {
335
-                list[i].orders[j].order_info[z].record_date =
336
-                  list[i].orders[j].settle_accounts_date;
335
+                if(list[i].orders[j].order_info[z].advice_id > 0){
336
+                  list[i].orders[j].order_info[z].record_date =
337
+                    list[i].orders[j].order_info[z].advice.advice_date;
338
+                }
339
+                if(list[i].orders[j].order_info[z].project_id > 0){
340
+                  list[i].orders[j].order_info[z].record_date =
341
+                    list[i].orders[j].order_info[z].project.record_date;
342
+                }
337
                 list[i].orders[j].order_info[z].number =
343
                 list[i].orders[j].order_info[z].number =
338
                   list[i].orders[j].number;
344
                   list[i].orders[j].number;
339
                 this.tableData.push(list[i].orders[j].order_info[z]);
345
                 this.tableData.push(list[i].orders[j].order_info[z]);

+ 18 - 1
src/xt_pages/stock/Dialog/goodInfoDailog.vue 查看文件

331
               </el-select>
331
               </el-select>
332
           </el-form-item>
332
           </el-form-item>
333
 
333
 
334
+
335
+          <el-form-item label="是否拆零: " prop="limit_remark" style="width:100%;">
336
+            <el-select v-model="form.is_zero_flag" style="width:160px;" filterable placeholder="请选择">
337
+              <el-option
338
+                v-for="item in options"
339
+                :key="item.value"
340
+                :label="item.label"
341
+                :value="item.value">
342
+              </el-option>
343
+            </el-select>
344
+          </el-form-item>
345
+
334
         </el-form>
346
         </el-form>
335
       </el-tab-pane>
347
       </el-tab-pane>
336
     </el-tabs>
348
     </el-tabs>
426
           bbx01:"",
438
           bbx01:"",
427
           bby01:"",
439
           bby01:"",
428
           is_show:"",
440
           is_show:"",
429
-          
441
+          is_zero_flag:"",
442
+
430
         },
443
         },
431
 
444
 
432
         rules: {
445
         rules: {
663
         form["bbx01"] = this.form.bbx01
676
         form["bbx01"] = this.form.bbx01
664
         form["bby01"] = this.form.bby01
677
         form["bby01"] = this.form.bby01
665
         form["is_show"] = this.form.is_show
678
         form["is_show"] = this.form.is_show
679
+        form["is_zero_flag"] = this.form.is_zero_flag
680
+
681
+
682
+
666
 
683
 
667
         return form
684
         return form
668
       }, changeSelected: function(val) {
685
       }, changeSelected: function(val) {

+ 38 - 35
src/xt_pages/user/components/PatientDetail.vue 查看文件

1034
     <!-- 打印预览 style="display: none"-->
1034
     <!-- 打印预览 style="display: none"-->
1035
     <div style="display: none">
1035
     <div style="display: none">
1036
       <div id="print-info-box" v-if="org_id !=10206">
1036
       <div id="print-info-box" v-if="org_id !=10206">
1037
-        <div class="print_main_content" style="margin-top: 70px;">
1038
-          <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
1039
-          <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
1037
+        <div class="print_main_content" style="">
1038
+          <!-- <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
1039
+          <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div> -->
1040
           <div >
1040
           <div >
1041
             <table style="border-collapse: collapse;">
1041
             <table style="border-collapse: collapse;">
1042
+              <thead>
1043
+                <tr>
1044
+                  <th colspan="8">
1045
+                    <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
1046
+                    <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
1047
+                  </th>
1048
+                </tr>
1049
+              </thead>
1042
               <!-- 用 thead 规定好宽度 -->
1050
               <!-- 用 thead 规定好宽度 -->
1043
               <!-- <thead>
1051
               <!-- <thead>
1044
                 <tr v-show="false">
1052
                 <tr v-show="false">
1055
               <tbody>
1063
               <tbody>
1056
                 <tr>
1064
                 <tr>
1057
                   <!--  -->
1065
                   <!--  -->
1058
-                  <td style="width:8%;padding: 3px 0px;font-size: 17px;font-weight: 500;">
1066
+                  <td style="width:8%;padding: 3px 0px;font-size: 16px;font-weight: 500;">
1059
                     姓名
1067
                     姓名
1060
                     <!-- <div class="td_proj_title">姓名</div> -->
1068
                     <!-- <div class="td_proj_title">姓名</div> -->
1061
                   </td>
1069
                   </td>
1062
-                  <td style="padding: 3px 0px;font-size: 17px;">
1070
+                  <td style="padding: 3px 0px;font-size: 16px;">
1063
                     {{ patientPrint.name }}
1071
                     {{ patientPrint.name }}
1064
                     <!-- <div class="td_proj_content">{{ patientPrint.name }}</div> -->
1072
                     <!-- <div class="td_proj_content">{{ patientPrint.name }}</div> -->
1065
                   </td>
1073
                   </td>
1066
-                  <td style="padding: 3px 0px;font-size: 17px;">
1074
+                  <td style="padding: 3px 0px;font-size: 16px;">
1067
                     性别
1075
                     性别
1068
                     <!-- <div class="td_proj_title">性别</div> -->
1076
                     <!-- <div class="td_proj_title">性别</div> -->
1069
                   </td>
1077
                   </td>
1070
-                  <td style="padding: 3px 0px;font-size: 17px;">
1078
+                  <td style="padding: 3px 0px;font-size: 16px;">
1071
                     {{ patientPrint.gender }}
1079
                     {{ patientPrint.gender }}
1072
                     <!-- <div class="td_proj_content">{{ patientPrint.gender }}</div> -->
1080
                     <!-- <div class="td_proj_content">{{ patientPrint.gender }}</div> -->
1073
                   </td>
1081
                   </td>
1074
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1082
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1075
                     年龄
1083
                     年龄
1076
                     <!-- <div class="td_proj_title">年龄</div> -->
1084
                     <!-- <div class="td_proj_title">年龄</div> -->
1077
                   </td>
1085
                   </td>
1078
-                  <td style="padding: 3px 0px;font-size: 17px;">
1086
+                  <td style="padding: 3px 0px;font-size: 16px;">
1079
                     {{ patientPrint.age }}岁
1087
                     {{ patientPrint.age }}岁
1080
                     <!-- <div class="td_proj_content">{{ patientPrint.age }}岁</div> -->
1088
                     <!-- <div class="td_proj_content">{{ patientPrint.age }}岁</div> -->
1081
                   </td>
1089
                   </td>
1082
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1090
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1083
                     籍贯
1091
                     籍贯
1084
                     <!-- <div class="td_proj_title">籍贯</div> -->
1092
                     <!-- <div class="td_proj_title">籍贯</div> -->
1085
                   </td>
1093
                   </td>
1086
-                  <td style="padding: 3px 0px;font-size: 17px;">
1094
+                  <td style="padding: 3px 0px;font-size: 16px;">
1087
                     {{ patientPrint.native_place }}
1095
                     {{ patientPrint.native_place }}
1088
                     <!-- <div class="td_proj_content td_align_left">
1096
                     <!-- <div class="td_proj_content td_align_left">
1089
                       {{ patientPrint.native_place }}
1097
                       {{ patientPrint.native_place }}
1091
                   </td>
1099
                   </td>
1092
                 </tr>
1100
                 </tr>
1093
                 <tr>
1101
                 <tr>
1094
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1102
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1095
                     职业
1103
                     职业
1096
                     <!-- <div class="td_proj_title">职业</div> -->
1104
                     <!-- <div class="td_proj_title">职业</div> -->
1097
                   </td>
1105
                   </td>
1098
-                  <td style="padding: 3px 0px;font-size: 17px;">
1106
+                  <td style="padding: 3px 0px;font-size: 16px;">
1099
                     {{ patientPrint.profession }}
1107
                     {{ patientPrint.profession }}
1100
                     <!-- <div class="td_proj_content">
1108
                     <!-- <div class="td_proj_content">
1101
                       {{ patientPrint.profession }}
1109
                       {{ patientPrint.profession }}
1102
                     </div> -->
1110
                     </div> -->
1103
                   </td>
1111
                   </td>
1104
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1112
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1105
                     婚姻
1113
                     婚姻
1106
                     <!-- <div class="td_proj_title">婚姻</div> -->
1114
                     <!-- <div class="td_proj_title">婚姻</div> -->
1107
                   </td>
1115
                   </td>
1108
-                  <td style="padding: 3px 0px;font-size: 17px;">
1116
+                  <td style="padding: 3px 0px;font-size: 16px;">
1109
                     {{ patientPrint.marital_status }}
1117
                     {{ patientPrint.marital_status }}
1110
                     <!-- <div class="td_proj_content">
1118
                     <!-- <div class="td_proj_content">
1111
                       {{ patientPrint.marital_status }}
1119
                       {{ patientPrint.marital_status }}
1112
                     </div> -->
1120
                     </div> -->
1113
                   </td>
1121
                   </td>
1114
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1122
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1115
                     透析号
1123
                     透析号
1116
                     <!-- <div class="td_proj_title">透析号</div> -->
1124
                     <!-- <div class="td_proj_title">透析号</div> -->
1117
                   </td>
1125
                   </td>
1118
-                  <td style="padding: 3px 0px;font-size: 17px;">
1126
+                  <td style="padding: 3px 0px;font-size: 16px;">
1119
                     {{ patientPrint.dialysis_no }}
1127
                     {{ patientPrint.dialysis_no }}
1120
                     <!-- <div class="td_proj_content">
1128
                     <!-- <div class="td_proj_content">
1121
                       {{ patientPrint.dialysis_no }}
1129
                       {{ patientPrint.dialysis_no }}
1122
                     </div> -->
1130
                     </div> -->
1123
                   </td>
1131
                   </td>
1124
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1132
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1125
                     身份证号
1133
                     身份证号
1126
                     <!-- <div class="td_proj_title">身份证号</div> -->
1134
                     <!-- <div class="td_proj_title">身份证号</div> -->
1127
                   </td>
1135
                   </td>
1128
-                  <td style="padding: 3px 0px;font-size: 17px;">
1136
+                  <td style="padding: 3px 0px;font-size: 16px;">
1129
                     {{ patientPrint.id_card_no }}
1137
                     {{ patientPrint.id_card_no }}
1130
                     <!-- <div class="td_proj_content td_align_left">
1138
                     <!-- <div class="td_proj_content td_align_left">
1131
                       {{ patientPrint.id_card_no }}
1139
                       {{ patientPrint.id_card_no }}
1133
                   </td>
1141
                   </td>
1134
                 </tr>
1142
                 </tr>
1135
                 <tr>
1143
                 <tr>
1136
-                  <td  style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1144
+                  <td  style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1137
                     民族
1145
                     民族
1138
                     <!-- <div class="td_proj_title">民族</div>  valign="top" -->
1146
                     <!-- <div class="td_proj_title">民族</div>  valign="top" -->
1139
                   </td>
1147
                   </td>
1140
-                  <td style="padding: 3px 0px;font-size: 17px;">
1148
+                  <td style="padding: 3px 0px;font-size: 16px;">
1141
                     {{ patientPrint.nation }}
1149
                     {{ patientPrint.nation }}
1142
                     <!-- <div class="td_proj_content">{{ patientPrint.nation }}</div> -->
1150
                     <!-- <div class="td_proj_content">{{ patientPrint.nation }}</div> -->
1143
                   </td>
1151
                   </td>
1144
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1152
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1145
                     电话
1153
                     电话
1146
                     <!-- <div class="td_proj_title">电话</div> -->
1154
                     <!-- <div class="td_proj_title">电话</div> -->
1147
                   </td>
1155
                   </td>
1148
-                  <td  colspan="3" style="padding: 3px 0px;font-size: 17px;">
1156
+                  <td  colspan="3" style="padding: 3px 0px;font-size: 16px;">
1149
                     {{ patientPrint.phone }}
1157
                     {{ patientPrint.phone }}
1150
                     <!-- <div class="td_proj_content td_align_left">
1158
                     <!-- <div class="td_proj_content td_align_left">
1151
                       {{ patientPrint.phone }}
1159
                       {{ patientPrint.phone }}
1152
                     </div> -->
1160
                     </div> -->
1153
                    </td>
1161
                    </td>
1154
-                 <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
1162
+                 <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">
1155
                     家属电话
1163
                     家属电话
1156
                     <!-- <div class="td_proj_title">家属电话</div> -->
1164
                     <!-- <div class="td_proj_title">家属电话</div> -->
1157
                   </td>
1165
                   </td>
1158
-                  <td style="padding: 3px 0px;font-size: 17px;">
1166
+                  <td style="padding: 3px 0px;font-size: 16px;">
1159
                     {{ patientPrint.home_telephone }}
1167
                     {{ patientPrint.home_telephone }}
1160
                     <!-- <div class="td_proj_content td_align_left">
1168
                     <!-- <div class="td_proj_content td_align_left">
1161
                       {{ patientPrint.home_telephone }}
1169
                       {{ patientPrint.home_telephone }}
1163
                   </td>
1171
                   </td>
1164
                 </tr>
1172
                 </tr>
1165
                 <tr>
1173
                 <tr>
1166
-                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">地址</td>
1167
-                  <td colspan="7" style="text-align: left; padding:0px 5px;font-size: 17px;">
1174
+                  <td style="padding: 3px 0px;font-size: 16px;font-weight: 500;">地址</td>
1175
+                  <td colspan="7" style="text-align: left; padding:0px 5px;font-size: 16px;">
1168
                     <!-- class="td_proj_content td_align_left" -->
1176
                     <!-- class="td_proj_content td_align_left" -->
1169
                     <!-- <div > -->
1177
                     <!-- <div > -->
1170
                       {{ patientPrint.home_address }}
1178
                       {{ patientPrint.home_address }}
1172
                   </td>
1180
                   </td>
1173
                 </tr>
1181
                 </tr>
1174
                 <tr>
1182
                 <tr>
1175
-                  <td style="padding: 3px 0px;font-size: 17px; font-weight: 500;">
1183
+                  <td style="padding: 3px 0px;font-size: 16px; font-weight: 500;">
1176
                     主诉
1184
                     主诉
1177
                     <!-- <div class="td_proj_title">主诉</div> -->
1185
                     <!-- <div class="td_proj_title">主诉</div> -->
1178
                   </td>
1186
                   </td>
1179
                   <!-- class="td_proj_content td_align_left" -->
1187
                   <!-- class="td_proj_content td_align_left" -->
1180
-                  <td colspan="7" style="text-align: left; padding:0px 5px ;font-size: 17px;">
1188
+                  <td colspan="7" style="text-align: left; padding:0px 5px ;font-size: 16px;">
1181
                     {{ patientPrint.patient_complains }}
1189
                     {{ patientPrint.patient_complains }}
1182
                     <!-- <div style="padding: 0px 0px;"
1190
                     <!-- <div style="padding: 0px 0px;"
1183
                       v-html="patientPrint.patient_complains"
1191
                       v-html="patientPrint.patient_complains"
1282
             <div class="print_footnote_panel">
1290
             <div class="print_footnote_panel">
1283
               <div class="proj">
1291
               <div class="proj">
1284
                 <span class="proj_title">日期:</span>
1292
                 <span class="proj_title">日期:</span>
1285
-
1286
                 <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
1293
                 <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
1287
                 <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
1294
                 <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
1288
 
1295
 
1881
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
1888
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
1882
       const style1 =
1889
       const style1 =
1883
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} .wrapper {white-space: pre-wrap;} }";
1890
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} .wrapper {white-space: pre-wrap;} }";
1884
-      if(this.org_id != 10206 && this.org_id !=0){
1885
-        console.log('1111111');
1886
-
1891
+      if(this.org_id != 10206 ){
1887
         setTimeout(() => {
1892
         setTimeout(() => {
1888
           printJS({
1893
           printJS({
1889
             printable: "print-info-box",
1894
             printable: "print-info-box",
1893
           });
1898
           });
1894
         }, 1);
1899
         }, 1);
1895
       }else{
1900
       }else{
1896
-        console.log('121212','10206');
1897
-
1898
         setTimeout(() => {
1901
         setTimeout(() => {
1899
           printJS({
1902
           printJS({
1900
             printable: "print-info-box",
1903
             printable: "print-info-box",