1

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,14 +585,12 @@
                                 <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.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>
@@ -608,12 +602,7 @@
                                     <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>
@@ -1053,7 +1041,7 @@ export default {
 
             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

@@ -2667,21 +2667,24 @@
           }
         }
         if (this.teamList.length > 0) {
-          if (this.$store.getters.xt_user.org_id == 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('该处方属于特病类型处方，开非特病类型的项目')
+                this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
                 // return
               }
 
             }
           }
           
-          if(this.$store.getters.xt_user.org_id == 0){
+          if(this.$store.getters.xt_user.org_id == 10138){
             let arr = this.teamList
             let newArr = []
             arr.map(item => {
-              if(item.is_special_diseases == 1){
+              if(this.curPrescriptions.med_type != 14){
+                newArr.push(item)
+              }
+              if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
                 newArr.push(item)
               }
             })