Browse Source

提交代码

陈少旭 1 year ago
parent
commit
9e4e1036b3

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

@@ -439,7 +439,7 @@
439 439
                                             <span v-else> {{ scope.row.total }}</span> -->
440 440
                                             <span v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
441 441
 <!--                                            //针对坐标系统的库存数据-->
442
-                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
442
+                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.zuobiao_stock_num}}</span>
443 443
 
444 444
                                           </template>
445 445
                                       </el-table-column>
@@ -3696,9 +3696,15 @@ export default {
3696 3696
 
3697 3697
           //跟坐标数据进行匹配,如果bbx01相等的话则,替换库存数量
3698 3698
           if(this.org_id == 10206 ) {
3699
+            console.log("-=======")
3700
+            console.log(this.zuobiao_project)
3701
+            console.log(this.tabProject)
3702
+            console.log("-=======")
3699 3703
             for (let i = 0; i < this.zuobiao_project.length; i++) {
3700 3704
               for (let b = 0; b < this.tabProject.length; b++) {
3701 3705
                 if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
3706
+                  console.log( this.zuobiao_project[i].lsqty)
3707
+                  console.log( this.tabProject[b].zuobiao_stock_num)
3702 3708
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
3703 3709
                 }
3704 3710
               }

+ 104 - 36
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue View File

@@ -1170,8 +1170,13 @@
1170 1170
           // pre_time: nowTime
1171 1171
 
1172 1172
         }
1173
+        if(this.org_id == 10206) {
1174
+          obj.med_type = 12
1175
+        }else{
1176
+          obj.med_type = 14
1177
+
1173 1178
 
1174
-        obj.med_type = 14
1179
+        }
1175 1180
 
1176 1181
         this.prescriptions.push(obj)
1177 1182
 
@@ -1686,42 +1691,85 @@
1686 1691
 
1687 1692
                 //项目
1688 1693
                 for (let b = 0; b < prescription.project.length; b++) {
1689
-                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false && prescription.project[b].project.medical_status!=1)){
1694
+                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false )) {
1695
+
1696
+                    if (this.org_id == 10206 || this.org_id == 0) {
1697
+                      let obj = {
1698
+                        id: prescription.project[b].id,
1699
+                        project_id: prescription.project[b].project_id,
1700
+                        project_name: prescription.project[b].project.project_name,
1701
+                        statistical_classification: prescription.project[b].project.statistical_classification,
1702
+                        single_dose: prescription.project[b].single_dose,
1703
+                        delivery_way: prescription.project[b].delivery_way,
1704
+                        execution_frequency: prescription.project[b].execution_frequency,
1705
+                        number_days: prescription.project[b].day,
1706
+                        total: prescription.project[b].count.toString(),
1707
+                        price: prescription.project[b].price,
1708
+                        remark: prescription.project[b].remark,
1709
+                        medical_code: prescription.project[b].project.medical_code,
1710
+                        type: prescription.project[b].type,
1711
+                        frequency_type: prescription.project[b].frequency_type,
1712
+                        day_count: prescription.project[b].day_count,
1713
+                        week_day: prescription.project[b].week_day
1714
+
1715
+                      }
1716
+
1717
+                      if (prescription.project[b].type == 2) {
1718
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1719
+                        obj['medical_code'] = prescription.project[b].project.medical_code
1720
+                        obj['project_name'] = prescription.project[b].project.project_name
1721
+                        obj['project'] = prescription.project[b].project
1722
+                        obj['unit'] = prescription.project[b].unit
1723
+                      } else if (prescription.project[b].type == 3) {
1724
+                        obj['statistical_classification'] = ''
1725
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1726
+                        obj['project_name'] = prescription.project[b].good_info.good_name
1727
+                        obj['good_info'] = prescription.project[b].good_info
1728
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
1729
+                      }
1730
+                      tempProject.push(obj)
1731
+                    }
1732
+                  }else{
1733
+                    if( prescription.project[b].project.medical_status!=1){
1734
+                      let obj = {
1735
+                        id: prescription.project[b].id,
1736
+                        project_id: prescription.project[b].project_id,
1737
+                        project_name: prescription.project[b].project.project_name,
1738
+                        statistical_classification: prescription.project[b].project.statistical_classification,
1739
+                        single_dose: prescription.project[b].single_dose,
1740
+                        delivery_way: prescription.project[b].delivery_way,
1741
+                        execution_frequency: prescription.project[b].execution_frequency,
1742
+                        number_days: prescription.project[b].day,
1743
+                        total: prescription.project[b].count.toString(),
1744
+                        price: prescription.project[b].price,
1745
+                        remark: prescription.project[b].remark,
1746
+                        medical_code: prescription.project[b].project.medical_code,
1747
+                        type: prescription.project[b].type,
1748
+                        frequency_type: prescription.project[b].frequency_type,
1749
+                        day_count: prescription.project[b].day_count,
1750
+                        week_day: prescription.project[b].week_day
1751
+
1752
+                      }
1753
+
1754
+                      if (prescription.project[b].type == 2) {
1755
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1756
+                        obj['medical_code'] = prescription.project[b].project.medical_code
1757
+                        obj['project_name'] = prescription.project[b].project.project_name
1758
+                        obj['project'] = prescription.project[b].project
1759
+                        obj['unit'] = prescription.project[b].unit
1760
+                      } else if (prescription.project[b].type == 3) {
1761
+                        obj['statistical_classification'] = ''
1762
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1763
+                        obj['project_name'] = prescription.project[b].good_info.good_name
1764
+                        obj['good_info'] = prescription.project[b].good_info
1765
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
1766
+                      }
1767
+                      tempProject.push(obj)
1768
+
1769
+                    }
1690 1770
 
1691
-                  let obj = {
1692
-                    id: prescription.project[b].id,
1693
-                    project_id: prescription.project[b].project_id,
1694
-                    project_name: prescription.project[b].project.project_name,
1695
-                    statistical_classification: prescription.project[b].project.statistical_classification,
1696
-                    single_dose: prescription.project[b].single_dose,
1697
-                    delivery_way: prescription.project[b].delivery_way,
1698
-                    execution_frequency: prescription.project[b].execution_frequency,
1699
-                    number_days: prescription.project[b].day,
1700
-                    total: prescription.project[b].count.toString(),
1701
-                    price: prescription.project[b].price,
1702
-                    remark: prescription.project[b].remark,
1703
-                    medical_code: prescription.project[b].project.medical_code,
1704
-                    type: prescription.project[b].type,
1705
-                    frequency_type: prescription.project[b].frequency_type,
1706
-                    day_count: prescription.project[b].day_count,
1707
-                    week_day: prescription.project[b].week_day
1708 1771
 
1709
-                  }
1710 1772
 
1711
-                  if (prescription.project[b].type == 2) {
1712
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1713
-                    obj['medical_code'] = prescription.project[b].project.medical_code
1714
-                    obj['project_name'] = prescription.project[b].project.project_name
1715
-                    obj['project'] = prescription.project[b].project
1716
-                    obj['unit'] = prescription.project[b].unit
1717
-                  } else if (prescription.project[b].type == 3) {
1718
-                    obj['statistical_classification'] = ''
1719
-                    obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1720
-                    obj['project_name'] = prescription.project[b].good_info.good_name
1721
-                    obj['good_info'] = prescription.project[b].good_info
1722
-                    obj['unit'] = prescription.project[b].good_info.packing_unit
1723
-                  }
1724
-                  tempProject.push(obj)
1725 1773
                   }
