Startsida Utforska Hjälp
Registrera dig Logga in
elizebath
/
elizebeth
forkad från csx/Vue_New
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Activity
Bläddra i källkod

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

see999 3 år sedan
förälder
0197ffd776 ba5cb6caf8
incheckning
49eb6dfa3d
24 ändrade filer med 528 tillägg och 369 borttagningar
Delad Vy Visa Diff Statistik
  1. 4 3
      index.html
  2. 20 5
      src/store/modules/globalConfig.js
  3. 6 1
      src/xt_pages/data/components/addDrugs.vue
  4. 16 1
      src/xt_pages/data/prescription.vue
  5. 8 3
      src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue
  6. 2 0
      src/xt_pages/dialysis/dialysisDoctorAdvice.vue
  7. 2 2
      src/xt_pages/dialysis/doctorAdvicePrint.vue
  8. 1 1
      src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue
  9. 1 1
      src/xt_pages/outpatientCharges/outpatientChargesManagement.vue
  10. 5 0
      src/xt_pages/outpatientCharges/statementPrint.vue
  11. 2 1
      src/xt_pages/outpatientCharges/summary.vue
  12. 8 2
      src/xt_pages/outpatientDoctorStation/components/callPrescription.vue
  13. 201 191
      src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue
  14. 6 2
      src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue
  15. 123 94
      src/xt_pages/outpatientDoctorStation/doctorDesk.vue
  16. 50 8
      src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue
  17. 32 6
      src/xt_pages/stock/drugs/drugPrint.vue
  18. 6 21
      src/xt_pages/stock/drugs/query.vue
  19. 1 0
      src/xt_pages/user/components/PatientForm.vue
  20. 1 1
      src/xt_pages/user/templateSummary.vue
  21. 14 14
      src/xt_pages/workforce/components/nextTableWeeks.vue
  22. 15 4
      src/xt_pages/workforce/components/tableData.vue
  23. 1 5
      src/xt_pages/workforce/components/tableWeeks.vue
  24. 3 3
      src/xt_pages/workforce/remind_print.vue

+ 4 - 3
index.html Visa fil 

@@ -4,6 +4,7 @@
4 4 
     <meta charset="utf-8" />
5 5 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
6 6 
     <meta name="renderer" content="webkit" />
7 
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
7 8 
     <meta
8 9 
       name="viewport"
9 10 
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
 
@@ -13,7 +14,7 @@
13 14 
       rel="stylesheet"
14 15 
       href="//at.alicdn.com/t/font_1480998_l66fq6mc0y.css"
15 16 
     /> -->
16 
-
17 
+
17 18 
   </head>
18 19
19 20 
   <body>
 
@@ -25,13 +26,13 @@
25 26 
     <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.service.js"></script>
26 27 
     <script src="<%= htmlWebpackPlugin.options.path %>/neditor/i18n/zh-cn/zh-cn.js"></script>
27 28 
     <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.parse.min.js"></script>
28 
-
29 
+
29 30 
     <div id="app"></div>
30 31 
     <!-- built files will be auto injected -->
31 32 
     <link
32 33 
       rel="stylesheet"
33 34 
       href="//at.alicdn.com/t/font_795029_9ftx46rzd47.css"
34 35 
     />
35 
-
36 
+
36 37 
   </body>
37 38 
 </html>

+ 20 - 5
src/store/modules/globalConfig.js Visa fil 

@@ -220,11 +220,11 @@ const global_config = {
220 220 
       }
221 221 
     ],
222 222 
     contagions: [ // 传染病
223 
-      {
224 
-        id: 1,
225 
-        name: '普通',
226 
-        type: 1
227 
-      },
223 
+      // {
224 
+      //   id: 1,
225 
+      //   name: '普通',
226 
+      //   type: 1
227 
+      // },
228 228 
       {
229 229 
         id: 2,
230 230 
         name: '乙肝',
 
@@ -554,6 +554,21 @@ const global_config = {
554 554 
         sodium: 1,
555 555 
         calcium: 1,
556 556 
         bicarbonate: 1
557 
+      },
558 
+      24: {
559 
+        id: 24,
560 
+        name: 'I-HDF',
561 
+        dialysis_duration: 1,
562 
+        replacement_way: 1,
563 
+        hemodialysis_machine: 2,
564 
+        blood_filter: 1,
565 
+        perfusion_apparatus: 2,
566 
+        blood_flow_volume: 1,
567 
+        dialysate_flow: 1,
568 
+        kalium: 1,
569 
+        sodium: 1,
570 
+        calcium: 1,
571 
+        bicarbonate: 1
557 572 
       }
558 573 
     },
559 574 
     anticoagulants_confit: { // 抗凝剂

+ 6 - 1
src/xt_pages/data/components/addDrugs.vue Visa fil 

@@ -20,6 +20,11 @@
20 20 
                                       maxlength="30"></el-input>
21 21 
                         </el-form-item>
22 22
23 
+                        <!-- <el-form-item label="药品规格 : ">
24 
+                            <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
25 
+                                      maxlength="30"></el-input>
26 
+                        </el-form-item> -->
27 
+
23 28 
                         <el-form-item label="药品类别 : " prop="drug_category">
24 29 
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
25 30 
                                 <el-option
 
@@ -145,7 +150,7 @@
145 150 
                         <el-input v-model="form.drug_day" style="width:160px;" placeholder=""
146 151 
                                   maxlength="30"></el-input>
147 152 
                     </el-form-item>
148 
-                       <el-form-item label="库存警戒:" prop="drug_stock_limit">
153 
+                       <el-form-item label="库存警戒:">
149 154 
                             <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder=""
150 155 
                                       maxlength="30"></el-input>
151 156 
                         </el-form-item>

+ 16 - 1
src/xt_pages/data/prescription.vue Visa fil 

@@ -773,7 +773,22 @@ export default {
773 773 
           sodium: 1,
774 774 
           calcium: 1,
775 775 
           bicarbonate: 1
776 
-        }
776 
+        },
777 
+        {
778 
+          id: 24,
779 
+          name: 'I-HDF',
780 
+          dialysis_duration: 1,
781 
+          replacement_way: 1,
782 
+          hemodialysis_machine: 2,
783 
+          blood_filter: 1,
784 
+          perfusion_apparatus: 2,
785 
+          blood_flow_volume: 1,
786 
+          dialysate_flow: 1,
787 
+          kalium: 1,
788 
+          sodium: 1,
789 
+          calcium: 1,
790 
+          bicarbonate: 1
791 
+       }
777 792 
       ],
778 793 
       addPlan: {
779 794 
         id: 0,

+ 8 - 3
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue Visa fil 

@@ -836,7 +836,8 @@
836 836 
         current_drug_name:"",
837 837 
         current_drug_spec: "",
838 838 
         drug_id: 0,
839 
-        src_type:""
839 
+        src_type:"",
840 
+        org_id:0,
840 841 
       }
841 842 
     },
