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.vue

 
           this.records = this.records.concat(resp.data.schedules);
 
-          console.log("记录", this.records);
+
+          for (const index in this.records) {
+            this.records[index].advices = this.records[index].advices.concat(this.records[index].his_advices)
+          }
+
 
           for (const recordIndex in this.records) {
             var dlegh = 0;

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

         }
 
         if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' + " " + row.remark
         }
 
+
+
         if (isChild == 1) {
           // 不是子药
 

src/xt_pages/dialysis/details/index.vue

           var prepare = resp.data.prepare
           this.preparestock = prepare
           console.log("prepare222222",prepare)
+
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }
             }
           }
 
+          const obj = {}
+          this.doctor_advices = this.doctor_advices.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          console.log(this.doctor_advices)
+
 
           var device_map = {}
           for (let index = 0; index < this.devices.length; index++) {

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

                             <span>{{prescription.dialysis_dialyszers}}</span>
                             <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
                           </span>
-                        &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
+                        &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span>
                       </div>
                     </td>
                   </tr>
 
                     <td width="70">医生签名:</td>
                     <td width="100">
-                     
+
                       <div class="under-line" v-if="org_id == 9987">
                          <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
                          <img class="es-img" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
             <td>
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
-          
+
           </tr>
         </tbody>
       </table>
             this.AlPanel = this.anticoagulantsConfit[thisALID]
           }
 
-          this.advices = response.data.data.advices
+          // this.advices = response.data.data.advices
+
+          this.advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
+
           this.monitors = response.data.data.monitors
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
-   
+
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

             </el-radio>
             <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人
             </el-radio>
-            <el-radio :label=3>已退费<span
-              style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人
-            </el-radio>
+            <!--<el-radio :label=3>已退费<span-->
+              <!--style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人-->
+            <!--</el-radio>-->
             <el-radio :label=4>全部</el-radio>
 
           </el-radio-group>
           <!--</el-button>-->
 
 
-          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
-                     @click="open(20)"
-                     type="primary">预结算！
-          </el-button>
+          <!--<el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"-->
+                     <!--@click="open(20)"-->
+                     <!--type="primary">预结算！-->
+          <!--</el-button>-->
 
-          <el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 " size="small"
-                     @click="open(21)"
-                     type="primary">收费！
-          </el-button>
+          <!--<el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3" size="small"-->
+                     <!--@click="open(21)"-->
+                     <!--type="primary">收费！-->
+          <!--</el-button>-->
 
 
-          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
+          <el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(8)" type="primary"-->
           <!--&gt;明细对账-->
           <!--</el-button>-->
-          <el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(9)" type="primary"
+          <el-button v-if="this.order.order_status == 2" size="small" @click="open(9)" type="primary"
           >结算单
           </el-button>
 
         this.loadingtwo = true
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
-          axios.get('http://127.0.0.1:9532/api/settle/get', {
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
           })
             .then(function(response) {
                     let three_count = 0
                     for (let i = 0; i < response.data.data.list.length; i++) {
                       that.all_table_data.push(response.data.data.list[i])
-                      if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+                      if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                         one_count = one_count + 1
                         that.patientTableData.push(response.data.data.list[i])
                       }
-
                       if (response.data.data.list[i].order.order_status == 2) {
                         two_count = two_count + 1
                         that.patientTableData.push(response.data.data.list[i])
                       }
-
-                      if (response.data.data.list[i].order.order_status == 3) {
-                        three_count = three_count + 1
-                        that.patientTableData.push(response.data.data.list[i])
-                      }
                     }
                     that.hisPatientDatas = response.data.data.list_two
                     that.cal_one = one_count
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
                 two_count = two_count + 1
               }
 
-              if (response.data.data.list[i].order.order_status == 3) {
-                three_count = three_count + 1
-              }
+              // if (response.data.data.list[i].order.order_status == 3) {
+              //   three_count = three_count + 1
+              // }
             }
 
             switch (this.radio) {
 
             for (let i = 0; i < response.data.data.list_two.length; i++) {
               this.hisPatientDatas.push(response.data.data.list_two[i])
-              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
+              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1 || response.data.data.list_two[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
                 two_count = two_count + 1
               }
 
-              if (response.data.data.list_two[i].order.order_status == 3) {
-                three_count = three_count + 1
-              }
+              // if (response.data.data.list_two[i].order.order_status == 3) {
+              //   three_count = three_count + 1
+              // }
             }
             switch (this.radio) {
               case 1:
                 this.patientTableData = []
 
                 for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
+                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1 || this.hisPatientDatas[i].order.order_status == 3) {
                     this.patientTableData.push(this.hisPatientDatas[i])
                   }
 
 
                 }
                 break
-              case 3:
-                this.patientTableData = []
-                for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 3) {
-                    this.patientTableData.push(this.hisPatientDatas[i])
-                  }
-
-                }
-                break
+              // case 3:
+              //   this.patientTableData = []
+              //   for (let i = 0; i < this.hisPatientDatas.length; i++) {
+              //     if (this.hisPatientDatas[i].order.order_status == 3) {
+              //       this.patientTableData.push(this.hisPatientDatas[i])
+              //     }
+              //   }
+              //   break
               case 4:
                 this.patientTableData = []
                 this.patientTableData = this.hisPatientDatas
 
               for (let i = 0; i < response.data.data.list.length; i++) {
                 this.all_table_data.push(response.data.data.list[i])
-                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                   one_count = one_count + 1
                 }
 
                   two_count = two_count + 1
                 }
 
-                if (response.data.data.list[i].order.order_status == 3) {
-                  three_count = three_count + 1
-                }
+                // if (response.data.data.list[i].order.order_status == 3) {
+                //   three_count = three_count + 1
+                // }
               }
 
             } else { //月结
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
                 two_count = two_count + 1
               }
 
-              if (response.data.data.list[i].order.order_status == 3) {
-                three_count = three_count + 1
-              }
+              // if (response.data.data.list[i].order.order_status == 3) {
+              //   three_count = three_count + 1
+              // }
             }
 
             switch (this.radio) {
                 this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }