修改医嘱相关

src/api/advice.js

     params:params,
   })
 }
+
+export function DeleteSubDoctorAdvice(params){
+  return request({
+    url:'/m/api/delete/subadvice?advice_id='+params,
+    method:'Delete',
+  })
+}
+

src/pages/advice/DialysisAdviceTable.vue

           <td></td>
         </tr>
         <template v-for="(schedule) in schedules">
-          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
-            <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
-            <td style="color:#409eff;">{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
-            <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
-            <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
+          <template v-for="(group, group_index) in schedule.new_advice">
+          <tr v-for="(advice, advice_index) in group.advices"  @click="clickfunction(schedule)">
+            <td  v-if="advice_index == 0"
+                 :rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
+            <td  v-if="advice_index == 0"
+                 :rowspan="group.advices.length" style="color:#409eff;">{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
+            <td  v-if="advice_index == 0"
+                 :rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
+            <td  v-if="advice_index == 0"
+                 :rowspan="group.advices.length">{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
+            <td  v-if="advice_index == 0"
+                 :rowspan="group.advices.length">{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
             <td>
               <span >{{advice.advice_name }}</span>
               <span >{{advice.advice_desc}}</span>
               <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
 
             </td>
-            <td>{{ advice.parent_id == 0 ? parseTime(advice.execution_time, "{m}-{d} {h}:{i}") : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? getName(advice.execution_staff) : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? getName(advice.checker) : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? parseTime(advice.check_time, "{m}-{d} {h}:{i}") : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? getName(advice.advice_doctor) : "" }}</td>
-            <td>{{ advice.parent_id == 0 ? parseTime(advice.created_time, "{m}-{d} {h}:{i}") : "" }}</td>
+            <td>{{  parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
+            <td>{{ getName(advice.execution_staff) }}</td>
+            <td>{{  getName(advice.checker)  }}</td>
+            <td>{{  parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
+            <td>{{  getName(advice.advice_doctor) }}</td>
+            <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}")}}</td>
 
 
           </tr>
+          </template>
+
         </template>
       </template>
      </table>
           } else {
             advice_groups = []
           }
-          maps.new_advice.push(advice_groups)
+          maps.new_advice = advice_groups
         }
       }
 

src/pages/main/dialog/AssessmentDialog.vue

 
         <div class="line"></div>
 
+        <div class="item" ref="symptom_before_dialysis" v-if="this.$store.getters.user.template_info.template_id == 2">
+          <h2 class="name">透析机型号</h2>
+          <div class="content">
+            <input type="tel" @focus="inputFocus" v-model="formValue.machine_type"/>
+          </div>
+        </div>
+
         <div class="item" ref="symptom_before_dialysis" v-if="this.$store.getters.user.template_info.template_id == 2">
           <h2 class="name">透析频次(次/周)</h2>
           <div class="content">
           blood_access_noise: '',
           internal_fistula_other: '',
           blood_access_internal_fistula: '',
+          machine_type:'',
         },
 
         record_date: ''
 
             this.propForm.type = 8
             this.isShowDialog = false
-            this.propForm.title = '内萎'
+            this.propForm.title = '内瘘'
             this.visibility = true
+            this.propForm.list = []
             this.propForm.list = getDataConfig('hemodialysis', 'internal_fistula')
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
             this.isShowDialog = false
             this.propForm.title = '出血'
             this.visibility = true
+            this.propForm.list = []
             this.propForm.list = getDataConfig('hemodialysis', 'hemorrhage')
             this.propForm.optionList = []
             this.propForm.isMultiple = 2

src/pages/main/dialog/DoubleDialog.vue

             <el-input v-model="doubleReview.pipeline_connection_desc"></el-input>
           </el-form-item>
 
-
         </el-form>
 
+        <div class="item"  v-if="this.$store.getters.user.template_info.template_id == 2">
+          <h2 class="name">核对时间</h2>
+          <div class="content">
+            <span class="text" style="width: 100px"  @click="selectCheckTimeAction">{{ check_time_str }}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
         <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="130px">
 
           <p style="margin: 10px 0 10px 13px;" v-if="doubleReview.creater != 0">{{getFirstCheckDesc()}} </p>
           处方医生：黄梦燕  护士
       </div> -->
     </div>
+    <mt-datetime-picker
+      ref="start_time_picker"
+      type="datetime"
+      @confirm="didSelectCheckTime"
+      v-model="check_time"
+    ></mt-datetime-picker>
   </div>
+
 </template>
 
 <script>
         creater: 0,
         modifier: 0,
         created_time: 0,
-        updated_time: 0
+        updated_time: 0,
+        check_time:0,
       },
+      check_time:new Date(),
+      check_time_str:'',
       patient: {
         id: 0
       },
     }
   },
   created() {
+    console.log(new Date())
     this.admin_users = this.admin_users_prop;
-
     if (this.record.id == "") {
       this.doubleReview.dialysis_item_check = "1";
       this.doubleReview.dialysis_parameter_check = "1";
       this.doubleReview.dialysis_parameter_desc = "";
       this.doubleReview.vascular_access_desc = "";
       this.doubleReview.pipeline_connection_desc = "";
+
     } else {
       this.doubleReview.dialysis_item_check =
         this.record.dialysis_item_check + "";
       this.doubleReview.creater = this.record.creater;
       this.doubleReview.updated_time = this.record.updated_time;
       this.doubleReview.modifier = this.record.modifier;
+      this.doubleReview.check_time = this.record.check_time;
+
     }
 
     var date = this.$route.query && this.$route.query.date;
     // this.patient.id = this.patient_prop.id
   },
   methods: {
+    didSelectCheckTime: function(time) {
+      this.check_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}" +":00");
+    },
+    selectCheckTimeAction: function() {
+      if(this.record.modifier == 0) {
+        this.$refs.start_time_picker.open();
+      }
+    },
     checkInf: function() {},
     // initData(doubleReview, patient, doctor) {
     //   //上层传值
       // ParamsQuery["patient"] = this.patient.id
       ParamsQuery["patient"] = this.$route.query.patient_id;
       ParamsQuery["record_date"] = this.record_date;