842 843 
     watch: {
 
@@ -2172,8 +2173,11 @@
2172 2173 
         let tempPrescribingNumberDesc = ''
2173 2174
2174 2175 
         if (row.prescribing_number) {
2175 
-          tempPrescribingNumberDesc =
2176 
-            row.prescribing_number + '' + row.prescribing_number_unit
2176 
+           tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
2177 
+        }
2178 
+
2179 
+        if(this.org_id == 10188 ){
2180 
+            tempPrescribingNumberDesc = ""
2177 2181 
         }
2178 2182
2179 2183 
         if (row.single_dose) {
 
@@ -2548,6 +2552,7 @@
2548 2552 
       this.getAdviceConfig()
2549 2553 
       this.unitsOption = getDataConfig('hemodialysis', 'units')
2550 2554 
       this.template_id = this.$store.getters.xt_user.template_info.template_id
2555 
+      this.org_id = this.$store.getters.xt_user.org.id
2551 2556 
       this.patientid = this.$route.query.patient_id
2552 2557 
       this.request_record_date = this.record_date
2553 2558

+ 2 - 0
src/xt_pages/dialysis/dialysisDoctorAdvice.vue Visa fil 

@@ -121,6 +121,7 @@
121 121 
             <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
122 122 
             <span v-if="scope.row.mode_id == 13">(CRRT)</span>
123 123 
             <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
124 
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
124 125 
           </template>
125 126 
         </el-table-column>
126 127 
         <el-table-column  label="分区床位" width="100">
 
@@ -249,6 +250,7 @@
249 250 
             <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
250 251 
             <span v-if="scope.row.mode_id == 13">(CRRT)</span>
251 252 
             <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
253 
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
252 254 
           </template>
253 255 
         </el-table-column>
254 256 
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">

+ 2 - 2
src/xt_pages/dialysis/doctorAdvicePrint.vue Visa fil 

@@ -66,7 +66,7 @@
66 66 
                             <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
67 67 
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
68 68 
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
69 
-
69 
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
70 70 
                             </td>
71 71 
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
72 72 
                             {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
 
@@ -177,7 +177,7 @@
177 177 
                             <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
178 178 
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
179 179 
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
180 
-
180 
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
181 181 
                             </td>
182 182 
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
183 183 
                             {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue Visa fil 

@@ -47,7 +47,7 @@
47 47 
             <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;
48 48 
             <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
49 49 
             <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>&nbsp;
50 
-
50 
+            <label-box :isChecked="prescription.mode_id == 24 ? true : false" showValue="I-HDF"></label-box>&nbsp;
51 51 
           </td>
52 52 
         </tr>
53 53 
         <tr>

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Visa fil 

@@ -550,7 +550,7 @@
550 550 
         temp_med_type: '',
551 551 
         dialogVisible: false,
552 552 
         pwdFormVisible: false,
553 
-        pwd: '',
553 
+        pwd: '000000',
554 554 
         form: {
555 555 
           p_type: '',
556 556 
           sick_type: '',

+ 5 - 0
src/xt_pages/outpatientCharges/statementPrint.vue Visa fil 

@@ -294,6 +294,7 @@ export default {
294 294
295 295 
     },
296 296 
     getInfo(order_id,obj) {
297 
+
297 298 
       if (obj.balance_accounts_type == 2){
298 299 
         let params = {
299 300 
           his_patient_id: obj.his_patient_id,
 
@@ -541,6 +542,7 @@ export default {
541 542 
   },
542 543
543 544 
   created() {
545 
+    console.log(this.paramsObj)
544 546 
     this.getInfo(this.paramsObj.order_id,this.paramsObj);
545 547 
     this.org_id = this.$store.getters.xt_user.org_id;
546 548 
     console.log("this.org_id",this.org_id)
 
@@ -548,7 +550,10 @@ export default {
548 550 
   watch:{
549 551 
     paramsObj:{//深度监听，可监听到对象、数组的变化
550 552 
       handler(val, oldVal){
553 
+
551 554 
         this.paramsObj = val;
555 
+        console.log(this.paramsObj)
556 
+
552 557 
         this.getInfo(this.paramsObj.order_id,this.paramsObj)
553 558
554 559 
       },

+ 2 - 1
src/xt_pages/outpatientCharges/summary.vue Visa fil 

@@ -429,7 +429,8 @@
429 429 
           order_id: row.id,
430 430 
           settle_type: row.settle_type,
431 431 
           start_time: row.settle_start_time,
432 
-          end_time: row.settle_end_time
432 
+          end_time: row.settle_end_time,
433 
+          balance_accounts_type:row.his_patient.balance_accounts_type
433 434 
         }
434 435 
         this.orderObj = obj
435 436

+ 8 - 2
src/xt_pages/outpatientDoctorStation/components/callPrescription.vue Visa fil 

@@ -256,7 +256,7 @@
256 256 
           }
257 257 
           for (let b = 0; b < prescription.project.length; b++) {
258 258 
             if(prescription.project[b].type == 2){
259 
-              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
259 
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
260 260 
                 prescription.project.splice(b--,1)
261 261 
               }
262 262 
             }else if(prescription.project[b].type == 3){
 
@@ -322,7 +322,7 @@
322 322 
                 total:prescription.project[b].count,
323 323 
                 remark:prescription.project[b].remark,
324 324 
                 unit: prescription.project[b].unit,
325 
-                type: prescription.project[b].type
325 
+                type: prescription.project[b].type,
326 326 
                 // medical_code:prescription.project[b].project.medical_code,
327 327 
               };
328 328 
               if(prescription.project[b].type == 2){
 
@@ -330,11 +330,15 @@
330 330 
                 obj['medical_code'] =  prescription.project[b].project.medical_code
331 331 
                 obj['project_name'] =  prescription.project[b].project.project_name
332 332 
                 obj['price'] = prescription.project[b].project.price
333 
+                obj['project']=prescription.project[b].project
334 
+
333 335 
               }else if(prescription.project[b].type == 3){
334 336 
                 obj['statistical_classification'] = ""
335 337 
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
336 338 
                 obj['project_name'] =  prescription.project[b].good_info.good_name
337 339 
                 obj['price'] = prescription.project[b].good_info.packing_price
340 
+                obj['good_info']=prescription.project[b].good_info
341 
+
338 342 
               }
339 343
340 344 
               tempProject.push(obj)
 
@@ -346,6 +350,8 @@
346 350 
               addition:tempAddition,
347 351 
               type:prescription.type,
348 352 
               order_status:0,
353 
+              med_type: parseInt(prescription.med_type)
354 
+
349 355 
             };
350 356 
             prescriptions.push(obj)
351 357 
           }

+ 201 - 191
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Visa fil 

@@ -768,11 +768,16 @@
768 768 
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
769 769 
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
770 770 
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
771 
+                obj['project'] = project_month_prescriptions.project[a].project
772 
+
773 
+
771 774
772 775 
               } else if (project_month_prescriptions.project[a].type == 3) {
773 776 
                 obj['statistical_classification'] = ''
774 777 
                 obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
775 778 
                 obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
779 
+                obj['good_info'] = project_month_prescriptions.project[a].good_info
780 
+
776 781 
               }
777 782
778 783 
               // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
 
@@ -1095,11 +1100,13 @@
1095 1100 
                       obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1096 1101 
                       obj['medical_code'] = prescription.project[b].project.medical_code
1097 1102 
                       obj['project_name'] = prescription.project[b].project.project_name
1103 
+                      obj['project'] = prescription.project[b].project
1098 1104
1099 1105 
                     } else if (prescription.project[b].type == 3) {
1100 1106 
                       obj['statistical_classification'] = ''
1101 1107 
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1102 1108 
                       obj['project_name'] = prescription.project[b].good_info.good_name
1109 
+                      obj['good_info'] =  prescription.project[b].good_info
1103 1110 
                     }
1104 1111
1105 1112 
                     tempProject.push(obj)
 
@@ -1212,11 +1219,15 @@
1212 1219 
                       obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1213 1220 
                       obj['medical_code'] = prescription.project[b].project.medical_code
1214 1221 
                       obj['project_name'] = prescription.project[b].project.project_name
1222 
+                      obj['project'] = prescription.project[b].project
1223 
+
1215 1224
1216 1225 
                     } else if (prescription.project[b].type == 3) {
1217 1226 
                       obj['statistical_classification'] = ''
1218 1227 
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1219 1228 
                       obj['project_name'] = prescription.project[b].good_info.good_name
1229 
+                      obj['good_info'] = prescription.project[b].good_info
1230 
+
1220 1231 
                     }
1221 1232
1222 1233 
                     tempProject.push(obj)
 
@@ -1299,8 +1310,6 @@
1299 1310 
             ':' + (min < 10 ? '0' + min : min)
1300 1311 
           this.prescriptions[i]['pre_time'] = nowTime
1301 1312
1302 
-          this.prescriptions[i]['med_type'] = 14
1303 
-
1304 1313 
           this.prescriptions[i].name = '处方' + (i + 1)
1305 1314 
           if (i == 0) {
1306 1315 
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
 
@@ -1358,11 +1367,6 @@
1358 1367 
           this.prescriptions[i].name = '处方' + (i + 1)
1359 1368 
           this.prescriptions[i]['pre_time'] = nowTime
1360 1369
1361 
-
1362 
-
1363 
-            this.prescriptions[i]['med_type'] = 14
1364 
-
1365 
-
1366 1370 
           if (i == 0) {
1367 1371 
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
1368 1372 
               this.customTabIndex = 1
 
@@ -1525,7 +1529,7 @@
1525 1529 
         this.$refs.additionalCharges.hide()
1526 1530
1527 1531 
       }, searchProjectAction() {
1528 
-        console.log("~~~~")
1532 
+        console.log('~~~~')
1529 1533 
         console.log(this.allProject)
1530 1534
1531 1535 
         if (this.search_project_keyword.length == 0) {
 
@@ -1542,7 +1546,7 @@
1542 1546
1543 1547 
         }
1544 1548
1545 
-      },searchProjectTeamAction(){
1549 
+      }, searchProjectTeamAction() {
1546 1550 
         if (this.search_project_team_keyword.length == 0) {
1547 1551 
           this.tabPrjectTeam = this.allTabPrjectTeam
1548 1552 
 
@@ -1579,7 +1583,7 @@
1579 1583 
           if (this.prescriptions[i].name == this.editableTabsValue) {
1580 1584
1581 1585 
             if (this.prescriptions[i].advices != null) {
1582 
-              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
1586 
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++)  {
1583 1587 
                 total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
1584 1588 
               }
1585 1589 
             }
 
@@ -1913,129 +1917,117 @@
1913 1917 
           this.order_status = '已退费'
1914 1918 
         }
1915 1919
1916 
-
1917 
-
1918 
-
1919 1920 
         this.state1 = info.sick_type
1920 
-        if (this.state1 == 0 || this.state1 == "") {
1921 
+        if (this.state1 == 0 || this.state1 == '') {
1921 1922 
           this.state1 = ''
1922 1923 
           for (let i = 0; i < this.sick.length; i++) {
1923 1924 
             this.state1 = this.sick[0].id
1924 1925 
           }
1925 1926 
         }
1926 1927
1927 
-        if(this.departmentValue == "" || this.departmentValue == 0){
1928 
-          if(this.department.length > 0){
1928 
+        if (this.departmentValue == '' || this.departmentValue == 0) {
1929 
+          if (this.department.length > 0) {
1929 1930 
             this.departmentValue = this.department[0].id
1930 1931
1931 1932 
           }
1932 1933 
         }
1933 1934
1934 
-
1935 
-          getInitData().then(response => {
1936 
-            if (response.data.state == 0) {
1937 
-              this.$message.error(response.data.msg)
1938 
-              return false
1939 
-            } else {
1940 
-              this.onceTime = false
1941 
-              this.drugs = response.data.data.drugs
1942 
-              this.allDrugs = response.data.data.drugs
1943 
-              this.advices_template = response.data.data.advices_template
1944 
-              this.doctors = response.data.data.doctors
1945 
-              for (let i = 0; i < this.doctors.length; i++) {
1946 
-                if (this.doctors[i].user_type == 1) {
1947 
-                  this.doctors.splice(i, 1)
1948 
-                }
1935 
+        getInitData().then(response => {
1936 
+          if (response.data.state == 0) {
1937 
+            this.$message.error(response.data.msg)
1938 
+            return false
1939 
+          } else {
1940 
+            this.onceTime = false
1941 
+            this.drugs = response.data.data.drugs
1942 
+            this.allDrugs = response.data.data.drugs
1943 
+            this.advices_template = response.data.data.advices_template
1944 
+            this.doctors = response.data.data.doctors
1945 
+            for (let i = 0; i < this.doctors.length; i++) {
1946 
+              if (this.doctors[i].user_type == 1) {
1947 
+                this.doctors.splice(i, 1)
1949 1948 
               }
1950 
-              this.department = response.data.data.department
1951 
-              this.sick = response.data.data.sick
1952 
-              this.diagnoses = response.data.data.diagnose
1953 
-              this.additions = response.data.data.additions
1954 
-
1955 
-
1956 
-
1949 
+            }
1950 
+            this.department = response.data.data.department
1951 
+            this.sick = response.data.data.sick
1952 
+            this.diagnoses = response.data.data.diagnose
1953 
+            this.additions = response.data.data.additions
1957 1954
1955 
+            if (info.id > 0) {
1956 
+              this.doctorValue = info.doctor_id
1957 
+              this.departmentValue = info.departments
1958 
+            } else {
1959 
+              if (admin_info.id > 0 && admin_info.user_type == 2) {
1960 
+                this.doctorValue = admin_info.admin_user_id
1961 
+                this.departmentValue = this.department[0].id
1958 1962
1959 
-              if (info.id > 0) {
1960 
-                this.doctorValue = info.doctor_id
1961 
-                this.departmentValue = info.departments
1962 1963 
               } else {
1963 
-                if(admin_info.id > 0 && admin_info.user_type == 2){
1964 
-                  this.doctorValue = admin_info.admin_user_id
1965 
-                  this.departmentValue = this.department[0].id
1966 
-
1967 
-                }else{
1968 1964
1969 
-                  this.doctorValue = this.doctors[0].admin_user_id
1970 
-                  this.departmentValue = this.department[0].id
1965 
+                this.doctorValue = this.doctors[0].admin_user_id
1966 
+                this.departmentValue = this.department[0].id
1971 1967
1972 
-                }
1968 
+              }
1973 1969
1970 
+            }
1974 1971
1972 
+            if (info.register_type == 0) {
1973 
+              for (let i = 0; i < this.register.length; i++) {
1974 
+                this.register_type = this.register[0].value
1975 1975 
               }
1976 
+            } else {
1977 
+              this.register_type = info.register_type
1978 
+            }
1979 
+            this.diagnose = []
1976 1980
1977 
-              if (info.register_type == 0) {
1978 
-                for (let i = 0; i < this.register.length; i++) {
1979 
-                  this.register_type = this.register[0].value
1980 
-                }
1981 
+            if (info.id == 0) {
1982 
+              if (last_info.diagnosis.length == 0) {
1983 
+                this.diagnose = []
1981 1984 
               } else {
1982 
-                this.register_type = info.register_type
1983 
-              }
1984 
-              this.diagnose = []
1985 
-
1986 
-              if(info.id == 0){
1987 
-                if(last_info.diagnosis.length == 0){
1988 
-                  this.diagnose = []
1989 
-                }else{
1990 
-                  for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
1991 
-                    this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
1992 
-
1993 
-                  }
1994 
-                }
1985 
+                for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
1986 
+                  this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
1995 1987
1996 
-                if(last_info.sick_history == 0){
1997 
-                  this.state2 = ''
1998 
-                }else{
1999 
-                  this.state2 = last_info.sick_history
2000 1988 
                 }
1989 
+              }
2001 1990
1991 
+              if (last_info.sick_history == 0) {
1992 
+                this.state2 = ''
1993 
+              } else {
1994 
+                this.state2 = last_info.sick_history
1995 
+              }
2002 1996
2003 
-              }else{
2004 
-                this.state2 = info.sick_history
2005 
-                if (this.state2 == 0) {
2006 
-                  this.state2 = ''
2007 
-                }
2008 
-                if(info.diagnosis.length == 0){
2009 
-                  this.diagnose = []
2010 
-                }else{
2011 
-                  for(let i = 0; i < info.diagnosis.split(",").length;i++){
2012 
-                    this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
2013 
-
2014 
-                  }
1997 
+            } else {
1998 
+              this.state2 = info.sick_history
1999 
+              if (this.state2 == 0) {
2000 
+                this.state2 = ''
2001 
+              }
2002 
+              if (info.diagnosis.length == 0) {
2003 
+                this.diagnose = []
2004 
+              } else {
2005 
+                for (let i = 0; i < info.diagnosis.split(",").length; i++) {
2006 
+                  this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
2015 2007
2016 2008 
                 }
2017 2009
2018 2010 
               }
2019 2011
2012 
+            }
2020 2013
2021 
-
2022 
-              this.state1 = info.sick_type
2023 
-              if (this.state1 == 0 || this.state1 == "") {
2024 
-                this.state1 = ''
2025 
-                for (let i = 0; i < this.sick.length; i++) {
2026 
-                  this.state1 = this.sick[0].id
2027 
-                }
2014 
+            this.state1 = info.sick_type
2015 
+            if (this.state1 == 0 || this.state1 == '') {
2016 
+              this.state1 = ''
2017 
+              for (let i = 0; i < this.sick.length; i++) {
2018 
+                this.state1 = this.sick[0].id
2028 2019 
               }
2020 
+            }
2029 2021
2030 
-              if(this.departmentValue == "" || this.departmentValue == 0){
2031 
-                if(this.department.length > 0){
2032 
-                  this.departmentValue = this.department[0].id
2022 
+            if (this.departmentValue == '' || this.departmentValue == 0) {
2023 
+              if (this.department.length > 0) {
2024 
+                this.departmentValue = this.department[0].id
2033 2025
2034 
-                }
2035 2026 
               }
2036 
-
2037 2027 
             }
2038 
-          })
2028 
+
2029 
+          }
2030 
+        })
2039 2031
2040 2032 
       },
2041 2033 
       setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
 
@@ -2065,18 +2057,17 @@
2065 2057 
           this.doctorValue = info.doctor_id
2066 2058 
           this.departmentValue = info.departments
2067 2059 
         } else {
2068 
-          if(admin_info.id > 0 && admin_info.user_type == 2){
2060 
+          if (admin_info.id > 0 && admin_info.user_type == 2) {
2069 2061 
             this.doctorValue = admin_info.admin_user_id
2070 2062 
             this.departmentValue = this.department[0].id
2071 2063
2072 
-          }else{
2064 
+          } else {
2073 2065
2074 2066 
             this.doctorValue = this.doctors[0].admin_user_id
2075 2067 
             this.departmentValue = this.department[0].id
2076 2068
2077 2069 
           }
2078 2070
2079 
-
2080 2071 
         }
2081 2072
2082 2073 
         if (info.register_type == 0) {
 
@@ -2088,46 +2079,45 @@
2088 2079 
         }
2089 2080 
         this.diagnose = []
2090 2081
2091 
-        if(info.id == 0){
2092 
-          if(last_info.diagnosis.length == 0){
2082 
+        if (info.id == 0) {
2083 
+          if (last_info.diagnosis.length == 0) {
2093 2084 
             this.diagnose = []
2094 
-          }else{
2095 
-            for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
2096 
-              this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
2085 
+          } else {
2086 
+            for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
2087 
+              this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
2097 2088
2098 2089 
             }
2099 2090 
           }
2100 2091
2101 
-          if(last_info.sick_history == 0){
2092 
+          if (last_info.sick_history == 0) {
2102 2093 
             this.state2 = ''
2103 
-          }else{
2094 
+          } else {
2104 2095 
             this.state2 = last_info.sick_history
2105 2096 
           }
2106 2097
2107 
-
2108 
-        }else{
2098 
+        } else {
2109 2099 
           this.state2 = info.sick_history
2110 2100 
           if (this.state2 == 0) {
2111 2101 
             this.state2 = ''
2112 2102 
           }
2113 
-          if(info.diagnosis.length == 0){
2103 
+          if (info.diagnosis.length == 0) {
2114 2104 
             this.diagnose = []
2115 
-          }else{
2116 
-            for(let i = 0; i < info.diagnosis.split(",").length;i++){
2117 
-              this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
2105 
+          } else {
2106 
+            for (let i = 0; i < info.diagnosis.split(",").length; i++) {
2107 
+              this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
2118 2108 
             }
2119 2109 
           }
2120 2110 
         }
2121 2111 
         this.state1 = info.sick_type
2122 
-        if (this.state1 == 0 || this.state1 == "") {
2112 
+        if (this.state1 == 0 || this.state1 == '') {
2123 2113 
           this.state1 = ''
2124 2114 
           for (let i = 0; i < this.sick.length; i++) {
2125 2115 
             this.state1 = this.sick[0].id
2126 2116 
           }
2127 2117 
         }
2128 2118
2129 
-        if(this.departmentValue == "" || this.departmentValue == 0){
2130 
-          if(this.department.length > 0){
2119 
+        if (this.departmentValue == '' || this.departmentValue == 0) {
2120 
+          if (this.department.length > 0) {
2131 2121 
             this.departmentValue = this.department[0].id
2132 2122
2133 2123 
           }
 
@@ -2227,13 +2217,36 @@
2227 2217 
             }
2228 2218 
           }
2229 2219 
           for (let i = 0; i < this.prescriptions.length; i++) {
2230 
-              if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
2231 
-                this.$message.error('处方医疗类型不能为空')
2232 
-                return
2233 
-              }
2220 
+            if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
2221 
+              this.$message.error('处方医疗类型不能为空')
2222 
+              return
2223 
+            }
2234 2224 
           }
2235 2225 
           if (index == 1) {
2236 
-            for(let i =0; i < this.prescriptions.length; i++){
2226 
+            console.log(this.prescriptions)
2227 
+
2228 
+            for (let i = 0; i < this.prescriptions.length; i++) {
2229 
+              for(let b = 0; b < this.prescriptions[i].advices.length; b++){
2230 
+                if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
2231 
+                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，开非特病类型的药")
2232 
+                  return
2233 
+                }
2234 
+              }
2235 
+              for(let c = 0; c < this.prescriptions[i].project.length; c++){
2236 
+                if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 2  && this.prescriptions[i].project[c].project.disease_directory != 1) {
2237 
+                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，请开特病类型的项目")
2238 
+                  return
2239 
+                }
2240 
+
2241 
+                if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 3  && this.prescriptions[i].project[c].good_info.is_special_diseases != 1) {
2242 
+                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，请开特病类型的耗材")
2243 
+                  return
2244 
+                }
2245 
+              }
2246 
+            }
2247 
+
2248 
+
2249 
+            for (let i = 0; i < this.prescriptions.length; i++) {
2237 2250 
               if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length == 0) {
2238 2251 
                 this.$message.error('处方内容不能为空')
2239 2252 
                 return
 
@@ -2243,7 +2256,7 @@
2243 2256 
             let params = {
2244 2257 
               p_type: 2,
2245 2258 
               patient_id: this.patientInfo.id,
2246 
-              diagnose: this.diagnose.join(","),
2259 
+              diagnose: this.diagnose.join(','),
2247 2260 
               sick_type: this.state1,
2248 2261 
               sick_history: this.state2,
2249 2262 
               doctor: this.doctorValue,
 
@@ -2410,9 +2423,10 @@
2410 2423
2411 2424 
         this.tabIndex = this.prescriptions.length
2412 2425
2426 
+        var str = this.prescriptions[this.prescriptions.length - 1].name
2427 
+        this.tabIndex = parseInt(str.charAt(str.length - 1))
2413 2428 
         ++this.tabIndex
2414 2429 
         let newTabName = '处方' + this.tabIndex
2415 
-
2416 2430 
         var nowDate = new Date()
2417 2431 
         var nowYear = nowDate.getFullYear()
2418 2432 
         var nowMonth = nowDate.getMonth() + 1
 
@@ -2662,45 +2676,43 @@
2662 2676 
       comfirm() {
2663 2677
2664 2678 
         if (this.curDrugs.length > 0) {
2665 
-            for (let i = 0; i < this.curDrugs.length; i++) {
2666 
-              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2667 
-                this.$message.error('该处方属于特病类型处方，开非特病类型的药')
2668 
-                return
2669 
-              }
2670 
-
2679 
+          for (let i = 0; i < this.curDrugs.length; i++) {
2680 
+            if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2681 
+              this.$message.error('该处方属于特病类型处方，开非特病类型的药')
2682 
+              return
2671 2683 
             }
2684 
+
2685 
+          }
2672 2686 
         }
2673 2687 
         if (this.teamList.length > 0) {
2674 
-            for (let i = 0; i < this.teamList.length; i++) {
2675 
-              if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
2676 
-                this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
2677 
-                // return
2678 
-              }
2679 
-
2688 
+          for (let i = 0; i < this.teamList.length; i++) {
2689 
+            if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
2690 
+              this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
2691 
+              // return
2680 2692 
             }
2681 2693
2682 
-            let arr = this.teamList
2683 
-            let newArr = []
2684 
-            arr.map(item => {
2685 
-              if(this.curPrescriptions.med_type != 14){
2686 
-                newArr.push(item)
2687 
-              }
2688 
-              if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
2689 
-                newArr.push(item)
2690 
-              }
2691 
-            })
2692 
-            this.teamList = newArr
2693 
-        }
2694 
-
2694 
+          }
2695 2695
2696 
+          let arr = this.teamList
2697 
+          let newArr = []
2698 
+          arr.map(item => {
2699 
+            if (this.curPrescriptions.med_type != 14) {
2700 
+              newArr.push(item)
2701 
+            }
2702 
+            if (this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1) {
2703 
+              newArr.push(item)
2704 
+            }
2705 
+          })
2706 
+          this.teamList = newArr
2707 
+        }
2696 2708
2697 2709 
         if (this.curDrugs.length == 0) {
2698 
-            for (let i = 0; i < this.curDrugs.length; i++) {
2699 
-              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2700 
-                this.$message.error('该处方属于特病类型处方，开非特病类型的药')
2701 
-                return
2702 
-              }
2710 
+          for (let i = 0; i < this.curDrugs.length; i++) {
2711 
+            if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2712 
+              this.$message.error('该处方属于特病类型处方，开非特病类型的药')
2713 
+              return
2703 2714 
             }
2715 
+          }
2704 2716 
         }
2705 2717
2706 2718 
         // if (this.curPrescriptions.order_status == 2) {
 
@@ -2731,8 +2743,8 @@
2731 2743
2732 2744 
           return
2733 2745 
         }
2734 
-        console.log('this.teamList',this.teamList)
2735 
-        console.log('this.curPrescriptions.project',this.curPrescriptions.project)
2746 
+        console.log('this.teamList', this.teamList)
2747 
+        console.log('this.curPrescriptions.project', this.curPrescriptions.project)
2736 2748 
         for (let i = 0; i < this.teamList.length; i++) {
2737 2749 
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
2738 2750 
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
 
@@ -2830,7 +2842,7 @@
2830 2842 
                   medical_insurance_number: temp[b].medical_insurance_number,
2831 2843 
                   drug: temp[b],
2832 2844 
                   groupno: index + temp_index,
2833 
-                  hosp_appr_flag:"1",
2845 
+                  hosp_appr_flag: '1'
2834 2846 
                 }
2835 2847
2836 2848 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
 
@@ -2843,17 +2855,6 @@
2843 2855
2844 2856 
             }
2845 2857
2846 
-            // if(this.activeName == 2){
2847 
-            //
2848 
-            //    for(let i = 0; i<temp2.length;i++){
2849 
-            //     for(let j=0;j<this.hisList.length;j++){
2850 
-            //         if(temp2[i].id == this.hisList[j].project_id){
2851 
-            //            temp2[i].total =  this.hisList[j].number
2852 
-            //         }
2853 
-            //     }
2854 
-            //    }
2855 
-            //  }
2856 
-
2857 2858 
             if (temp2.length > 0) {
2858 2859 
               for (let b = 0; b < temp2.length; b++) {
2859 2860 
                 let obj = {
 
@@ -2870,12 +2871,21 @@
2870 2871 
                   remark: '',
2871 2872 
                   medical_code: temp2[b].medical_code,
2872 2873 
                   unit: temp2[b].unit,
2873 
-                  type: temp2[b].type,
2874 
+                  type: temp2[b].type
2875 
+                }
2876 
+
2877 
+                if (temp2[b].type == 2){
2878 
+                  obj['project'] = temp2[b].project
2879 
+
2880 
+                }else if(temp2[b].type == 3){
2881 
+
2882 
+                  obj['good_info'] = temp2[b].good_info
2883 
+
2874 2884 
                 }
2875 
-                if(temp2[b].team_id == undefined){
2876 
-                  obj["team_id"] = 0
2877 
-                }else{
2878 
-                  obj["team_id"] = temp2[b].team_id
2885 
+                if (temp2[b].team_id == undefined) {
2886 
+                  obj['team_id'] = 0
2887 
+                } else {
2888 
+                  obj['team_id'] = temp2[b].team_id
2879 2889 
                 }
2880 2890 
                 if (obj.total == 0 || obj.total == undefined) {
2881 2891 
                   obj.total = 1
 
@@ -2904,17 +2914,17 @@
2904 2914 
         this.teamList = row
2905 2915 
       },
2906 2916 
       selectChange(selection, row) {
2907 
-        console.log('row',row)
2908 
-        if(row.total <= 0){
2909 
-          if(row.type == 3){
2917 
+        console.log('row', row)
2918 
+        if (row.total <= 0) {
2919 
+          if (row.type == 3) {
2910 2920 
             if (selection) {
2911 2921 
               selection.forEach(row => {
2912 
-                if(row.total <= 0){
2913 
-                  this.$refs.tables.toggleRowSelection(row);
2922 
+                if (row.total <= 0) {
2923 
+                  this.$refs.tables.toggleRowSelection(row)
2914 2924 
                 }
2915 
-              });
2925 
+              })
2916 2926 
             } else {
2917 
-              this.$refs.tables.clearSelection();
2927 
+              this.$refs.tables.clearSelection()
2918 2928 
             }
2919 2929 
             this.$message.error(row.project_name + '库存不足')
2920 2930 
             return
 
@@ -2942,7 +2952,8 @@
2942 2952 
                 unit: project[i].unit,
2943 2953 
                 type: 2,
2944 2954 
                 total: project[i].total,
2945 
-                is_special_diseases: project[i].disease_directory
2955 
+                is_special_diseases: project[i].disease_directory,
2956 
+                project: project[i],
2946 2957 
               }
2947 2958
2948 2959 
               this.tabProject.push(obj)
 
@@ -2965,7 +2976,8 @@
2965 2976 
                 unit: this.getGoodUnit(good_info[i].good_unit),
2966 2977 
                 type: 3,
2967 2978 
                 total: good_info[i].total,
2968 
-                is_special_diseases: good_info[i].is_special_diseases
2979 
+                is_special_diseases: good_info[i].is_special_diseases,
2980 
+                good_info: good_info[i],
2969 2981 
               }
2970 2982 
               this.tabProject.push(obj)
2971 2983 
             }
 
@@ -3037,11 +3049,11 @@
3037 3049 
         // var idstr = res.join(',')
3038 3050
3039 3051 
         let teamList = []
3040 
-        for(let i = 0;i < row.length; i++){
3052 
+        for (let i = 0; i < row.length; i++) {
3041 3053 
           let team_id = row[i].id
3042 3054 
           console.log(team_id)
3043 3055 
           const params = {
3044 
-            project_id:  row[i].item_id
3056 
+            project_id: row[i].item_id
3045 3057 
           }
3046 3058 
           getPojectListById(params).then(response => {
3047 3059 
             if (response.data.state == 1) {
 
@@ -3064,7 +3076,8 @@
3064 3076 
                     unit: project[i].project.unit,
3065 3077 
                     type: project[i].type,
3066 3078 
                     is_special_diseases: project[i].project.disease_directory,
3067 
-                    team_id:team_id
3079 
+                    team_id: team_id,
3080 
+                    project:project[i].project,
3068 3081 
                   }
3069 3082 
                   if (obj.cus_total == 0 || obj.cus_total == undefined) {
3070 3083 
                     obj.cus_total = 1
 
@@ -3072,13 +3085,13 @@
3072 3085
3073 3086 
                   teamList.push(obj)
3074 3087 
                 } else if (project[i].type == 3 && project[i].status == 1) {
3075 
-                  if(project[i].good_info.total <= 0){
3088 
+                  if (project[i].good_info.total <= 0) {
3076 3089 
                     num++
3077 
-                    this.$refs.tabProjectTeam.toggleRowSelection(row);
3090 
+                    this.$refs.tabProjectTeam.toggleRowSelection(row)
3078 3091 
                     this.$message.error(project[i].good_info.good_name + '库存不足')
3079 3092 
                   }
3080 
-                  if(num > 0){
3081 
-                    this.$refs.tabProjectTeam.clearSelection();
3093 
+                  if (num > 0) {
3094 
+                    this.$refs.tabProjectTeam.clearSelection()
3082 3095 
                   }
3083 3096 
                   let obj = {
3084 3097 
                     id: project[i].project_id,
 
@@ -3095,7 +3108,8 @@
3095 3108 
                     unit: project[i].good_info.unit,
3096 3109 
                     type: project[i].type,
3097 3110 
                     is_special_diseases: project[i].good_info.is_special_diseases,
3098 
-                    team_id:team_id
3111 
+                    team_id: team_id,
3112 
+                    good_info: project[i].good_info,
3099 3113
3100 3114 
                   }
3101 3115 
                   if (obj.cus_total == 0 || obj.cus_total == undefined) {
 
@@ -3111,10 +3125,6 @@
3111 3125 
           })
3112 3126 
         }
3113 3127
3114 
-
3115 
-
3116 
-
3117 
-
3118 3128 
       }, changeDoctor(val) {
3119 3129 
         for (let i = 0; i < this.doctors.length; i++) {
3120 3130 
           if (this.doctors[i].admin_user_id == this.doctorValue) {

+ 6 - 2
src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue Visa fil 

@@ -307,7 +307,7 @@
307 307 
           }
308 308 
           for (let b = 0; b < prescription.project.length; b++) {
309 309 
             if(prescription.project[b].type == 2){
310 
-              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
310 
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
311 311 
                 prescription.project.splice(b--,1)
312 312 
               }
313 313 
             }else if(prescription.project[b].type == 3){
 
@@ -376,17 +376,20 @@
376 376
377 377 
                 // medical_code:prescription.project[b].project.medical_code,
378 378 
               };
379 
-
380 379 
               if(prescription.project[b].type == 2){
381 380 
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
382 381 
                 obj['medical_code'] =  prescription.project[b].project.medical_code
383 382 
                 obj['project_name'] =  prescription.project[b].project.project_name
384 383 
                 obj['price'] = prescription.project[b].project.price
384 
+                obj['project']=prescription.project[b].project
385 
+
385 386 
               }else if(prescription.project[b].type == 3){
386 387 
                 obj['statistical_classification'] = ""
387 388 
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
388 389 
                 obj['project_name'] =  prescription.project[b].good_info.good_name
389 390 
                 obj['price'] = prescription.project[b].good_info.packing_price
391 
+                obj['good_info']=prescription.project[b].good_info
392 
+
390 393 
               }
391 394
392 395 
               tempProject.push(obj)
 
@@ -397,6 +400,7 @@
397 400 
               project: tempProject,
398 401 
               addition:tempAddition,
399 402 
               order_status:0,
403 
+              med_type: parseInt(prescription.med_type)
400 404 
               // type: type,
401 405 
             };
402 406 
             prescriptions.push(obj)

+ 123 - 94
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Visa fil 

@@ -295,7 +295,7 @@
295 295 
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
296 296 
   import deskPrescription from './components/deskPrescription'
297 297 
   import deskRecord from './components/deskRecord'
298 
-  import { createCaseHistory, getPatientInfo, getSchedulePatientList,getMonthHisPateintInfo } from '@/api/his/his'
298 
+  import { createCaseHistory, getMonthHisPateintInfo, getPatientInfo, getSchedulePatientList } from '@/api/his/his'
299 299 
   import { getDictionaryDataConfig } from '@/utils/data'
300 300 
   import medicalRecord from './components/medicalRecord'
301 301 
   import saveRecordTemplate from './components/saveRecordTemplate'
 
@@ -918,11 +918,15 @@
918 918 
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
919 919 
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
920 920 
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
921 
+                obj['project'] =  project_month_prescriptions.project[a].project
922 
+
921 923
922 924 
               } else if (project_month_prescriptions.project[a].type == 3) {
923 925 
                 obj['statistical_classification'] = ''
924 926 
                 obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
925 927 
                 obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
928 
+                obj['good_info'] =  project_month_prescriptions.project[a].good_info
929 
+
926 930
927 931 
               }
928 932 
 
@@ -1354,7 +1358,7 @@
1354 1358 
                     id: prescription.advices[b].drug_id,
1355 1359 
                     drug: prescription.advices[b].drug,
1356 1360 
                     groupno: prescription.advices[b].groupno,
1357 
-                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
1361 
+                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
1358 1362
1359 1363 
                   }
1360 1364 
                   tempAdvice.push(obj)
 
@@ -1376,7 +1380,7 @@
1376 1380 
                     remark: prescription.project[b].remark,
1377 1381 
                     medical_code: prescription.project[b].project.medical_code,
1378 1382 
                     unit: prescription.project[b].project.unit,
1379 
-                    type: prescription.project[b].type,
1383 
+                    type: prescription.project[b].type
1380 1384
1381 1385 
                   }
1382 1386 
 
@@ -1384,11 +1388,14 @@
1384 1388 
                     obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1385 1389 
                     obj['medical_code'] = prescription.project[b].project.medical_code
1386 1390 
                     obj['project_name'] = prescription.project[b].project.project_name
1391 
+                    obj['project'] = prescription.project[b].project
1387 1392
1388 1393 
                   } else if (prescription.project[b].type == 3) {
1389 1394 
                     obj['statistical_classification'] = ''
1390 1395 
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1391 1396 
                     obj['project_name'] = prescription.project[b].good_info.good_name
1397 
+                    obj['good_info'] = prescription.project[b].good_info
1398 
+
1392 1399 
                   }
1393 1400 
                   tempProject.push(obj)
1394 1401 
                 }
 
@@ -1437,29 +1444,26 @@
1437 1444
1438 1445 
               if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
1439 1446 
                 for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
1440 
-                  var prescription = response.data.data.sch_prescriptions[i];
1447 
+                  var prescription = response.data.data.sch_prescriptions[i]
1441 1448 
                   for (let b = 0; b < prescription.advices.length; b++) {
1442 1449 
                     console.log(prescription.advices[b].drug.is_special_diseases)
1443 
-                    if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
1444 
-                      prescription.advices.splice(b--,1)
1450 
+                    if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
1451 
+                      prescription.advices.splice(b--, 1)
1445 1452 
                     }
1446 1453 
                   }
1447 1454 
                   for (let b = 0; b < prescription.project.length; b++) {
1448 
-                    if(prescription.project[b].type == 2){
1449 
-                      if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
1450 
-                        prescription.project.splice(b--,1)
1455 
+                    if (prescription.project[b].type == 2) {
1456 
+                      if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
1457 
+                        prescription.project.splice(b--, 1)
1451 1458 
                       }
1452 
-                    }else if(prescription.project[b].type == 3){
1453 
-                      if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
1454 
-                        prescription.project.splice(b--,1)
1459 
+                    } else if (prescription.project[b].type == 3) {
1460 
+                      if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
1461 
+                        prescription.project.splice(b--, 1)
1455 1462 
                       }
1456 1463 
                     }
1457 1464 
                   }
1458 1465 
                 }
1459 1466
1460 
-
1461 
-
1462 
-
1463 1467 
                 for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
1464 1468 
                   var prescription = response.data.data.sch_prescriptions[i]
1465 1469 
                   let tempAdvice = []
 
@@ -1485,8 +1489,7 @@
1485 1489 
                       id: prescription.advices[b].drug_id,
1486 1490 
                       drug: prescription.advices[b].drug,
1487 1491 
                       groupno: index,
1488 
-                      hosp_appr_flag:"1",
1489 
-
1492 
+                      hosp_appr_flag: '1'
1490 1493
1491 1494 
                     }
1492 1495 
 
@@ -1531,7 +1534,9 @@
1531 1534 
                       remark: prescription.project[b].remark,
1532 1535 
                       medical_code: prescription.project[b].project.medical_code,
1533 1536 
                       unit: prescription.project[b].project.unit,
1534 
-                      type: prescription.project[b].type
1537 
+                      type: prescription.project[b].type,
1538 
+
1539 
+
1535 1540
1536 1541 
                     }
1537 1542 
 
@@ -1540,13 +1545,14 @@
1540 1545 
                       obj['medical_code'] = prescription.project[b].project.medical_code
1541 1546 
                       obj['project_name'] = prescription.project[b].project.project_name
1542 1547 
                       obj['price'] = prescription.project[b].project.price
1548 
+                      obj['project'] =  prescription.project[b].project
1543 1549
1544 1550 
                     } else if (prescription.project[b].type == 3) {
1545 1551 
                       obj['statistical_classification'] = ''
1546 1552 
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1547 1553 
                       obj['project_name'] = prescription.project[b].good_info.good_name
1548 1554 
                       obj['price'] = prescription.project[b].good_info.packing_price
1549 
-
1555 
+                      obj['good_info'] =  prescription.project[b].good_info
1550 1556 
                     }
1551 1557 
                     tempProject.push(obj)
1552 1558 
                   }
 
@@ -1737,8 +1743,7 @@
1737 1743 
                           id: prescription.advices[b].drug_id,
1738 1744 
                           drug: prescription.advices[b].drug,
1739 1745 
                           groupno: prescription.advices[b].groupno,
1740 
-                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
1741 
-
1746 
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
1742 1747
1743 1748 
                         }
1744 1749 
                         tempAdvice.push(obj)
 
@@ -1767,11 +1772,14 @@
1767 1772 
                           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1768 1773 
                           obj['medical_code'] = prescription.project[b].project.medical_code
1769 1774 
                           obj['project_name'] = prescription.project[b].project.project_name
1775 
+                          obj['project'] =  prescription.project[b].project
1770 1776
1771 1777 
                         } else if (prescription.project[b].type == 3) {
1772 1778 
                           obj['statistical_classification'] = ''
1773 1779 
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1774 1780 
                           obj['project_name'] = prescription.project[b].good_info.good_name
1781 
+                          obj['good_info'] =  prescription.project[b].good_info
1782 
+
1775 1783 
                         }
1776 1784 
                         tempProject.push(obj)
1777 1785 
                       }
 
@@ -1821,27 +1829,26 @@
1821 1829 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
1822 1830
1823 1831 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
1824 
-                        var prescription = response.data.data.sch_prescriptions[i];
1832 
+                        var prescription = response.data.data.sch_prescriptions[i]
1825 1833 
                         for (let b = 0; b < prescription.advices.length; b++) {
1826 1834 
                           console.log(prescription.advices[b].drug.is_special_diseases)
1827 
-                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
1828 
-                            prescription.advices.splice(b--,1)
1835 
+                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
1836 
+                            prescription.advices.splice(b--, 1)
1829 1837 
                           }
1830 1838 
                         }
1831 1839 
                         for (let b = 0; b < prescription.project.length; b++) {
1832 
-                          if(prescription.project[b].type == 2){
1833 
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
1834 
-                              prescription.project.splice(b--,1)
1840 
+                          if (prescription.project[b].type == 2) {
1841 
+                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
1842 
+                              prescription.project.splice(b--, 1)
1835 1843 
                             }
1836 
-                          }else if(prescription.project[b].type == 3){
1837 
-                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
1838 
-                              prescription.project.splice(b--,1)
1844 
+                          } else if (prescription.project[b].type == 3) {
1845 
+                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
1846 
+                              prescription.project.splice(b--, 1)
1839 1847 
                             }
1840 1848 
                           }
1841 1849 
                         }
1842 1850 
                       }
1843 1851
1844 
-
1845 1852 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
1846 1853 
                         var prescription = response.data.data.sch_prescriptions[i]
1847 1854 
                         let tempAdvice = []
 
@@ -1867,8 +1874,7 @@
1867 1874 
                             id: prescription.advices[b].drug_id,
1868 1875 
                             drug: prescription.advices[b].drug,
1869 1876 
                             groupno: index,
1870 
-                            hosp_appr_flag: "1",
1871 
-
1877 
+                            hosp_appr_flag: '1'
1872 1878
1873 1879 
                           }
1874 1880 
                           console.log('看看数据1：')
 
@@ -1922,12 +1928,16 @@
1922 1928 
                             obj['medical_code'] = prescription.project[b].project.medical_code
1923 1929 
                             obj['project_name'] = prescription.project[b].project.project_name
1924 1930 
                             obj['price'] = prescription.project[b].project.price
1931 
+                            obj['project'] =  prescription.project[b].project
1932 
+
1925 1933
1926 1934 
                           } else if (prescription.project[b].type == 3) {
1927 1935 
                             obj['statistical_classification'] = ''
1928 1936 
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1929 1937 
                             obj['project_name'] = prescription.project[b].good_info.good_name
1930 1938 
                             obj['price'] = prescription.project[b].good_info.packing_price
1939 
+                            obj['good_info'] =  prescription.project[b].good_info
1940 
+
1931 1941
1932 1942 
                           }
1933 1943 
                           tempProject.push(obj)
 
@@ -2216,8 +2226,7 @@
2216 2226 
                           id: prescription.advices[b].drug_id,
2217 2227 
                           drug: prescription.advices[b].drug,
2218 2228 
                           groupno: prescription.advices[b].groupno,
2219 
-                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
2220 
-
2229 
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
2221 2230
2222 2231 
                         }
2223 2232 
                         tempAdvice.push(obj)
 
@@ -2246,11 +2255,15 @@
2246 2255 
                           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2247 2256 
                           obj['medical_code'] = prescription.project[b].project.medical_code
2248 2257 
                           obj['project_name'] = prescription.project[b].project.project_name
2258 
+                          obj['project'] =  prescription.project[b].project
2259 
+
2249 2260
2250 2261 
                         } else if (prescription.project[b].type == 3) {
2251 2262 
                           obj['statistical_classification'] = ''
2252 2263 
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2253 2264 
                           obj['project_name'] = prescription.project[b].good_info.good_name
2265 
+                          obj['good_info'] =  prescription.project[b].good_info
2266 
+
2254 2267 
                         }
2255 2268 
                         tempProject.push(obj)
2256 2269 
                       }
 
