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

src/api/dialysis.js

 }
 
 export function CreateGroupAdvice(id, groupno, advices) {
+  console.log('中国人名', advices)
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',
   return request({
     url: '/api/dialysisgoods/get',
     method: 'get',
-    params: params,
+    params: params
 
   })
 }
 
-
 export function GetDialysisGoodStatistics(params) {
   return request({
     url: '/api/goodstatistics/get',
     method: 'get',
-    params: params,
+    params: params
 
   })
 }

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

         }
 
         this.is_pre = 1
+
+        console.log("99999",this.prescription.id)
+        console.log("open",this.is_open)
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
             if (this.patient.id <= 0) {
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
-
+    
+            console.log("第一")
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 this.hide()
               }
             })
+
           } else if (this.is_open == 1) {
             if (this.targetAdvices.length > 0) {
               // 弹框推送提醒
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-
+               console.log("第二")
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
               var arr = this.dialysisPrescription
 
               const ParamsQuery = arr
-              // console.log('paramsquerythree', ParamsQuery)
+              console.log('paramsquerythree', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-
+              console.log("第三")
+              
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
                     duration: 2000
                   })
 
+                  // for(let i=0;i<this.waitUploadAdvices.length;i++){
+                  //    this.waitUploadAdvices[i].drug_spec =  this.waitUploadAdvices[i].drug_spec.toString()
+                  // }
                   const params = {
                     advices: this.waitUploadAdvices,
                     advice_date: uParseTime(
 
                     remark: ''
                   }
+                   console.log("params--------",params)
                   CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
                     rs => {
                       var resp = rs.data
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               // console.log(this.prescription);
-
+              console.log("第四")
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-
+               console.log("第五")
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
-
+                console.log("第6")
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
-
+                 console.log("第七")
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
                       advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                       advice_type: this.waitUploadAdvices[0].advice_type,
                       parent_id: this.patient_id,
+
                       // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
                       start_time:
                         uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
-
+                console.log("第八")
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
             ) {
               ParamsQuery['mode'] = '3'
             }
-
+             console.log("第九")
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
         }
 
         this.is_pre = 2
+
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
             if (this.patient.id <= 0) {
                       duration: 2000
                     })
                     const params = {
+                   
                       advices: this.waitUploadAdvices,
                       advice_date: uParseTime(
                         this.$route.query.date,

src/xt_pages/user/dialysisSolution.vue

     this.blood_filters = this.$store.getters.blood_filters
     this.perfusion_apparatus = this.$store.getters.perfusion_apparatus
     this.hemodialysis_machines = this.$store.getters.hemodialysis_machines
-    this.dialysate_formulation = this.$store.getters.dialysate_formulation
+    this.dialysate_formulation =  getDataConfig(
+          'hemodialysis',
+          'dialysate_formulation'
+    )
     this.body_fluid_option = this.$store.getters.body_fluid
     this.special_medicine_option = this.$store.getters.special_medicine