修改

src/pages/advice/DialysisAdviceTable.vue

@@ -108,7 +108,7 @@
       </template>
      </table>
      <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
-    
+
     </div>
 
   <mt-datetime-picker
@@ -203,6 +203,87 @@ export default {
 
         scheduleMap = _scheduleMap;
       }
+      for(var key in scheduleMap) {
+        let mapArr =  scheduleMap[key]
+        for (let i = 0; i < mapArr.length; i++) {
+          mapArr[i]['new_advice'] = []
+        }
+      }
+
+      for(var key in scheduleMap) {
+       let mapArr =  scheduleMap[key]
+        for (let i = 0; i < mapArr.length; i++) {
+         var  maps = mapArr[i]
+          var resp_advices = maps.doctor_advice
+          if (resp_advices.length > 0) {
+            var newGroupObject = function () {
+              return Object.assign({}, {
+                group_no: 0,
+                advices: [],
+              })
+            }
+            var initGroupBlock = function (group, advice) {
+              group.group_no = advice.groupno
+            }
+
+            var advice_groups = []
+            var group = newGroupObject()
+            for (let index = 0; index < resp_advices.length; index++) {
+              const advice = resp_advices[index];
+              if (advice.groupno == 0) { // 老版本的医嘱
+                if (advice.parent_id > 0) {
+                  if (advice_groups.length > 0) {
+                    var parent_group = advice_groups[advice_groups.length - 1]
+                    if (parent_group.advices.length > 0) {
+                      if (parent_group.advices[0].id == advice.parent_id) {
+                        parent_group.advices.push(advice)
+                      }
+                    }
+                  }
+                  continue
+
+                } else {
+                  if (group.group_no > 0) {
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                  }
+
+                  initGroupBlock(group, advice)
+                  group.advices.push(advice)
+                  advice_groups.push(group)
+                  group = newGroupObject()
+                  continue
+                }
+
+              } else {
+                if (group.group_no > 0 && group.group_no != advice.groupno) {
+                  advice_groups.push(group)
+                  group = newGroupObject()
+                }
+                if (group.group_no == 0) {
+                  initGroupBlock(group, advice)
+                }
+                if (group.group_no == advice.groupno) {
+                  group.advices.push(advice)
+                }
+              }
+            }
+            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+              advice_groups.push(group)
+            }
+            advice_groups = advice_groups
+          } else {
+            advice_groups = []
+          }
+          maps.new_advice.push(advice_groups)
+        }
+      }
+
+
+      console.log(scheduleMap)
+
+
+
       return scheduleMap;
     }
   },
@@ -402,7 +483,7 @@ export default {
   }
 }
 .DialysisAdvice{
-  padding-top:115px; 
+  padding-top:115px;
   background: #fff;
   min-height: calc(100vh - 2px);
 }

src/pages/main/dialog/AssessmentDialog.vue

@@ -198,7 +198,7 @@
         </div>
 
         <div class="item" ref="venous_catheterization_part_other"
-             v-if="this.formValue.venous_catheterization_part == -1 && this.$store.getters.user.template_info.template_id == 2">
+             v-if="this.$store.getters.user.template_info.template_id == 2">
           <h2 class="name">其他位置</h2>
           <div class="content">
             <input @focus="inputFocus" v-model="formValue.venous_catheterization_part_other"/>
@@ -223,7 +223,7 @@
           </div>
         </div>
 
-        <div class="item" ref="emergency_treatment_other" v-if="this.formValue.emergency_treatment == -1 && this.$store.getters.user.template_info.template_id == 2">
+        <div class="item" ref="emergency_treatment_other" v-if="this.$store.getters.user.template_info.template_id == 2">
           <h2 class="name">其他急诊情况</h2>
           <div class="content">
             <input @focus="inputFocus" v-model="formValue.emergency_treatment_other"/>
@@ -245,7 +245,7 @@
 
     </div>
     <!--<two-menu title="二级菜单" v-show="true" ></two-menu>-->
-    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
+    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
                         :propsForm="propForm"></check-box-sub-menu>
   </div>
 </template>