@@ -2292,27 +2305,26 @@
2292 2305
2293 2306 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
2294 2307 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
2295 
-                        var prescription = response.data.data.sch_prescriptions[i];
2308 
+                        var prescription = response.data.data.sch_prescriptions[i]
2296 2309 
                         for (let b = 0; b < prescription.advices.length; b++) {
2297 2310 
                           console.log(prescription.advices[b].drug.is_special_diseases)
2298 
-                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
2299 
-                            prescription.advices.splice(b--,1)
2311 
+                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
2312 
+                            prescription.advices.splice(b--, 1)
2300 2313 
                           }
2301 2314 
                         }
2302 2315 
                         for (let b = 0; b < prescription.project.length; b++) {
2303 
-                          if(prescription.project[b].type == 2){
2304 
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
2305 
-                              prescription.project.splice(b--,1)
2316 
+                          if (prescription.project[b].type == 2) {
2317 
+                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
2318 
+                              prescription.project.splice(b--, 1)
2306 2319 
                             }
2307 
-                          }else if(prescription.project[b].type == 3){
2308 
-                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
2309 
-                              prescription.project.splice(b--,1)
2320 
+                          } else if (prescription.project[b].type == 3) {
2321 
+                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
2322 
+                              prescription.project.splice(b--, 1)
2310 2323 
                             }
2311 2324 
                           }
