修改

src/api/advice.js

@@ -93,4 +93,13 @@ export function modifyAdviceGroupStartTime(group_no, start_time_str) {
             start_time: start_time_str,
         }
     })
-}
+}
+
+
+export function ExecSingleDoctorAdvice(params){
+  return request({
+    url:'/m/api/advice/exec/single',
+    method:'Post',
+    params:params,
+  })
+}

src/pages/main/PatientBox.vue

@@ -30,6 +30,7 @@
 
 <script>
 import { parseTime } from "@/utils";
+import { jsGetAge } from '@/utils/tools'
 
 export default {
   name: "PatientBox",
@@ -142,12 +143,21 @@ export default {
       }
     },
     age: function(schedual) {
-      var now = new Date();
-      var nowYear = parseTime(now, "{y}");
-      var birthdayYear = parseTime(schedual.patient.birthday, "{y}");
-      // console.log(nowYear)
-      // console.log(birthdayYear)
-      return nowYear - birthdayYear;
+      if(schedual.patient.age == 0){
+
+        return jsGetAge(parseTime(schedual.patient.birthday, '{y}-{m}-{d}'), '-')
+
+      }else{
+
+        return schedual.patient.age
+      }
+
+      // var now = new Date();
+      // var nowYear = parseTime(now, "{y}");
+      // var birthdayYear = parseTime(schedual.patient.birthday, "{y}");
+      // // console.log(nowYear)
+      // // console.log(birthdayYear)
+      // return nowYear - birthdayYear;
     },
     detailAction: function(schedual) {
       var patient_id = schedual.patient_id;

src/pages/main/today/TodayTab.vue

@@ -929,9 +929,12 @@ export default {
       this.closeDialog(7);
       this.scrollToView("dialysis_off");
     },
-    closeAssessmentAfter: function() {
+    closeAssessmentAfter: function(assessment_after_dislysis) {
       this.closeDialog(8);
       this.scrollToView("assessment_after");
+      if(assessment_after_dislysis != undefined){
+        this.assessment_after_dislysis = assessment_after_dislysis
+      }
     },
     closeTreatmentOf: function() {
       this.closeDialog(9);

src/pages/main/today/acceptsAssessment.vue

@@ -11,9 +11,6 @@
           <label>病人情况 : </label>
           <span class="content">{{condition}}</span>
         </li>
-      </ul>
-
-      <ul>
         <li style="height: 0.6rem;">
           <label>病人意识 : </label>
           <span class="content">{{consciousness}}</span>
@@ -23,6 +20,7 @@
           <span class="content">{{posture}}</span>
         </li>
       </ul>
+
       <ul>
         <li style="height: 0.6rem;">
           <label>病人食欲 : </label>
@@ -32,19 +30,19 @@
           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
-      </ul>
-
-      <ul v-if="this.$store.getters.user.template_info.template_id == 2">
-        <li style="height: 0.6rem;">
+        <li style="height: 0.6rem;" v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>风险程度:</label>
           <span class="content">{{dangerLevel}}</span>
         </li>
-        <li style="height: 0.6rem;">
+        <li style="height: 0.6rem;" v-if="this.$store.getters.user.template_info.template_id == 2">
           <label>摄入量:</label>
           <span class="content">{{intakes}}</span>
         </li>
+
       </ul>
 
+
+
       <ul v-if="this.$store.getters.user.template_info.template_id == 2">
         <li style="height: 0.6rem;">
           <label>营养状况:</label>
@@ -54,15 +52,13 @@
           <label> 心理评估</label>
           <span class="content">{{psychologicalAssessment}}</span>
         </li>
-      </ul>
-
-      <ul v-if="this.$store.getters.user.template_info.template_id == 2 &&this.record.psychological_assessment == 2 ">
-        <li style="height: 0.6rem;">
+        <li style="height: 0.6rem;" v-if="this.$store.getters.user.template_info.template_id == 2 &&this.record.psychological_assessment == 2 ">
           <label>心理评估异常原因:</label>
           <span class="content">{{this.record.psychological_assessment_other}}</span>
         </li>
       </ul>
 
+
     </div>
   </div>
 </template>

src/pages/main/today/detailsInfo.vue

@@ -50,6 +50,7 @@ x<template>
 
 <script>
 import { parseTime } from "@/utils";
+import { jsGetAge } from '@/utils/tools'
 
 export default {
   name: "DetailsInfo",
@@ -109,13 +110,10 @@ export default {
 
     },
     age: function() {
-      var str =  parseTime(this.patient.birthday, "{y}/{m}/{d}");
-      var r = str.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/);
-      if (r == null) return false;
-      var d =new Date(r[1],r[3]-1,r[4]);
-      if (d.getFullYear()==r[1]&&(d.getMonth()+1)==r[3]&&d.getDate()==r[4]){
-        var Y = new Date().getFullYear();
-        return((Y-r[1])+"周岁");
+      if (this.patient.age == 0){
+        return jsGetAge(parseTime(this.patient.birthday, '{y}-{m}-{d}'), '-')
+      }else{
+        return this.patient.age
       }
     },
     source: function() {

src/pages/main/today/statOrder.vue

@@ -30,11 +30,11 @@
               <span>{{advice.execution_frequency}}</span>
             </td>
 
-            <td v-if="i == 0" :rowspan="group.advices.length">{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>
+            <td>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>
 
-            <td v-if="i == 0" :rowspan="group.advices.length">{{advice.execution_staff != 0 ? (doctor_map[advice.execution_staff] != undefined ? doctor_map[advice.execution_staff].name : "") : ""}}</td>
+            <td>{{advice.execution_staff != 0 ? (doctor_map[advice.execution_staff] != undefined ? doctor_map[advice.execution_staff].name : "") : ""}}</td>
 
-            <td v-if="i == 0" :rowspan="group.advices.length">{{advice.checker != 0 ? (doctor_map[advice.checker] != undefined ? doctor_map[advice.checker].name : "") : ""}}</td>
+            <td>{{advice.checker != 0 ? (doctor_map[advice.checker] != undefined ? doctor_map[advice.checker].name : "") : ""}}</td>
         </tr>
       </template>
     </table>
@@ -167,7 +167,7 @@ export default {
       line-height: 0.88rem;
       font-weight: normal;
     }
-   
+
 
     .advice_content {
       text-align: left;