@@ -913,7 +913,38 @@
             dialogTop.scrollTop = 0
           })
         }
+      },menuEmpty:function (val) {
+        this.visibility = false
+        this.isShowDialog = true
+        switch (val.type) {
+          case 6:
+            this.formValue.blood_access_part_id = ''
+            break
+          case 7:
+            this.formValue.blood_access_part_opera_id = ''
+            break
+          case 11:
+            this.formValue.catheter_bend = ''
+            break
+
+          case 13:
+            this.formValue.blood_access_noise = ''
+            break
+          case 14:
+            this.formValue.venous_catheterization = ''
+            break
+          case 15:
+            this.formValue.venous_catheterization_part = ''
+            break
+          case 17:
+            this.formValue.emergency_treatment = ''
+            break
+          case 18:
+            this.formValue.puncture_way = ''
+            break
+        }
       }
+
     }, components: {
       CheckBoxSubMenu,
 

src/pages/main/dialog/PrescriptionDialog.vue

@@ -182,6 +182,14 @@
           </div>
         </div>
 
+        <div class="item"  v-if="this.$store.getters.user.template_info.template_id == 2">
+          <label class="name" for="knj">体液过多其他症状</label>
+          <div class="content">
+            <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.body_fluid_other"/>
+          </div>
+        </div>
+
+
         <div @click="showSubMenu('special_medicine')" class="item" ref="special_medicine" v-if="this.$store.getters.user.template_info.template_id == 2">
           <label class="name" for="knj">透析前使用特殊药物</label>
           <div class="content">
@@ -190,7 +198,7 @@
           </div>
         </div>
 
-        <div class="item"  v-if="this.$store.getters.user.template_info.template_id == 2 && dialysisPrescription.special_medicine == 4">
+        <div class="item"  v-if="this.$store.getters.user.template_info.template_id == 2">
           <label class="name" for="knj">透析前使用其他特殊药物</label>
           <div class="content">
             <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.special_medicine_other"/>
@@ -266,7 +274,7 @@
       </div>
     </div>
     <!--<two-menu title="二级菜单" v-show="isShowModeSubMenu"></two-menu>-->
-    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
+    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"  v-on:menu-empty="menuEmpty"
                         :propsForm="propForm"></check-box-sub-menu>
 
     <mt-datetime-picker
@@ -379,6 +387,7 @@
           displace_liqui_value:"",
           blood_access:"",
           ultrafiltration:"",
+          body_fluid_other:"",
         },
         anticoagulant: {
           id: 0,
@@ -826,6 +835,44 @@
         }
         return blood_access_name;
 
+      },menuEmpty:function (val) {
+        this.visibility = false
+        this.isShowDialog = true
+        switch (val.type) {
+          case 1:
+            this.dialysisPrescription.mode_id = '';
+
+            break;
+          case 2:
+            this.dialysisPrescription.dialyzer ='';
+            break;
+
+          case 3:
+            this.dialysisPrescription.perfusion_apparatus = '';
+            break;
+          case 4:
+            this.dialysisPrescription.replacement_way = '';
+            break;
+          case 5:
+            this.anticoagulant = '';
+            break;
+          case 6:
+            this.dialysisPrescription.dialysate_formulation = '';
+            break;
+          case 7:
+            this.dialysisPrescription.body_fluid = '';
+            break;
+          case 8:
+            this.dialysisPrescription.special_medicine = '';
+            break;
+          case 9:
+            this.dialysisPrescription.displace_liqui_part = '';
+            break;
+          case 10:
+            this.dialysisPrescription.blood_access = '';
+            break;
+        }
+
       }
     },
     created() {

src/pages/main/dialog/ThorougDialog.vue

@@ -281,7 +281,7 @@
         </div>
 
         <div @click="showSubMenu('disequilibrium_syndrome_option')" class="item" ref="disequilibrium_syndrome_option" v-if="formValue.disequilibrium_syndrome == 2 && this.$store.getters.user.template_info.template_id == 2">
-          <label class="name" for="dg">失衡综合症情况</label>
+          <label class="name" for="dg">失衡综合症症状</label>
           <div class="content">
             <span class="text" id="dg">{{formValue.disequilibrium_syndrome_option}}</span>
             <span class="iconfont">&#xe6f9;</span>
@@ -331,7 +331,7 @@
 
     </div>
     <!--<two-menu title="二级菜单" v-show="true" ></two-menu>-->
-    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
+    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
                         :propsForm="propForm"></check-box-sub-menu>
 
     <mt-datetime-picker
@@ -1049,6 +1049,51 @@
         }
         return hemostasisOperaName
 