2312 2325 
                         }
2313 2326 
                       }
2314 2327
2315 
-
2316 2328 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
2317 2329 
                         var prescription = response.data.data.sch_prescriptions[i]
2318 2330 
                         let tempAdvice = []
 
@@ -2338,9 +2350,7 @@
2338 2350 
                             id: prescription.advices[b].drug_id,
2339 2351 
                             drug: prescription.advices[b].drug,
2340 2352 
                             groupno: index,
2341 
-                            hosp_appr_flag: "1",
2342 
-
2343 
-
2353 
+                            hosp_appr_flag: '1'
2344 2354
2345 2355 
                           }
2346 2356 
                           console.log('看看数据2：')
 
@@ -2391,12 +2401,16 @@
2391 2401 
                             obj['medical_code'] = prescription.project[b].project.medical_code
2392 2402 
                             obj['project_name'] = prescription.project[b].project.project_name
2393 2403 
                             obj['price'] = prescription.project[b].project.price
2404 
+                            obj['project'] =  prescription.project[b].project
2405 
+
2394 2406
2395 2407 
                           } else if (prescription.project[b].type == 3) {
2396 2408 
                             obj['statistical_classification'] = ''
2397 2409 
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2398 2410 
                             obj['project_name'] = prescription.project[b].good_info.good_name
2399 2411 
                             obj['price'] = prescription.project[b].good_info.packing_price
2412 
+                            obj['good_info'] =  prescription.project[b].good_info
2413 
+
2400 2414
2401 2415 
                           }