1726 1774
 
1727 1775
                 }
@@ -1749,6 +1797,10 @@
1749 1797
                 }
1750 1798
 
1751 1799
                 this.prescriptions.push(obj)
1800
+                console.log("!!!!!")
1801
+                console.log(this.prescriptions)
1802
+                console.log("!!!!!")
1803
+
1752 1804
               }
1753 1805
               this.curPrescriptions = this.prescriptions[0]
1754 1806
 
@@ -1762,8 +1814,18 @@
1762 1814
                 order_status: 0,
1763 1815
                 med_type: ''
1764 1816
               }
1765
-              obj.med_type = 14
1817
+              if(this.org_id == 10206) {
1818
+                obj.med_type = 12
1819
+              }else{
1820
+                obj.med_type = 14
1821
+
1822
+
1823
+              }
1766 1824
               this.prescriptions.push(obj)
1825
+              console.log("this.prescriptions")
1826
+              console.log(this.prescriptions)
1827
+              console.log("this.prescriptions")
1828
+
1767 1829
               this.curPrescriptions = this.prescriptions[0]
1768 1830
             }
1769 1831
           }
@@ -2110,7 +2172,13 @@
2110 2172
                 med_type: ''
2111 2173
               }
2112 2174
 
2113
-              obj.med_type = 14
2175
+              if(this.org_id == 10206) {
2176
+                obj.med_type = 12
2177
+              }else{
2178
+                obj.med_type = 14
2179
+
2180
+
2181
+              }
2114 2182
 
2115 2183
               this.prescriptions.push(obj)
2116 2184
               this.curPrescriptions = this.prescriptions[0]