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

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -577,10 +577,6 @@
                                     医嘱内容
                                 </td>
                                 </tr>
-                                <!-- <tr style="line-height:35px;padding:8px 5px;">
-                            <td colspan="4" style="font-size: 16px">开医嘱</td>
-                            <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                            </tr> -->
                                 <tr style="line-height:30px;padding:0 5px;">
                                 <td style="font-size: 16px" width="10%">时间</td>
                                 <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
@@ -589,31 +585,24 @@
                                 <td style="font-size: 16px" width="10%">执行人员</td>
                                 <td style="font-size: 16px" width="10%">核对人员</td>
                                 </tr>
-                                <!-- <template v-for="group in doctor_advices" > -->
 
-                                <tr v-for="(advice, advice_index) in record.his_advices.length > 0 ? record.his_advices : record.advices" :key="advice_index">
+                                <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
                                 <td height="30px" style="padding:4px 5px;">
                                     <span v-if="advice.start_time">
                                     {{ getTime(advice.start_time, "{h}:{i}") }}
                                     </span>
-                                    <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                                 </td>
                                 <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
                                     <span v-if="advice.parent_id > 0">---></span>
                                     <span>{{ advice.advice_name }}</span>
                                     <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                                    <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
+                                    <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
                                     <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                                     <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                                 </td>
-                                <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                                <span>{{advice.delivery_way}}</span>
-                                <span>{{advice.execution_frequency}}</span>
-                                <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                            </td> -->
-                                <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+                                
                                 <td height="30px" style="padding:4px 5px;">
                                     <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
                                         {{getAdminUser(advice, 'advice_doctor')}}
@@ -641,7 +630,6 @@
                                     </span>
                                 </td>
                                 </tr>
-                                <!-- </template> -->
                             </tbody>
                             </table>
                         </td>
@@ -754,7 +742,7 @@
                             <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                                 上机护士：
                                 <div class="under_line" style="width: 80px;text-align: center">
-                                    <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
+                                    <span style="display: inline-block;height: 36px;line-height: 36px;" v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
                                     <span v-else>
                                         <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" />
                                     </span>
@@ -764,13 +752,13 @@
                                 核对人员：
                                 <div class="under_line" style="width: 80px;text-align: center">
                                     <span v-if="record.check != null ? record.dialysis_order.start_nurse != record.check.modifier : false">
-                                        <span v-if="setAdminUserES(record.check, record.check == null ? 0 : 'modifier') == ''">
+                                        <span style="display: inline-block;height: 36px;line-height: 36px;" v-if="setAdminUserES(record.check, record.check == null ? 0 : 'modifier') == ''">
                                         {{ getAdminUser(record.check, record.check == null ? 0 : 'modifier') }}
                                         </span>
                                         <img style="height:30px;" :src="setAdminUserES(record.check, record.check == null ? 0 : 'modifier')" alt srcset v-else />
                                     </span>
                                     <span v-else>
-                                        <span v-if="setAdminUserES(record.check, record.check == null ? 0 : 'creater') == ''">
+                                        <span style="display: inline-block;height: 36px;line-height: 36px;" v-if="setAdminUserES(record.check, record.check == null ? 0 : 'creater') == ''">
                                         {{ getAdminUser(record.check, "creater") }}
                                         </span>
                                         <img style="height:30px;" :src="setAdminUserES(record.check, record.check == null ? 0 : 'creater')" alt srcset v-else />
@@ -780,7 +768,7 @@
                             <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                                 下机护士：
                                 <div class="under_line" style="width: 80px;text-align: center">
-                                    <span v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
+                                    <span style="display: inline-block;height: 36px;line-height: 36px;" v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
                                     <span v-else>
                                         <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" />
                                     </span>
@@ -789,7 +777,7 @@
                             <div class="inline_block" style="flex:1;display: flex;align-items: center;">
                                 治疗医生：
                                 <div class="under_line" style="width: 80px;text-align: center">
-                                    <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
+                                    <span style="display: inline-block;height: 36px;line-height: 36px;" v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
                                     <img class="es-img" :src="setAdminUserES(record.prescription, 'creater')" alt="" srcset="" v-else style="height: 30px;">
                                 </div>
                             </div>
@@ -1003,8 +991,8 @@ export default {
             }
 
             var delghTwo = 0