2402 2416 
                           tempProject.push(obj)
 
@@ -2675,8 +2689,7 @@
2675 2689 
                         id: prescription.advices[b].drug_id,
2676 2690 
                         drug: prescription.advices[b].drug,
2677 2691 
                         groupno: prescription.advices[b].groupno,
2678 
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
2679 
-
2692 
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
2680 2693
2681 2694 
                       }
2682 2695 
                       tempAdvice.push(obj)
 
@@ -2705,11 +2718,15 @@
2705 2718 
                         obj['statistical_classification'] = prescription.project[b].project.statistical_classification
2706 2719 
                         obj['medical_code'] = prescription.project[b].project.medical_code
2707 2720 
                         obj['project_name'] = prescription.project[b].project.project_name
2721 
+                        obj['project'] =  prescription.project[b].project
2722 
+
2708 2723
2709 2724 
                       } else if (prescription.project[b].type == 3) {
2710 2725 
                         obj['statistical_classification'] = ''
2711 2726 
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2712 2727 
                         obj['project_name'] = prescription.project[b].good_info.good_name
2728 
+                        obj['good_info'] =  prescription.project[b].good_info
2729 
+
2713 2730 
                       }
2714 2731 
                       tempProject.push(obj)
2715 2732 
                     }
 
@@ -2751,27 +2768,26 @@
2751 2768
2752 2769 
                   if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
