弱化排班的分区字段，着重使用床位号的分区字段；

config/dev.env.js

@@ -6,7 +6,11 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
+<<<<<<< HEAD
   BASE_API: '"http://api.xt.test.sgjyun.com"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
+=======
+  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
+>>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
   PATIENT_SIT: '"http://test1.sgjyun.com"',
   MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
 }

config/index.js

@@ -17,9 +17,15 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
+<<<<<<< HEAD
     host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
     // host: 'localhost',
+=======
+  //  host: 'xt.test.sgjyun.com',
+    // host: 'xt.kuyicloud.com',
+    host: 'localhost',
+>>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

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

@@ -1330,12 +1330,12 @@
 
         if(isChild == 1){ //不是子药
 
-          return row.advice_name + row.advice_desc+tempDrugSpecDesc+tempPrescribingNumberDesc +tempSingleDoseDesc+" "+row.delivery_way+" "+row.execution_frequency
+          return row.advice_name + row.advice_desc+tempDrugSpecDesc+tempPrescribingNumberDesc+ ' 单次用量 ' +tempSingleDoseDesc+" "+row.delivery_way+" "+row.execution_frequency
 
         }else{ //是子药
 
 
-          return row.advice_name + row.advice_desc+tempDrugSpecDesc+tempPrescribingNumberDesc + tempSingleDoseDesc
+          return row.advice_name + row.advice_desc+tempDrugSpecDesc+tempPrescribingNumberDesc+' 单次用量 ' +tempSingleDoseDesc
         }
 
 

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

@@ -482,15 +482,12 @@
 
       var date = this.$route.query && this.$route.query.date;
       this.record_date = uParseTime(date, '{y}-{m}-{d}');
-
-           
     },
     watch: {
       isVisibility(val) {
 
       },
       "prescription.id": function () {
-        
         if (this.prescription.id > 0) {
           for (var index in this.dialysisPrescription) {
             this.dialysisPrescription[index] = this.prescription[index];

src/xt_pages/user/components/PatientForm.vue

@@ -280,7 +280,11 @@
           <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
             <el-radio-group v-model="form.lapseto">
               <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
+<<<<<<< HEAD
               <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+=======
+              <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+>>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
             </el-radio-group>
           </el-form-item>
         </el-col>

src/xt_pages/user/doctorAdvice.vue

@@ -735,7 +735,11 @@
                                 <span >{{advice.advice_desc}}</span>
                                 <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
                                 <span v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+<<<<<<< HEAD
                                 <span v-if="advice.single_dose != 0"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+=======
+                                <span v-if="advice.single_dose">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+>>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
                                 <span >{{advice.delivery_way}}</span>
                                 <span >{{advice.execution_frequency}}</span>
                         </td>
@@ -844,7 +848,11 @@
                                 <span >{{advice.advice_desc}}</span>
                                 <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
                                 <span v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+<<<<<<< HEAD
                                 <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+=======
+                                <span v-if="advice.single_dose">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+>>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
                                 <span >{{advice.delivery_way}}</span>
                                 <span >{{advice.execution_frequency}}</span>
                         </td>