-            if (this.records[recordIndex].advices && this.records[recordIndex].advices.length < 12) {
-              delghTwo = 12 - this.records[recordIndex].advices.length
+            if (this.records[recordIndex].advices && this.records[recordIndex].advices.length < 6) {
+              delghTwo = 6 - this.records[recordIndex].advices.length
             } else {
               delghTwo = 0
             }
@@ -1018,42 +1006,42 @@ export default {
               }
             }
 
-            var childMap = {}
-            for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id == 0) {
-                continue
-              }
-              if (
-                !(
-                  this.records[recordIndex].advices[index].parent_id in childMap
-                )
-              ) {
-                childMap[
-                  this.records[recordIndex].advices[index].parent_id
-                ] = []
-              }
-              childMap[this.records[recordIndex].advices[index].parent_id].push(
-                this.records[recordIndex].advices[index]
-              )
-            }
-
-            var advices = []
-            for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id > 0) {
-                continue
-              }
-              var item = this.records[recordIndex].advices[index]
-              if (item.id in childMap) {
-                item.children = childMap[item.id]
-              } else {
-                item.children = []
-              }
-              advices.push(item)
-            }
+            // var childMap = {}
+            // for (const index in this.records[recordIndex].advices) {
+            //   if (this.records[recordIndex].advices[index].parent_id == 0) {
+            //     continue
+            //   }
+            //   if (
+            //     !(
+            //       this.records[recordIndex].advices[index].parent_id in childMap
+            //     )
+            //   ) {
+            //     childMap[
+            //       this.records[recordIndex].advices[index].parent_id
+            //     ] = []
+            //   }
+            //   childMap[this.records[recordIndex].advices[index].parent_id].push(
+            //     this.records[recordIndex].advices[index]
+            //   )
+            // }
+
+            // var advices = []
+            // for (const index in this.records[recordIndex].advices) {
+            //   if (this.records[recordIndex].advices[index].parent_id > 0) {
+            //     continue
+            //   }
+            //   var item = this.records[recordIndex].advices[index]
+            //   if (item.id in childMap) {
+            //     item.children = childMap[item.id]
+            //   } else {
+            //     item.children = []
+            //   }
+            //   advices.push(item)
+            // }
 
             var leftAdvice = []
             var rightAdvice = []
-            var adlen = advices.length
+            var adlen = this.records[recordIndex].advices.length
 
             var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
             for (var i = 0; i < halfLen; i++) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2655,7 +2655,7 @@
 
       comfirm() {
 
-        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+        if (this.curDrugs.length > 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
@@ -2666,8 +2666,35 @@
             }
           }
         }
+        if (this.teamList.length > 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
+            for (let i = 0; i < this.teamList.length; i++) {
+              if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
+                this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
+                // return
+              }
 
-        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
+            }
+          }
+          
+          if(this.$store.getters.xt_user.org_id == 10138){
+            let arr = this.teamList
+            let newArr = []
+            arr.map(item => {
+              if(this.curPrescriptions.med_type != 14){
+                newArr.push(item)
+              }
+              if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
+                newArr.push(item)
+              }
+            })
+            this.teamList = newArr
+          }
+        }
+        
+        
+
+        if (this.curDrugs.length == 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
@@ -2911,7 +2938,8 @@
                 cus_total: 1,
                 unit: project[i].unit,
                 type: 2,
-                total: project[i].total
+                total: project[i].total,
+                is_special_diseases: project[i].disease_directory
               }
 
               this.tabProject.push(obj)
@@ -2933,7 +2961,8 @@
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
-                total: good_info[i].total
+                total: good_info[i].total,
+                is_special_diseases: good_info[i].is_special_diseases
               }
               this.tabProject.push(obj)
             }
@@ -3027,7 +3056,8 @@
                   remark: '',
                   medical_code: project[i].project.medical_code,
                   unit: project[i].project.unit,
-                  type: project[i].type
+                  type: project[i].type,
+                  is_special_diseases: project[i].project.disease_directory
                 }
                 if (obj.cus_total == 0 || obj.cus_total == undefined) {
                   obj.cus_total = 1
@@ -3056,7 +3086,8 @@
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
                   unit: project[i].good_info.unit,
-                  type: project[i].type
+                  type: project[i].type,
+                  is_special_diseases: project[i].good_info.is_special_diseases
                 }
                 if (obj.cus_total == 0 || obj.cus_total == undefined) {
                   obj.cus_total = 1