2753 2770 
                     for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
2754 
-                      var prescription = response.data.data.sch_prescriptions[i];
2771 
+                      var prescription = response.data.data.sch_prescriptions[i]
2755 2772 
                       for (let b = 0; b < prescription.advices.length; b++) {
2756 2773 
                         console.log(prescription.advices[b].drug.is_special_diseases)
2757 
-                        if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
2758 
-                          prescription.advices.splice(b--,1)
2774 
+                        if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
2775 
+                          prescription.advices.splice(b--, 1)
2759 2776 
                         }
2760 2777 
                       }
2761 2778 
                       for (let b = 0; b < prescription.project.length; b++) {
2762 
-                        if(prescription.project[b].type == 2){
2763 
-                          if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
2764 
-                            prescription.project.splice(b--,1)
2779 
+                        if (prescription.project[b].type == 2) {
2780 
+                          if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
2781 
+                            prescription.project.splice(b--, 1)
2765 2782 
                           }
2766 
-                        }else if(prescription.project[b].type == 3){
2767 
-                          if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
2768 
-                            prescription.project.splice(b--,1)
2783 
+                        } else if (prescription.project[b].type == 3) {
2784 
+                          if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
2785 
+                            prescription.project.splice(b--, 1)
2769 2786 
                           }
2770 2787 
                         }
2771 2788 
                       }
2772 2789 
                     }
2773 2790
2774 
-
2775 2791 
                     for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
2776 2792 
                       var prescription = response.data.data.sch_prescriptions[i]
2777 2793 
                       let tempAdvice = []
 
@@ -2797,7 +2813,7 @@
2797 2813 
                           id: prescription.advices[b].drug_id,
2798 2814 
                           drug: prescription.advices[b].drug,
2799 2815 
                           groupno: index,
2800 
-                          hosp_appr_flag: "1",
2816 
+                          hosp_appr_flag: '1'
2801 2817
2802 2818 
                         }
2803 2819 
                         console.log('看看数据3：')
 
@@ -2848,12 +2864,16 @@
2848 2864 
                           obj['medical_code'] = prescription.project[b].project.medical_code
2849 2865 
                           obj['project_name'] = prescription.project[b].project.project_name
2850 2866 
                           obj['price'] = prescription.project[b].project.price
2867 
+                          obj['project'] =  prescription.project[b].project
2868 
+
2851 2869
2852 2870 
                         } else if (prescription.project[b].type == 3) {
2853 2871 
                           obj['statistical_classification'] = ''
2854 2872 
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
2855 2873 
                           obj['project_name'] = prescription.project[b].good_info.good_name
2856 2874 
                           obj['price'] = prescription.project[b].good_info.packing_price
2875 
+                          obj['good_info'] =  prescription.project[b].good_info
2876 
+
2857 2877
2858 2878 
                         }
2859 2879 
                         tempProject.push(obj)
 
@@ -3030,7 +3050,6 @@
3030 3050 
           }
3031 3051 
         } else {
3032 3052
3033 
-
3034 3053 
           var nowDate = new Date()
3035 3054 
           var nowYear = nowDate.getFullYear()
3036 3055 
           var nowMonth = nowDate.getMonth() + 1
 
@@ -3095,8 +3114,7 @@
3095 3114 
               'p_type': 2
3096 3115 
             }
3097 3116
3098 
-
3099 
-            if(this.current_tab == "day"){
3117 
+            if (this.current_tab == 'day') {
3100 3118
3101 3119 
               getPatientInfo(params).then(response => {
3102 3120 
                 if (response.data.state == 0) {
 
@@ -3194,8 +3212,7 @@
3194 3212 
                           id: prescription.advices[b].drug_id,
3195 3213 
                           drug: prescription.advices[b].drug,
3196 3214 
                           groupno: prescription.advices[b].groupno,
3197 
-                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
3198 
-
3215 
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
3199 3216
3200 3217 
                         }
3201 3218 
                         tempAdvice.push(obj)
 
@@ -3224,11 +3241,15 @@
3224 3241 
                           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
3225 3242 
                           obj['medical_code'] = prescription.project[b].project.medical_code
3226 3243 
                           obj['project_name'] = prescription.project[b].project.project_name
3244 
+                          obj['project'] =  prescription.project[b].project
3245 
+
3227 3246
3228 3247 
                         } else if (prescription.project[b].type == 3) {
3229 3248 
                           obj['statistical_classification'] = ''
3230 3249 
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
3231 3250 
                           obj['project_name'] = prescription.project[b].good_info.good_name
3251 
+                          obj['good_info'] =  prescription.project[b].good_info
3252 
+
3232 3253 
                         }
3233 3254 
                         tempProject.push(obj)
3234 3255 
                       }
 
@@ -3277,27 +3298,26 @@
3277 3298
3278 3299 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
3279 3300 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
3280 
-                        var prescription = response.data.data.sch_prescriptions[i];
3301 
+                        var prescription = response.data.data.sch_prescriptions[i]
3281 3302 
                         for (let b = 0; b < prescription.advices.length; b++) {
3282 3303 
                           console.log(prescription.advices[b].drug.is_special_diseases)
3283 
-                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
3284 
-                            prescription.advices.splice(b--,1)
3304 
+                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
3305 
+                            prescription.advices.splice(b--, 1)
3285 3306 
                           }
3286 3307 
                         }
3287 3308 
                         for (let b = 0; b < prescription.project.length; b++) {
3288 
-                          if(prescription.project[b].type == 2){
3289 
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
3290 
-                              prescription.project.splice(b--,1)
3309 
+                          if (prescription.project[b].type == 2) {
3310 
+                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
3311 
+                              prescription.project.splice(b--, 1)
3291 3312 
                             }
3292 
-                          }else if(prescription.project[b].type == 3){
3293 
-                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
3294 
-                              prescription.project.splice(b--,1)
3313 
+                          } else if (prescription.project[b].type == 3) {
3314 
+                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
3315 
+                              prescription.project.splice(b--, 1)
3295 3316 
                             }
3296 3317 
                           }
3297 3318 
                         }
3298 3319 
                       }
3299 3320
3300 
-
3301 3321 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
3302 3322 
                         var prescription = response.data.data.sch_prescriptions[i]
3303 3323 
                         let tempAdvice = []
 
@@ -3323,7 +3343,7 @@
3323 3343 
                             id: prescription.advices[b].drug_id,
3324 3344 
                             drug: prescription.advices[b].drug,
3325 3345 
                             groupno: index,
3326 
-                            hosp_appr_flag: "1",
3346 
+                            hosp_appr_flag: '1'
3327 3347
3328 3348 
                           }
3329 3349 
                           console.log('看看数据4：')
 
@@ -3374,12 +3394,16 @@
3374 3394 
                             obj['medical_code'] = prescription.project[b].project.medical_code
3375 3395 
                             obj['project_name'] = prescription.project[b].project.project_name
3376 3396 
                             obj['price'] = prescription.project[b].project.price
3397 
+                            obj['project'] =  prescription.project[b].project
3398 
+
3377 3399
3378 3400 
                           } else if (prescription.project[b].type == 3) {
3379 3401 
                             obj['statistical_classification'] = ''
3380 3402 
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
3381 3403 
                             obj['project_name'] = prescription.project[b].good_info.good_name
3382 3404 
                             obj['price'] = prescription.project[b].good_info.packing_price
3405 
+                            obj['good_info'] =  prescription.project[b].good_info
3406 
+
3383 3407
3384 3408 
                           }
3385 3409 
                           tempProject.push(obj)
 
@@ -3562,7 +3586,7 @@
3562 3586 
                 }
3563 3587 
               })
3564 3588
3565 
-            }else{
3589 
+            } else {
3566 3590
3567 3591 
               getMonthHisPateintInfo(params).then(response => {
3568 3592 
                 if (response.data.state == 0) {
 
@@ -3648,7 +3672,7 @@
3648 3672 
               'end_time': moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
3649 3673 
               'p_type': 2
3650 3674 
             }
3651 
-            if(this.current_tab == "day") {
3675 
+            if (this.current_tab == 'day') {
3652 3676
3653 3677 
               getPatientInfo(params).then(response => {
3654 3678 
                 if (response.data.state == 0) {
 
@@ -3741,8 +3765,7 @@
3741 3765 
                           id: prescription.advices[b].drug_id,
3742 3766 
                           drug: prescription.advices[b].drug,
3743 3767 
                           groupno: prescription.advices[b].groupno,
3744 
-                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
3745 
-
3768 
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
3746 3769
3747 3770 
                         }
3748 3771 
                         tempAdvice.push(obj)
 
@@ -3771,11 +3794,15 @@
3771 3794 
                           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
3772 3795 
                           obj['medical_code'] = prescription.project[b].project.medical_code
3773 3796 
                           obj['project_name'] = prescription.project[b].project.project_name
3797 
+                          obj['project'] =  prescription.project[b].project
3798 
+
3774 3799
3775 3800 
                         } else if (prescription.project[b].type == 3) {
3776 3801 
                           obj['statistical_classification'] = ''
3777 3802 
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
3778 3803 
                           obj['project_name'] = prescription.project[b].good_info.good_name
3804 
+                          obj['good_info'] =  prescription.project[b].good_info
3805 
+
3779 3806 
                         }
3780 3807 
                         tempProject.push(obj)
3781 3808 
                       }
 
@@ -3824,27 +3851,26 @@
3824 3851
3825 3852 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
3826 3853 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
3827 
-                        var prescription = response.data.data.sch_prescriptions[i];
3854 
+                        var prescription = response.data.data.sch_prescriptions[i]
3828 3855 
                         for (let b = 0; b < prescription.advices.length; b++) {
3829 3856 
                           console.log(prescription.advices[b].drug.is_special_diseases)
3830 
-                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
3831 
-                            prescription.advices.splice(b--,1)
3857 
+                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
3858 
+                            prescription.advices.splice(b--, 1)
3832 3859 
                           }
3833 3860 
                         }
3834 3861 
                         for (let b = 0; b < prescription.project.length; b++) {
3835 
-                          if(prescription.project[b].type == 2){
3836 
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
3837 
-                              prescription.project.splice(b--,1)
3862 
+                          if (prescription.project[b].type == 2) {
3863 
+                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
3864 
+                              prescription.project.splice(b--, 1)
3838 3865 
                             }
3839 
-                          }else if(prescription.project[b].type == 3){
3840 
-                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
3841 
-                              prescription.project.splice(b--,1)
3866 
+                          } else if (prescription.project[b].type == 3) {
3867 
+                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
3868 
+                              prescription.project.splice(b--, 1)
3842 3869 
                             }
3843 3870 
                           }
3844 3871 
                         }
3845 3872 
                       }
3846 3873
3847 
-
3848 3874 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
3849 3875 
                         var prescription = response.data.data.sch_prescriptions[i]
3850 3876 
                         let tempAdvice = []
 
@@ -3870,7 +3896,7 @@
3870 3896 
                             id: prescription.advices[b].drug_id,
3871 3897 
                             drug: prescription.advices[b].drug,
3872 3898 
                             groupno: index,
3873 
-                            hosp_appr_flag: "1",
3899 
+                            hosp_appr_flag: '1'
3874 3900
3875 3901 
                           }
3876 3902 
                           console.log('看看数据5：')
 
@@ -3921,12 +3947,16 @@
3921 3947 
                             obj['medical_code'] = prescription.project[b].project.medical_code
3922 3948 
                             obj['project_name'] = prescription.project[b].project.project_name
3923 3949 
                             obj['price'] = prescription.project[b].project.price
3950 
+                            obj['project'] =  prescription.project[b].project
3951 
+
3924 3952
3925 3953 
                           } else if (prescription.project[b].type == 3) {
3926 3954 
                             obj['statistical_classification'] = ''
3927 3955 
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
3928 3956 
                             obj['project_name'] = prescription.project[b].good_info.good_name
3929 3957 
                             obj['price'] = prescription.project[b].good_info.packing_price
3958 
+                            obj['good_info'] =  prescription.project[b].good_info
3959 
+
3930 3960
3931 3961 
                           }