+      },menuEmpty:function (val) {
+        this.visibility = false
+        this.isShowDialog = true
+        switch (val.type) {
+
+          case 5:
+            this.formValue.blood_access_part_id = ''
+            break
+          case 6:
+            this.formValue.blood_access_part_opera_id = ''
+            break
+
+          case 8:
+            this.formValue.internal_fistula_tremor_ac = ''
+            break;
+          case 9:
+            this.formValue.patient_gose =''
+            break;
+
+          case 11:
+            this.formValue.dialysis_process = ''
+            break;
+
+          case 13:
+            this.formValue.hemostasis_opera = ''
+            break;
+          case 14:
+            this.formValue.tremor_noise = ''
+            break;
+          case 15:
+            this.formValue.disequilibrium_syndrome = ''
+            break;
+
+          case 17:
+            this.formValue.arterial_tube = ''
+            break;
+          case 18:
+            this.formValue.intravenous_tube = ''
+            break;
+          case 19:
+            this.formValue.dialyzer = ''
+
+            break;
+        }
+
       }
 
     },

src/pages/main/dialog/subMenu/checkBoxSubMenu.vue

@@ -11,9 +11,9 @@
     <div v-if="propsForm.isMultiple == 1" class="optionsBox">
       <div class="list">
         <ul>
-          <!--<li  @click="itemClick(-2)"  :key="-2" value="-2" >请选择</li>-->
+          <li  @click="itemClick(-2)"  :key="-2" value="-2" >请选择</li>
           <li  @click="itemClick(item.id)"  v-for="item in propsForm.optionList" :key="item.id" value="item" :class="propsForm.selectId == item.id? 'tick':'' ">{{item.name}}</li>
-          <li v-if="propsForm.isHasOther == 1 && this.$store.getters.user.template_info.template_id == 2" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>
+          <!--<li v-if="propsForm.isHasOther == 1 && this.$store.getters.user.template_info.template_id == 2" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>-->
 
         </ul>
       </div>
@@ -79,9 +79,9 @@ export default {
       return form;
     },
     itemClick: function(id) {
-      // if(id == -2){
-      //   this.visibility = false
-      // }
+      if(id == -2){
+        this.$emit("menu-empty", this.getValue());
+      }
       this.propsForm.selectId = id;
       this.$emit("menu-comfirm", this.getValue());
     }

src/pages/main/today/dialysisComputer.vue

@@ -16,9 +16,9 @@
                 <span class="content">{{stage}}</span>
             </li>
           <li>
-            <label>上机时间 : </label>
-            <span class="content">{{start_time}}</span>
-          </li>
+          <label>上机时间 : </label>
+          <span class="content">{{start_time}}</span>
+        </li>
         </ul>
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->

src/pages/main/today/dialysisPrescription.vue

@@ -116,7 +116,7 @@
           <span class="content">{{special_medicine}}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="this.$store.getters.user.template_info.template_id == 2&&this.prescription.special_medicine == 4">
+        <li v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>透析前使用其他特殊药物: </label>
           <span class="content">{{special_medicine_other}}</span>
           <span class="unit"></span>

src/store/modules/globalConfig.js

@@ -550,7 +550,6 @@ const global_config = {
       {id: 1, name: "无"},
       {id: 2, name: "降压药"},
       {id: 3, name: "抗凝"},
-      {id: 4, name: "其他"},
     ],
     blood_access:[
       {id: 1, name: "内瘘"},