+      ParamsQuery["check_time"] = this.check_time_str
       commitDoubleCheck(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           // this.$toast({message: response.data.msg});
           return false;
         } else {
           Toast.success("提交成功");
-
           this.doubleReview.created_time =
             response.data.data.doubleCheck.created_time;
           this.doubleReview.creater = response.data.data.doubleCheck.creater;
-          this.doubleReview.updated_time =
-            response.data.data.doubleCheck.updated_time;
+          this.doubleReview.check_time =
+            response.data.data.doubleCheck.check_time;
           this.doubleReview.modifier = response.data.data.doubleCheck.modifier;
 
-          // console.log(response.data.data.doubleCheck)
           for (const key in response.data.data.doubleCheck) {
             this.record[key] = response.data.data.doubleCheck[key];
           }
     },
     getScondCheckDesc: function() {
       let time = uParseTime(
-        this.doubleReview.updated_time,
-        "{y}-{m}-{d} {h}:{i}"
+        this.doubleReview.check_time,
+        "{y}-{m}-{d} {h}:{i}"+":00"
       );
       if (this.doubleReview.modifier <= 0) {
         return "";
     getDate: function(val) {
       return parseTime(val, "{y}-{m}-{d} {h}:{i}");
     }
+  }, mounted() {
+
+    if(this.record.id == 0){
+      this.check_time_str = parseTime(this.check_time, "{y}-{m}-{d} {h}:{i}" +":00");
+    }else{
+      if(this.record.modifier == 0){
+        this.check_time_str = parseTime(this.check_time, "{y}-{m}-{d} {h}:{i}"+":00");
+
+      }else{
+        this.check_time_str = parseTime(this.record.check_time, "{y}-{m}-{d} {h}:{i}"+":00");
+      }
+    }
   }
 };
 </script>

src/pages/main/dialog/ThorougDialog.vue

         </div>
 
         <div class="item">