3932 3962 
                           tempProject.push(obj)
 
@@ -3991,7 +4021,7 @@
3991 4021 
                   this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
3992 4022 
                 }
3993 4023 
               })
3994 
-            }else{
4024 
+            } else {
3995 4025
3996 4026 
               getMonthHisPateintInfo(params).then(response => {
3997 4027 
                 if (response.data.state == 0) {
 
@@ -4064,7 +4094,6 @@
4064 4094 
                 }
4065 4095 
               })
4066 4096
4067 
-
4068 4097 
             }
4069 4098
4070 4099 
           }

+ 50 - 8
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue Visa fil 

@@ -239,7 +239,6 @@
239 239 
   import { uParseTime } from '@/utils/tools'
240 240 
   import PrescriptionTemplateTable from './components/prescriptionTemplateTable'
241 241 
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
242 
-
243 242 
   const moment = require('moment')
244 243 
   export default {
245 244 
     props: {
 
@@ -378,7 +377,6 @@
378 377 
     },
379 378 
     methods: {
380 379 
       save() {
381 
-
382 380 
         if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
383 381 
           this.$message.error('请先开处方')
384 382 
           return
 
@@ -402,6 +400,34 @@
402 400 
           }
403 401 
         }
404 402
403 
+
404 
+        for (let i = 0; i < this.prescriptions.length; i++) {
405 
+          for(let b = 0; b < this.prescriptions[i].advices.length; b++){
406 
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
407 
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，开非特病类型的药")
408 
+              return
409 
+            }
410 
+
411 
+          }
412 
+
413 
+          for(let c = 0; c < this.prescriptions[i].project.length; c++){
414 
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 2  && this.prescriptions[i].project[c].project.disease_directory != 1) {
415 
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，请开特病类型的项目")
416 
+              return
417 
+            }
418 
+
419 
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 3  && this.prescriptions[i].project[c].good_info.is_special_diseases != 1) {
420 
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，请开特病类型的耗材")
421 
+              return　
422 
+            }
423 
+          }
424 
+        }
425 
+
426 
+
427 
+
428 
+
429 
+
430 
+
405 431 
         let params = {
406 432 
           name: this.tempForm.name,
407 433 
           mode_id: this.tempForm.mode_id,
 
@@ -1373,8 +1399,6 @@
1373 1399 
           }
1374 1400 
         }
1375 1401
1376 
-        console.log(this.curDrugs)
1377 
-        console.log(this.curPrescriptions.advices)
1378 1402
1379 1403 
         for (let i = 0; i < this.curDrugs.length; i++) {
1380 1404 
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
 
@@ -1491,7 +1515,15 @@
1491 1515 
                   remark: '',
1492 1516 
                   medical_code: temp2[b].medical_code,
1493 1517 
                   unit: temp2[b].unit,
1494 
-                  type: temp2[b].type
1518 
+                  type: temp2[b].type,
1519 
+                }
1520 
+                if (temp2[b].type == 2){
1521 
+                  obj['project'] = temp2[b].project
1522 
+
1523 
+                }else if(temp2[b].type == 3){
1524 
+
1525 
+                  obj['good_info'] = temp2[b].good_info
1526 
+
1495 1527 
                 }
1496 1528 
                 if (obj.total == 0 || obj.total == undefined) {
1497 1529 
                   obj.total = 1
 
@@ -1580,18 +1612,24 @@
1580 1612 
                     remark: prescription.project[b].remark,
1581 1613 
                     medical_code: prescription.project[b].project.medical_code,
1582 1614 
                     unit: prescription.project[b].project.unit,
1583 
-                    type: prescription.project[b].type
1615 
+                    type: prescription.project[b].type,
1584 1616 
                   }
1585 1617
1586 1618 
                   if (prescription.project[b].type == 2) {
1587 1619 
                     obj['statistical_classification'] = prescription.project[b].project.statistical_classification
1588 1620 
                     obj['medical_code'] = prescription.project[b].project.medical_code
1589 1621 
                     obj['project_name'] = prescription.project[b].project.project_name
1622 
+                    obj['project'] = prescription.project[b].project
1623 
+
1624 
+
1625 
+
1590 1626
1591 1627 
                   } else if (prescription.project[b].type == 3) {
1592 1628 
                     obj['statistical_classification'] = ''
1593 1629 
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
1594 1630 
                     obj['project_name'] = prescription.project[b].good_info.good_name
1631 
+                    obj['good_info'] = prescription.project[b].good_info
1632 
+
1595 1633 
                   }
1596 1634 
                   tempProject.push(obj)
1597 1635 
                 }
 
@@ -1665,7 +1703,8 @@
1665 1703 
                 medical_code: project[i].medical_code,
1666 1704 
                 unit: project[i].unit,
1667 1705 
                 type: 2,
1668 
-                is_special_diseases: project[i].disease_directory
1706 
+                is_special_diseases: project[i].disease_directory,
1707 
+                project: project[i],
1669 1708 
               }
1670 1709
1671 1710 
               this.tabProject.push(obj)
 
@@ -1686,7 +1725,8 @@
1686 1725 
                 medical_code: good_info[i].medical_insurance_number,
1687 1726 
                 unit: this.getGoodUnit(good_info[i].good_unit),
1688 1727 
                 type: 3,
1689 
-                is_special_diseases: good_info[i].is_special_diseases
1728 
+                is_special_diseases: good_info[i].is_special_diseases,
1729 
+                good_info: good_info[i],
1690 1730 
               }
1691 1731 
               this.tabProject.push(obj)
1692 1732 
             }
 
@@ -1780,6 +1820,7 @@
1780 1820 
                   unit: project[i].project.unit,
1781 1821 
                   type: project[i].type,
1782 1822 
                   is_special_diseases: project[i].project.disease_directory,
1823 
+                  project:project[i].project,
1783 1824 
                 }
1784 1825 
                 if (obj.total == 0 || obj.total == undefined) {
1785 1826 
                   obj.total = 1
 
@@ -1802,6 +1843,7 @@
1802 1843 
                   unit: project[i].good_info.unit,
1803 1844 
                   type: project[i].type,
1804 1845 
                   is_special_diseases: project[i].good_info.is_special_diseases,
1846 
+                  good_info:project[i].good_info,
1805 1847 
                 }
1806 1848 
                 if (obj.total == 0 || obj.total == undefined) {
1807 1849 
                   obj.total = 1

+ 32 - 6
src/xt_pages/stock/drugs/drugPrint.vue Visa fil 

@@ -42,13 +42,13 @@
42 42 
               </td>
43 43
44 44 
               <td style="line-height: 50px">
45 
-                  {{item.warehousing_count}}
45 
+                  {{getCount(item.drug_id)}}
46 46 
               </td>
47 47 
               <td style="line-height:50px">
48 48 
                   {{item.price}}
49 49 
               </td>
50 50 
               <td style="line-height:50px">
51 
-                 {{(item.warehousing_count*item.price).toFixed(2)}}
51 
+                 {{(getCount(item.drug_id)*item.price).toFixed(2)}}
52 52 
               </td>
53 53 
               <td style="line-height: 50px">
54 54 
                  {{item.remark}}
 
@@ -89,7 +89,7 @@
89 89 
   import { jsGetAge, uParseTime } from '@/utils/tools'
90 90 
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
91 91 
   import print from 'print-js'
92 
-  import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
92 
+  import { getDrugIndetail,getDrugWarehouseInfoPrint,getDrugCountList} from "@/api/drug/drug_stock"
93 93 
   export default {
94 94 
     name: 'dialysisPrintOrder',
95 95 
     components: {
 
@@ -115,6 +115,7 @@
115 115 
         limit:this.$route.query.limit,
116 116 
         page:this.$route.query.page,
117 117 
         cancelStockDate:[],
118 
+        minCount:[],
118 119 
       }
119 120 
     },
120 121 
     methods: {
 
@@ -218,7 +219,7 @@
218 219 
       getTotal(){
219 220 
         var total = 0
220 221 
         for(let i=0;i<this.cancelStockDate.length;i++){
221 
-           total += this.cancelStockDate[i].price*this.cancelStockDate[i].warehousing_count
222 
+           total += this.cancelStockDate[i].price*getCount(this.cancelStockDate[i].drug_id)
222 223 
         }
223 224 
         return total
224 225 
       },
 
@@ -238,7 +239,32 @@
238 239 
         })
239 240
240 241
241 
-      }
242 
+      },
243 
+      getCount(drug_id){
244 
+        var total = 0
245 
+        for(let i=0;i<this.minCount.length;i++){
246 
+          if(drug_id == this.minCount[i].drug_id){
247 
+            total += this.minCount[i].warehousing_count
248 
+          }
249 
+        }
250 
+        return total
251 
+      },
252 
+      getDrugCountList(){
253 
+         var params = {
254 
+          keyword: this.keywords,
255 
+          start_time:this.start_time,
256 
+          end_time:this.end_time,
257 
+         }
258 
+         console.log("paramsw2ww",params)
259 
+        getDrugCountList(params).then(response=>{
260 
+          if(response.data.state == 1){
261 
+            var minCount = response.data.data.minCount
262 
+            console.log("minCount",minCount)
263 
+            this.minCount = minCount
264 
+
265 
+          }
266 
+        })
267 
+      },
242 268 
     },
243 269 
     created() {
244 270 
       var xtuser = this.$store.getters.xt_user
 
@@ -247,7 +273,7 @@
247 273
248 274
249 275 
       this.getDrugWarehouseInfoPrint()
250 
-
276 
+       this.getDrugCountList()
251 277
252 278 
     }
253 279

+ 6 - 21
src/xt_pages/stock/drugs/query.vue Visa fil 

@@ -79,11 +79,7 @@
79 79 
       </div>
80 80
81 81 
        <el-table :data="tableList" border style="width: 100%">
82 
-        <!-- <el-table-column prop="date" label="药品编号" width="180">
83 
-           <template  slot-scope="scope">
84 
-
85 
-           </template>
86 
-        </el-table-column> -->
82 
+
87 83 
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
88 84 
            <template slot-scope="scope">
89 85 
              {{getDrugType(scope.row.drug_type)}}
 
@@ -116,15 +112,15 @@
116 112 
         </el-table-column>
117 113 
         <el-table-column prop="drug_name" label="出库数量" align="center">
118 114 
            <template slot-scope="scope">
119 
-              <span v-if="org_id == 10028 || org_id == 9671">{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}</span>
120 
-              <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
115 
+              <span>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
116 
+              <!-- <span v-else>{{getWarehouseOutInfo(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
121 117 
            </template>
122 118 
         </el-table-column>
123 119 
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
124 120 
            <template slot-scope="scope">
125 121 
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
126 
-               <span v-if="(org_id == 10028 || org_id == 9671)">{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}} </span>
127 
-               <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
122 
+               <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
123 
+               <!-- <span v-else>{{getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>  -->
128 124 
             </div>
129 125 
            </template>
130 126 
         </el-table-column>
 
@@ -178,16 +174,6 @@ import { min } from 'moment'
178 174 
     name: 'stockIn',
179 175 
     created() {
180 176
181 
-      // var nowDate = new Date();
182 
-      // var nowYear = nowDate.getFullYear();
183 
-      // var nowMonth = nowDate.getMonth() + 1;
184 
-      // var nowDay = nowDate.getDate();
185 
-      // this.end_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
186 
-      // nowDate.setMonth(nowDate.getMonth() - 1);
187 
-      // nowYear = nowDate.getFullYear();
188 
-      // nowMonth = nowDate.getMonth() + 1;
189 
-      // nowDay = nowDate.getDate();
190 
-      // this.start_time =nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
191 177 
       this.getlist()
192 178 
       var drugCategory = getDictionaryDataConfig('system','drug_category')
193 179 
       this.drugCategory.push(...drugCategory)
 
@@ -524,8 +510,6 @@ import { min } from 'moment'
524 510 
          console.log("paramsw2ww",params)
525 511 
         getDrugCountList(params).then(response=>{
526 512 
           if(response.data.state == 1){
527 
-            var countlist =  response.data.data.countList
528 
-            this.countList = countlist
529 513 
             var minCount = response.data.data.minCount
530 514 
             console.log("minCount",minCount)
531 515 
             this.minCount = minCount
 
@@ -537,6 +521,7 @@ import { min } from 'moment'
537 521 
                  info[i].count = info[i].count * info[i].min_number
538 522 
               }
539 523 
             }
524 
+
540 525 
             this.outCountList = response.data.data.outCountList
541 526 
             console.log("手动出库",this.outCountList)
542 527 
             this.auCountList = response.data.data.auCountList

+ 1 - 0
src/xt_pages/user/components/PatientForm.vue Visa fil 

@@ -1421,6 +1421,7 @@ export default {
1421 1421 
               this.form.avatar = this.form.avatar + "?imageView2/2/w/500/h/500/q/90"
1422 1422 
             }
1423 1423 
             console.log("form---",this.form)
1424 
+
1424 1425 
             editPatient(this.patientID, this.form)
1425 1426
1426 1427 
               .then(response => {

+ 1 - 1
src/xt_pages/user/templateSummary.vue Visa fil 

@@ -1552,7 +1552,7 @@
1552 1552 
                this.form.natrium =list.natrium
1553 1553 
                this.form.perfusion_apparatus= list.perfusion_apparatus
1554 1554 
                this.form.other_count = list.other_count
1555 
-               this.form.record_time = this.getTimeTwo(list.record_time)
1555 
+              //  this.form.record_time = this.getTimeTwo(list.record_time)
1556 1556 
                console.log("时间232233232",list.record_time)
1557 1557 
                if(list.template_inspection_id == 0){
1558 1558 
                   list.template_inspection_id = ""

+ 14 - 14
src/xt_pages/workforce/components/nextTableWeeks.vue Visa fil 

@@ -150,8 +150,8 @@
150 150 
                 <span v-if="org_id!=10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
151 151 
                 <span v-if="org_id==10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
152 152 
                 <!-- <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span> -->
153 
-              </span>
154 
-             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
153 
+              </span>
154 
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
155 155 
           </span>
156 156 
           {{scope.row.dialysissolution.dialysis_dialyszers}}
157 157 
          <span v-if="scope.row.dialysissolution.dialysis_dialyszers!='' && scope.row.dialysissolution.dialysis_irrigation!=''">/</span>
 
@@ -306,9 +306,9 @@ export default {
306 306 
     };
307 307 
   },
308 308 
   watch: {
309 
-
309 
+
310 310 
     weekTime: function() {
311 
-
311 
+
312 312 
       var theType = this.weekType(this.weekTime);
313 313 
       this.getSchedules(theType);
314 314 
     }
 
@@ -324,7 +324,7 @@ export default {
324 324 
         var arr = newArr.join(",")
325 325 
         var str = ""
326 326 
         if(this.zone == 0){
327 
-           str = arr
327 
+           str = arr
328 328 
         }
329 329 
         if(zone != 0){
330 330 
           str = zone.join(",")
 
@@ -352,7 +352,7 @@ export default {
352 352 
         var arr = newArr.join(",")
353 353 
         var str = ""
354 354 
         if(this.zone == 0){
355 
-           str = arr
355 
+           str = arr
356 356 
         }
357 357 
         if(zone != 0){
358 358 
           str = zone.join(",")
 
@@ -388,7 +388,7 @@ export default {
388 388 
             for(let i=0;i<scheduleData.length;i++){
389 389 
               if(scheduleData.prescription.id > 0){
390 390 
                  newList.push(scheduleData[i])
391 
-              }
391 
+              }
392 392 
             }
393 393 
             var arr =   newList.sort(this.compare('sort'))
394 394 
             console.log("元旦快乐",arr)
 
@@ -400,14 +400,14 @@ export default {
400 400 
             for(let i=0;i<scheduleData.length;i++){
401 401 
               if(scheduleData.prescription.id == 0){
402 402 
                  newList.push(scheduleData[i])
403 
-              }
403 
+              }
404 404 
             }
405 405 
             var arr =   newList.sort(this.compare('sort'))
406 406 
             console.log("元旦快乐",arr)
407 407 
             this.scheduleData = arr
408 408 
           }
409 
-
410 
-
409 
+
410 
+
411 411 
         } else {
412 412 
           this.$message.error("网络错误");
413 413 
           return false;
 
@@ -603,7 +603,7 @@ export default {
603 603 
             doctor_advice[i].remark +
604 604 
             "\n";
605 605
606 
-
606 
+
607 607 
         }
608 608 
         return name;
609 609 
       }
 
@@ -640,7 +640,7 @@ export default {
640 640 
           }
641 641 
         }
642 642 
        return name
643 
-    },
643 
+    },
644 644 
     changeZone(val){
645 645 
       this.zone = val
646 646 
       this.getNextScheduleWeekDay()
 
@@ -654,7 +654,7 @@ export default {
654 654 
         var arr = newArr.join(",")
655 655 
         var str = ""
656 656 
         if(this.zone == 0){
657 
-           str = arr
657 
+           str = arr
658 658 
         }
659 659 
         if(zone != 0){
660 660 
           str = zone.join(",")
 
@@ -677,7 +677,7 @@ export default {
677 677 
     // }
678 678 
     this.getAllZoneList()
679 679 
     this.org_id = this.$store.getters.xt_user.org.id
680 
-
680 
+
681 681 
   }
682 682 
 };
683 683 
 </script>

+ 15 - 4
src/xt_pages/workforce/components/tableData.vue Visa fil 

@@ -799,7 +799,14 @@ export default {
799 799 
     }
800 800 
   },
801 801 
   methods: {
802 
-       getWeekPanels() {
802 
+    compare(p){ //这是比较函数
803 
+      return function(m,n){
804 
+          var a = m[p];
805 
+          var b = n[p];
806 
+          return a - b; //升序
807 
+      }
808 
+     },
809 
+     getWeekPanels() {
803 810 
          this.scheduleZone=[]
804 811 
          var partionStr = this.partition_id
805 812 
          var arr = this.zoneIdList.join(',')
 
@@ -818,8 +825,9 @@ export default {
818 825 
             return false
819 826 
           }
820 827 
           var partitions = response.data.data.partitions
821 
-
828 
+          console.log("partitions",partitions)
822 829 
           this.theWeek.thisWeek = response.data.data.theWeek
830 
+          console.log("这个周",response.data.data.theWeek)
823 831 
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
824 832 
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
825 833 
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
 
@@ -840,6 +848,7 @@ export default {
840 848 
                   zone_type: partition.type,
841 849 
                   cut: jihao.number,
842 850 
                   jihao_id: jihao.id,
851 
+                  sort:jihao.sort,
843 852 
                   Mon_M: {
844 853 
                     schedule_id: 0,
845 854 
                     mode_id: 0,
 
@@ -989,15 +998,17 @@ export default {
989 998 
                   },
990 999 
                   total: 0
991 1000 
                 }
992 
-
1001 
+
993 1002 
                 that.scheduleZone.push(thisPa)
994 1003
995 1004 
               })
996 1005 
             })
997 1006 
           }
998 
-            console.log("34455555566666",this.scheduleZone)
1007 
+          console.log("34455555566666",this.scheduleZone)
1008 
+           this.scheduleZone.sort(this.compare('sort'))
999 1009 
         })
1000 1010 
      },
1011 
+
1001 1012 
     cellClass({ row, column, rowIndex, columnIndex }) {
1002 1013 
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
1003 1014 
         return "";

+ 1 - 5
src/xt_pages/workforce/components/tableWeeks.vue Visa fil 

@@ -278,11 +278,7 @@
278 278 
               ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
279 279 
               : ''
280 280 
           }}</span>
281 
-                    <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{
282 
-            scope.row.dialysissolution.anticoagulant_zongliang
283 
-              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
284 
-              : ''
285 
-          }}</span>
281 
+            <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
286 282 
             <span v-if="scope.row.dialysissolution.anticoagulant == 7">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
287 283 
             <span v-if="scope.row.dialysissolution.anticoagulant == 8">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
288 284 
             <span v-if="scope.row.dialysissolution.anticoagulant == 9">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>

+ 3 - 3
src/xt_pages/workforce/remind_print.vue Visa fil 

@@ -88,9 +88,9 @@
88 88 
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
89 89 
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
90 90 
                    <span v-if="main_collection.prescription.anticoagulant == 8">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
91 
-                    <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
92 
-                     <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
93 
-                      <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
91 
+                  <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
92 
+                  <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
93 
+                  <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
94 94 
                 </td>
95 95 
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
96 96 
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>