-          <label class="name" for="sjcll">实际超滤量(ml)</label>
+          <label class="name" for="sjcll">实际超滤量(L)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="sjcll" v-model="formValue.actual_ultrafiltration"/>
 

src/pages/main/dialog/new_order/order_form.vue

     },
     didSelectDeliveryWay: function(index) {
       this.didCloseSingleOptionDialog();
+      if(index == -1){
+        this.order.delivery_way = ""
+        return
+      }
       this.order.delivery_way = this.delivery_way_options[index].name;
     },
     selectExecFrequencyAction: function() {
     },
     didSelectExecFrequency: function(index) {
       this.didCloseSingleOptionDialog();
+      if(index == -1){
+        this.order.execution_frequency = ""
+        return
+      }
       this.order.execution_frequency = this.execution_frequency_options[
         index
       ].name;

src/pages/main/dialog/new_order/single_option_dialog.vue

     <div class="optionsBox">
       <div class="list">
         <ul>
+          <li @click="itemClick(-1)">请选择</li>
           <li
             @click="itemClick(index)"
             v-for="(option, index) in options"

src/pages/main/today/TodayTab.vue

           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
           var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
+
+          for (let i = 0; i < doctor_advices.length; i++){
+            doctor_advices[i]['is_selected'] = 0
+          }
+          console.log(doctor_advices)
+
+
+
           var double_check = resp.data.double_check; // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
           var treatment_summary = resp.data.treatment_summary; // 治疗小结
             resp.data.last_assessment_after_dislysis; // 上一次透前评估
           var last_monitor_record = resp.data.last_monitor_record;
 
+
+
+
           this.patient = patient;
           this.schedual = schedual == null ? {} : schedual;
           this.prescription = prescription == null ? { id: "" } : prescription;
               : last_predialysis_evaluation;
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
+
+
           if (this.doctor_advices.length > 0) {
             var group = this.newAdviceGroupObject();
             var initGroupBlock = function(group, advice) {
           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
           var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
+
+          for (let i = 0; i < doctor_advices.length; i++){
+            doctor_advices[i]['is_selected'] = 0
+          }
+          console.log(doctor_advices)
+
+
           var double_check = resp.data.double_check; // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
           var treatment_summary = resp.data.treatment_summary; // 治疗小结

src/pages/main/today/assessmentBefore.vue

           <span class="content">{{ catheter }}</span>
           <span class="unit"></span>
         </li>
-      </ul>
-      <ul>
         <li>
           <label>干体重 : </label>
           <span class="content">{{ dry_weight?dry_weight:''}}</span>
           <span class="unit">{{ dry_weight?'kg':''}}</span>
         </li>
-        <li>
-          <label>舒张压 : </label>
-          <span class="content">{{ diastolic_blood_pressure?diastolic_blood_pressure:'' }}</span>
-          <span class="unit">{{ diastolic_blood_pressure?'mmHg':'' }}</span>
-        </li>
         <li>
           <label>透析期间 : </label>
           <span class="content">{{ dialysis_interphase }}</span>
           <span class="unit"></span>
         </li>
-        <li>
-          <label>合并症: </label>
-          <span class="content">{{ complication }}</span>
-          <span class="unit"></span>
-        </li>
+
+
       </ul>
       <ul>
         <li>
           <span class="unit"></span>
         </li>
         <li style="height: 0.6rem;">
-          <label>出血</label>
+          <label>出血:</label>
           <span class="content">{{ is_hemorrhage ? hemorrhage + ';' + hemorrhage_other : '无' }}</span>
           <span class="unit"> </span>
         </li>
+        <li>
+          <label>合并症: </label>
+          <span class="content">{{ complication }}</span>
+          <span class="unit"></span>
+        </li>
+        <li>
+          <label>透析前症状 : </label>
+          <span class="content">{{ symptom_before_dialysis }}</span>
+          <span class="unit"></span>
+        </li>
+
       </ul>
 
+      <ul>
 
-      <ul v-if="this.$store.getters.user.template_info.template_id == 2">
-        <li>
+        <li  v-if="this.$store.getters.user.template_info.template_id == 2">
+          <label>透析机型号: </label>
+          <span class="content">{{machine_type?machine_type:''}}</span>
+          <span class="unit"></span>
+        </li>
+
+        <li  v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>透析频次: </label>
           <span class="content">{{dialysis_count?dialysis_count:''}}</span>
           <span class="unit">{{ dialysis_count?'次/周':''}}</span>
         </li>
-        <li>
+        <li  v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>血管通路(内瘘) : </label>
           <span class="content">{{blood_access_internal_fistula}}</span>
         </li>
-        <li>
+        <li  v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>血管杂音 : </label>
           <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
         </li>
-
-        <li>
+        <li v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>穿刺方式 : </label>
           <span class="content">{{getWay(this.record.puncture_way)}}</span>
         </li>
-      </ul>
-
-      <ul v-if="this.$store.getters.user.template_info.template_id == 2">
-        <li style="height: 0.6rem;">
-          <label>中心静脉置管</label>
+        <li style="height: 0.6rem;" v-if="this.$store.getters.user.template_info.template_id == 2">
+          <label>中心静脉置管:</label>
           <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
           <span class="unit"> </span>
         </li>
+
+      </ul>
+
+
+
+      <ul v-if="this.$store.getters.user.template_info.template_id == 2">
         <li style="height: 0.6rem;">
-          <label>位置</label>
+          <label>位置:</label>
           <span class="content" v-if="this.record.venous_catheterization_part != -1">{{getVenousCatheterizationPart(this.record.venous_catheterization_part)}}</span>
           <span class="content" v-if="this.record.venous_catheterization_part == -1">{{venous_catheterization_part_other}}</span>
         </li>
+
         <li>
           <label>中心静脉导管: </label>
           <span class="content">{{this.record.ductus_arantii}}</span>
           <span class="content" v-if="this.record.emergency_treatment == -1">{{emergency_treatment_other}}</span>
         </li>
       </ul>
+
     </div>
     <div class="note">备注 : <span>{{remark}}</span></div>
   </div>
       }
     },
     computed: {
+      machine_type:function(){
+        if (this.record == null || this.record.id == '') {
+          return ''
+        }
+        return this.record.machine_type
+
+      },
       weight_before: function () {
         if (this.record == null || this.record.id == '') {
           return '-'

src/pages/waitingRoom/components/assessmentAfter.vue

 <template>
    <div class="plate-box">
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2> 
-    <div class="plate " >   
+    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
+    <div class="plate " >
         <ul>
              <li>
                 <label>透后体重 : </label>
              <li>
                 <label>实际超滤量: </label>
                 <span class="content">{{actual_ultrafiltration}}</span>
-                <span class="unit">ml</span>
+                <span class="unit">L</span>
             </li>
              <li>
                 <label>疑血 : </label>
     </div>
     <div class="note">备注 : <span>{{remark}}</span></div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
-  </div>    
+  </div>
 </template>
 
 <script>
         this.info2[2].content = ""
         this.info2[3].content = ""
         this.info2[4].content = ""
-        
+
         this.info3[0].content = ""
         this.info3[1].content = ""
         this.info3[2].content = ""
         this.info2[2].content = record.actual_displacement
         this.info2[3].content = record.symptom_after_dialysis
         this.info2[4].content = record.catheter
-        
+
         this.info3[0].content = record.temperature
         this.info3[1].content = record.pulse_frequency
         this.info3[2].content = record.actual_treatment_hour

src/pages/waitingRoom/components/dialog/afterThoroughly.vue

         <input type="text" class="inputBox" v-model="assessmentAfterDislysis.breathing_rate">
       </div>
       <div class="cell">
-        <label>实际超滤量(ml)</label>
+        <label>实际超滤量(L)</label>
         <input type="text" class="inputBox" v-model="assessmentAfterDislysis.actual_ultrafiltration">
       </div>
       <div class="cell">