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

src/api/patient.js

@@ -1221,4 +1221,24 @@ export function deletePatientDeathSummary(params){
     method:"get",
     params:params
   })
-}
+}
+
+
+export function createNewSickHistoryRecord(data){
+
+  return request({
+    url:"/api/patient/createnewsickhistoryrecord",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getNewSickHistory(params){
+
+  return request({
+    url:"/api/patient/getnewsickhistory",
+    method:"get",
+    params:params,
+  })
+}
+

src/main.js

@@ -31,6 +31,10 @@ import './xt_permission'
 // import '../static/ueditor/lang/zh-cn/zh-cn.js'
 // import '../static/ueditor/ueditor.parse.min.js'
 // import './mock' // simulation data
+import '../static/ueditor/ueditor.config.js'
+import '../static/ueditor/ueditor.all.min.js'
+import '../static/ueditor/lang/zh-cn/zh-cn.js'
+import '../static/ueditor/ueditor.parse.min.js'
 import VueClipboard from 'vue-clipboard2'
 
 import * as filters from './filters' // global filters

src/router/modules/patient.js

@@ -139,6 +139,17 @@ export default {
       noCache: true
     }
   },
+  {//新
+    path: '/patients/inspection_new',
+    component: () => import('@/xt_pages/user/inspection_new'),
+    hidden: true,
+    is_menu: false,
+    name: 'Inspection',
+    meta: {
+      title: 'inspection',
+      noCache: true
+    }
+  },
   {
     path: '/patients/newInspection',
     component: () => import('@/xt_pages/user/lapsoInspection'),
@@ -213,6 +224,17 @@ export default {
       noCache: true
     }
   },
+  {//新
+    path: '/patients/course_new',
+    component: () => import('@/xt_pages/user/courseOfDisease_new'),
+    hidden: true,
+    is_menu: false,
+    name: 'CourseOfDiseaseManage',
+    meta: {
+      title: 'CourseOfDiseaseManage',
+      noCache: true
+    }
+  },
   {
       path: '/patients/sickhistory',
       component: () => import('@/xt_pages/user/sickHistory'),
@@ -221,6 +243,15 @@ export default {
       name: 'sickHistory',
       meta: { title: 'sickHistory', noCache: true }
   },
+  // 新
+  {
+    path: '/patients/sickHistory_new',
+    component: () => import('@/xt_pages/user/sickHistory_new'),
+    hidden: true,
+    is_menu: false,
+    name: 'sickHistory',
+    meta: { title: 'sickHistory', noCache: true }
+  },
   {
       path: '/patients/inspection_check',
       component: () => import('@/xt_pages/user/inspectionCheck'),
@@ -245,6 +276,15 @@ export default {
     name: 'physicalexamination',
     meta: { title: 'physicalexamination', noCache: true }
   },
+  // 新
+  {
+    path: '/patients/new_physicalexamination',
+    component: () => import('@/xt_pages/user/Physicalexamination_new'),
+    hidden: true,
+    is_menu: false,
+    name: 'physicalexamination',
+    meta: { title: 'physicalexamination', noCache: true }
+  },
   {
     path: '/patients/rescue',
     component: () => import('@/xt_pages/user/rescueRecord'),

src/xt_pages/dialysis/PatientBox.vue

@@ -26,9 +26,9 @@
                 {{ schedule.patient.name
                 }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
               </h3>
-              <span class="num"
-                >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
-              >
+              <span class="num">
+                {{ genderText(schedule) }} | {{ getAge(schedule)>200 ? schedule.patient.age : getAge(schedule) }} 岁
+              </span>
               <div
                 style="
                   margin-left: 10px;
@@ -499,6 +499,8 @@ export default {
       // return nowYear - birthdayYear
     },
     getAge: function (val) {
+      console.log('1111111111222222',val);
+      
       var thisLen = val.patient.id_card_no.length;
       var birth = "";
       if (thisLen == 15) {

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -1036,21 +1036,35 @@
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
+                          <!-- {{
                             record.assessment_after_dislysis.systolic_blood_pressure
                               ? record.assessment_after_dislysis.systolic_blood_pressure
                               : "/"
-                          }}
+                          }} -->
+                          <span v-if="record.monitor_records.length>0">
+                            {{ 
+                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure ?
+                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure :'/'
+                            }}
+                          </span>
+                          <span v-else>/</span>
                         </div>
                         /
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
+                          <!-- {{
                              record.assessment_after_dislysis.diastolic_blood_pressure
                               ?  record.assessment_after_dislysis.diastolic_blood_pressure
                               : "/"
-                          }}
+                          }} -->
+                          <span v-if="record.monitor_records.length>0">
+                            {{ 
+                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure ?
+                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure : '/'
+                            }}
+                          </span>
+                          <span v-else>/</span>
                         </div>
                         mmHg
                       </div>
@@ -1185,7 +1199,7 @@
                               : "/"
                           }}
                         </div>
-                        kg
+                        L
                       </div>
                     </div>
 

src/xt_pages/dialysis/batch_print/batch_print_order_seventyeight.vue

@@ -1412,9 +1412,9 @@
                         </div>
                         min
                       </div>
-                      <div class="inline_block" style="flex: 2">
+                      <div class="inline_block" style="flex: 3">
                         透后宣教：
-                        <div class="under_line" style="width: 60%; text-align: center">
+                        <div class="under_line" style="width: 85%; text-align: left;white-space: normal;">
                           {{ record.summer ? record.summer.mission : '/' }}
                         </div>
                       </div>

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206) ||
               org_id == 10387
             "
           >
@@ -797,7 +797,8 @@
                 org_id == 10340 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10395 
+                org_id == 10395 ||
+                org_id == 10206
                 )
             "
           >
@@ -831,7 +832,8 @@
               org_id !=10340 &&
               org_id !=10432 &&
               org_id !=10445 && 
-              org_id!=10395 
+              org_id!=10395  &&
+              org_id!=10206
             "
           >
             <template slot-scope="scope">
@@ -1683,7 +1685,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206) &&
                 org_id!=10387
             "
           >
@@ -1731,7 +1733,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206)
               || org_id == 10387
             "
           >
@@ -1804,7 +1806,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1881,7 +1883,8 @@
               org_id!=10090 && 
               org_id!=10723 &&
               org_id!=10721 &&
-              org_id!=10727
+              org_id!=10727 &&
+              org_id!=10206
               )
               || org_id == 10387 || org_id == 10694
             "
@@ -1947,7 +1950,7 @@
               org_id!=10395 &&
               org_id!=10617 &&
               org_id!=10677 &&
-              org_id!=10721 && org_id!=10727)
+              org_id!=10721 && org_id!=10727 && org_id!=10206)
               || org_id ==10558 || org_id==10598
             "
           >
@@ -1975,7 +1978,7 @@
                 org_id==10445 ||
                 org_id==10410 ||
                 org_id==10395 || 
-                org_id==10617 || org_id==10677 || org_id == 10721 || org_id!=10727) && org_id !=10558 && org_id!=10598 && org_id!=10414
+                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206) && org_id !=10558 && org_id!=10598 && org_id!=10414
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -2000,7 +2003,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2032,7 +2035,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,18 +20,18 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('透析液温度1')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -1244,9 +1244,9 @@
                       min
                     </div>
 
-                    <div class="inline_block" style="flex: 2">
+                    <div class="inline_block" style="flex: 3">
                       透后宣教：
-                      <div class="under_line" style="width: 80%; text-align: center;white-space: normal;">
+                      <div class="under_line" style="width: 85%; text-align: left;white-space: normal;">
                         {{ summary.mission ? summary.mission : '/' }}
                       </div>
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -876,22 +876,36 @@
                       <div class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
+                        <!-- {{
                           afterdialysis.systolic_blood_pressure
                             ? afterdialysis.systolic_blood_pressure
                             : "/"
-                        }}
+                        }} -->
+                          <span v-if="monitors.length>0">
+                            {{ 
+                              monitors[monitors.length-1].systolic_blood_pressure ?
+                              monitors[monitors.length-1].systolic_blood_pressure :"/"
+                            }}
+                          </span>
+                           <span v-else>/</span>
                       </div>
                       /
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
+                        <!-- {{
                           afterdialysis.diastolic_blood_pressure
                             ? afterdialysis.diastolic_blood_pressure
                             : "/"
-                        }}
+                        }} -->
+                        <span v-if="monitors.length>0">
+                          {{ 
+                            monitors[monitors.length-1].diastolic_blood_pressure ?
+                              monitors[monitors.length-1].diastolic_blood_pressure :"/"
+                          }}
+                        </span>
+                        <span v-else>/</span>
                       </div>
                       mmHg
                     </div>
@@ -1041,7 +1055,7 @@
                             : "/"
                         }}
                       </div>
-                      kg
+                      L
                     </div>
                   </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -278,7 +278,7 @@
 
         <table class="print-table" border="1">
           <tr>
-            <td style="height:40px;line-height:40px">时间</td>
+            <td style="height:25px;line-height:25px">时间</td>
             <td>医嘱</td>
             <td>医师签名</td>
             <td>执行时间</td>
@@ -286,7 +286,7 @@
             <td>核对者签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-            <td style="height:35px;line-height:35px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
             <td class="parent">
               <span v-if="advice.parent_id > 0">---></span>
               <span>{{ advice.advice_name }}</span>
@@ -305,9 +305,9 @@
               </span>
               <span
                 v-else
-                style="display:flex;align-items:center;justify-content:space-around;height:36px;"
+                style="display:flex;align-items:center;justify-content:space-around;height:25px;"
               >
-                <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
+                <img style="height:25px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
               </span>
             </td>
             <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
@@ -319,16 +319,16 @@
               </span>
               <span
                 v-else
-                style="display:flex;align-items:center;justify-content:space-around;height:36px;"
+                style="display:flex;align-items:center;justify-content:space-around;height:25px;"
               >
-                <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+                <img style="height:25px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
               </span>
             </td>
             <td>
               <span v-if="setAdminUserES(advice.checker) == ''">
                 {{ getAdminUser(advice.checker) }}
               </span>
-              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:30px;">
                 <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
               </span>
             </td>
@@ -1238,18 +1238,18 @@ export default {
             this.tableAdvice = tableAdvice
           }
 
-          // if (tableAdvice.length >= 6 && tableAdvice.length <= 8) {
-          //   const length = 6 - tableAdvice.length
-          //   var obj = { advice_name: '', start_time: '' }
-          //   for (i = 0; i < length; i++) {
-          //     console.log(1)
-          //     tableAdvice.push(obj)
-          //   }
+          if (tableAdvice.length >= 6 && tableAdvice.length <= 8) {
+            const length = 6 - tableAdvice.length
+            var obj = { advice_name: '', start_time: '' }
+            for (i = 0; i < length; i++) {
+              console.log(1)
+              tableAdvice.push(obj)
+            }
 
-          //   this.tableAdvice = tableAdvice
-          // }else{
-          //   this.tableAdvice = tableAdvice
-          // }
+            this.tableAdvice = tableAdvice
+          }else{
+            this.tableAdvice = tableAdvice
+          }
           this.afterdialysis = response.data.data.AssessmentAfterDislysis
           console.log('透后评估', this.afterdialysis)
           this.operators = response.data.data.operators

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -13,28 +13,28 @@
 
                 <table class="printTable" border="1">
                     <tr>
-                        <td>序号</td>
-                        <td>名称</td>
-                        <td>规格</td>
-                        <td>批号</td>
-                        <td>生产日期</td>
-                        <td>有效日期</td>
-                        <td>生产企业</td>
-                        <td>国药准字</td>
-                        <td>单位</td>
-                        <td>库存量</td>
+                        <td align="center">序号</td>
+                        <td align="center">名称</td>
+                        <td align="center">规格</td>
+                        <td align="center">批号</td>
+                        <td style="width: 100px;" align="center">生产日期</td>
+                        <td align="center">有效日期</td>
+                        <td align="center">生产企业</td>
+                        <td align="center">国药准字</td>
+                        <td align="center">单位</td>
+                        <td style="width:200px" align="center">库存量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
-                        <td>{{index+1}}</td>
-                        <td>{{item.drug_name}}</td>
-                        <td>{{item.specification_name}}</td>
-                        <td>{{item.batch_number}}</td>
-                        <td>{{getTime(item.product_date)}}</td>
-                        <td>{{getTime(item.expiry_date)}}</td>
-                        <td>{{getManufacturerName(item.manufacturer)}}</td>
-                        <td>{{item.number}}</td>
-                        <td>{{item.max_unit}}</td>
-                        <td></td>
+                        <td align="center">{{index+1}}</td>
+                        <td align="center">{{item.drug_name}}</td>
+                        <td align="center">{{item.specification_name}}</td>
+                        <td align="center">{{item.batch_number}}</td>
+                        <td align="center">{{getTime(item.product_date)}}</td>
+                        <td align="center">{{getTime(item.expiry_date)}}</td>
+                        <td align="center">{{getManufacturerName(item.manufacturer)}}</td>
+                        <td align="center">{{item.number}}</td>
+                        <td align="center">{{item.max_unit}}</td>
+                        <td align="center"></td>
                     </tr>
                 </table>
 

src/xt_pages/stock/inventoryPrint.vue

@@ -13,28 +13,28 @@
 
                 <table class="printTable" border="1">
                     <tr>
-                        <td>序号</td>
-                        <td>名称</td>
-                        <td>规格</td>
-                        <td>批号</td>
-                        <td>生产日期</td>
-                        <td>有效日期</td>
-                        <td>生产企业</td>
-                        <td>国药准字</td>
-                        <td>单位</td>
-                        <td>库存量</td>
+                        <td align="center">序号</td>
+                        <td align="center">名称</td>
+                        <td align="center">规格</td>
+                        <td align="center">批号</td>
+                        <td align="center">生产日期</td>
+                        <td align="center">有效日期</td>
+                        <td style="width: 100px;" align="center">生产企业</td>
+                        <td align="center">国药准字</td>
+                        <td align="center">单位</td>
+                        <td style="width:200px" align="center">库存量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
-                        <td>{{index+1}}</td>
-                        <td>{{item.good_name}}</td>
-                        <td>{{item.specification_name}}</td>
-                        <td>{{item.number}}</td>
-                        <td>{{getTime(item.product_date)}}</td>
-                        <td>{{getTime(item.expiry_date)}}</td>
-                        <td>{{getManufacturerName(item.manufacturer)}}</td>
-                        <td>{{item.remark}}</td>
-                        <td>{{item.packing_unit}}</td>
-                        <td></td>
+                        <td align="center">{{index+1}}</td>
+                        <td align="center">{{item.good_name}}</td>
+                        <td align="center">{{item.specification_name}}</td>
+                        <td align="center">{{item.number}}</td>
+                        <td align="center">{{getTime(item.product_date)}}</td>
+                        <td align="center">{{getTime(item.expiry_date)}}</td>
+                        <td align="center">{{getManufacturerName(item.manufacturer)}}</td>
+                        <td align="center">{{item.remark}}</td>
+                        <td align="center">{{item.packing_unit}}</td>
+                        <td align="center"></td>
                     </tr>
                 </table>
 

src/xt_pages/stock/stockInOrderAdd.vue

@@ -1052,7 +1052,7 @@
      },
      changeGoodCode(row,index){
         this.textarea=""
-        this.textarea = row.drug_code
+        this.textarea = row.good_code
         this.currentRow = row
         this.currentIndex =index
         this.dialogVisible = true

src/xt_pages/stock/stockInOrderEdit.vue

@@ -1053,7 +1053,7 @@ export default {
     },
     changeGoodCode(row,index){
         this.textarea=""
-        this.textarea = row.drug_code
+        this.textarea = row.good_code
         this.currentRow = row
         this.currentIndex =index
         this.dialogVisible = true

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -718,6 +718,13 @@ export default {
           }
 
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+          
+            if( this.recordInfo.recordData[i].count == 0){
+              this.$message.error("出库数量不能为空!")
+              this.loading = false
+              return
+            } 
+
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }
@@ -736,6 +743,8 @@ export default {
 
               this.recordInfo.recordData[i].count = this.recordInfo.recordData[i].count.toString()
 
+             
+
           }
 
           for(let i=0;i<this.recordInfo.recordData.length;i++){
@@ -795,10 +804,12 @@ export default {
             if (response.data.state == 0) {
               this.$message.error("库存不足")
               loading.close()
+              this.loading = false
               return false;
             } else {
                var msg = response.data.data.msg
                this.loading = false
+               loading.close()
                var good_name = response.data.data.good_name
                var specification_name = response.data.data.specification_name
                var storehose_name = response.data.data.storehose_name
@@ -821,12 +832,12 @@ export default {
                  var doctorList = response.data.data.doctorList
                  for(let i=0;i<warehouseOutInfoList.length;i++){
                     for(let j=0;j<manufacturerList.length;j++){
-                       if(warehouseOutInfoList[i].manufacturer_id == manufacturerList[i].id){
-                          warehouseOutInfoList[i].manufacturer_id = manufacturerList[i].manufacturer_name
+                       if(warehouseOutInfoList[i].manufacturer == manufacturerList[i].id){
+                          warehouseOutInfoList[i].manufacturer = manufacturerList[i].manufacturer_name
                        }
                     }
                     for(let z=0;z<dealerList.length;z++){
-                      if(warehouseOutInfoList[i].dealer_id == dealerList[z].id){
+                      if(warehouseOutInfoList[i].dealer == dealerList[z].id){
                          warehouseOutInfoList[i].dealer_id = dealerList[z].dealer_name
                       }
                     }
@@ -849,6 +860,8 @@ export default {
                  this.showCheck = true
                }
                loading.close()
+               this.loading = false
+               loading.close()
 
             }
           });
@@ -966,12 +979,12 @@ export default {
              this.recordInfo.recordData[i].dealer = val.dealer
             }
 
-            for(let i=0;i<this.recordInfo.recordData.length;i++){
-              this.recordInfo.recordData[i].warehouse_info_str = ""
-              for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
-                this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
-              }
-            }
+            // for(let i=0;i<this.recordInfo.recordData.length;i++){
+            //   this.recordInfo.recordData[i].warehouse_info_str = ""
+            //   for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+            //     this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+            //   }
+            // }
 
             console.log("日期我我我哦我",  this.recordInfo.recordData)
          }
@@ -1117,6 +1130,9 @@ export default {
     tempObj['register_number'] = ''
     tempObj['patient_id'] = 0
     tempObj["class_type"] = ""
+    tempObj["product_date"] = ""
+    tempObj["expiry_date"] = ""
+    tempObj["count"] = ""
    
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -430,6 +430,7 @@ import patient from '../../router/modules/patient'
         showReturnCheck:false,
         loading:false,
         patients:[],
+        classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
       }
     },
     methods: {

src/xt_pages/user/components/PatientSidebar.vue

@@ -41,12 +41,20 @@
       >
       </el-tree>
     </div>
-    <div class="patient-app-container " :style="{width:(treeKey!='3-4'&& treeKey!='3-5')?'100vw':''}">
+    <div class="patient-app-container " :style="{width:(treeKey=='3-3')?'100vw':''}">
       <span class="patient-name"
         >姓名：{{ currentPatient.name }} &nbsp;&nbsp; 性别：{{
           tranSex(currentPatient.gender)
         }}
-        &nbsp;&nbsp; 年龄：{{ getAge(currentPatient) }} &nbsp;&nbsp; 透析号：{{
+        &nbsp;&nbsp; 年龄：
+        <span v-if="getAge(currentPatient)>200">
+          {{ currentPatient.age }}
+        </span>
+        <span v-else>
+          {{ getAge(currentPatient) }}
+        </span>
+
+        &nbsp;&nbsp; 透析号：{{
           currentPatient.dialysis_no
         }}
       </span>
@@ -159,10 +167,10 @@ export default {
               name: '3-1',
               label: '病史'
             },
-            // {
-            //   name: '3-4',
-            //   label: '病史新'
-            // },
+            {
+              name: '3-4',
+              label: '病史新'
+            },
             {
               name: '3-2',
               label: '体格检查'
@@ -202,10 +210,10 @@ export default {
               name: '1-3',
               label: '肾科检验'
             },
-            // {
-            //   name: '4-2',
-            //   label: '肾科检验新'
-            // },
+            {
+              name: '4-2',
+              label: '肾科检验新'
+            },
             // {
             //   name: '4-12',
             //   label: '新版肾科检验'
@@ -599,8 +607,6 @@ export default {
        this.treeKey = this.defaultActive
 
     }
-
-
     this.getList()
   },
 

src/xt_pages/user/inspection.vue

@@ -148,13 +148,13 @@
                         <span v-else> {{ scope.row.value }}</span>
                       </span>
                       <span v-if="scope.row.range_type == 1">
-                        <span v-if="scope.row.value < parseFloat(scope.row.range_min) ">
+                        <span v-if="parseFloat(scope.row.value) < parseFloat(getrange(scope.row.range_min)) ">
                           {{ scope.row.value }} <span style="color: blue;" v-if="scope.row.value>0">↓</span>
                         </span>
-                        <span v-if="parseFloat(scope.row.range_min)<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(scope.row.range_max) ">
+                        <span v-if="parseFloat(getrange(scope.row.range_min))<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(getrange(scope.row.range_max)) ">
                           {{ scope.row.value }}
                         </span>
-                        <span v-if="parseFloat(scope.row.value) >parseFloat(scope.row.range_max) ">
+                        <span v-if="parseFloat(scope.row.value) >parseFloat(getrange(scope.row.range_max)) ">
                           {{ scope.row.value }} <span style="color: red;" v-if="scope.row.value>0">↑</span>
                         </span>
                         <span v-if ="scope.row.range_max ==''||scope.row.range_min ==''">
@@ -311,7 +311,7 @@
     </el-dialog>
 
 
-
+<!-- 新增 -->
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogFormVisible"
@@ -693,6 +693,7 @@ export default {
             date: this.itemDate,
             project_id: this.project.project_id
           }
+          console.log('params',params);
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -843,7 +844,7 @@ export default {
           }
 
         }
-        console.log(this.form.formItem)
+        console.log('11111',this.form.formItem)
         this.dialogFormVisible = true
 
       }
@@ -897,6 +898,8 @@ export default {
 
     },
     openNew() {
+      console.log('this.project',this.project);
+
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
@@ -916,10 +919,10 @@ export default {
       for (var index in this.project.inspection_reference) {
         var item_id =0
         if(this.project.inspection_reference[index].item_id == 0){
-            item_id =  parseInt(this.project.inspection_reference[index].id) 
+            item_id =  parseInt(this.project.inspection_reference[index].id)
         }
         if(this.project.inspection_reference[index].item_id > 0){
-          item_id = parseInt(this.project.inspection_reference[index].item_id) 
+          item_id = parseInt(this.project.inspection_reference[index].item_id)
         }
         this.form.formItem.push({
           id: 0,
@@ -1031,7 +1034,7 @@ export default {
 
           console.log("this.form",this.form)
 
-         
+
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -1327,7 +1330,7 @@ export default {
             }
 
             this.inspections = response.data.data.inspections
-            console.log("this.inpections",this.inspections)
+            console.log("this.inpections",response.data.data)
             if (inspections == null) {
               this.inspections = []
               return false
@@ -1354,38 +1357,37 @@ export default {
 
               console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
               if (item.item_id > 0) {
-                console.log('执行0',inspectionsMap[items[index].id]);
 
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{
-                    console.log('执行3',inspectionsMap,item);
+                    console.log('执行1');
+                    
                     if(this.org_id == 10702 || this.org_id == 0){
-                      if(item.project_name == '血常规'|| item.project_name == '透后肾功能' || 
-                          item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能'
+                      if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
+                          item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
+                          item.project_name == '传染病检查'
                         ){
-                        console.log('11111',inspectionsMap[items[index].id].inspect_value);
+
                         item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
                         item.item_name = inspectionsMap[items[index].id].item_name
                       }else{
-                        
                         item.value = ''
                         item.item_name = ''
                       }
                     } else{
+                      console.log('执行2');
                       item.value = ''
                       item.item_name = ''
                     }
                   }
                 } else {
-                  console.log('执行1',inspectionsMap);
+                  console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
                   item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
                   item.item_name = inspectionsMap[items[index].item_id].item_name
                 }
-               
-
                 if(this.org_id ==10191){
                   if(item.project_name == "乙肝定性（五项)"){
                     console.log("金阿迪发到付阿打发")
@@ -1397,7 +1399,7 @@ export default {
                 if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
                   continue
                 }
-                console.log('执行2',inspectionsMap);
+                console.log('执行4',inspectionsMap);
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
               }
@@ -1405,6 +1407,7 @@ export default {
               // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
               item.value_direction = ''
               if (item.range_type == 1) {
+                console.log('执行5',parseFloat(item.value));
                 var value = parseFloat(item.value)
                 var range_min = parseFloat(item.range_min)
                 var range_max = parseFloat(item.range_max)
@@ -1432,7 +1435,6 @@ export default {
                 this.isPic = false
               }
 
-
               console.log("woowwoow",this.isPic)
               console.log("isPicwowowow",this.items)
             }
@@ -1443,7 +1445,15 @@ export default {
       setTimeout(() => {
         this.itemLoading = false
       }, 1000)
-    }
+    },
+    getrange(val){
+      if(val !=''){
+        return (val.replace(/[^\d.]/g, ''))*1;
+      }else{
+        return ''
+      }
+
+    },
   },
   created() {
     const id = this.$route.query && this.$route.query.id

src/xt_pages/user/inspection_new.vue

@@ -657,10 +657,11 @@ export default {
             })
           }else{
             this.form.formItem.push({
-              id: this.list[index].id,
+              // id: this.list[index].item_id,
+              id: this.getid(this.list[index].item_id,row.inspect_date),
               project_id: this.list[index].project_id,
               project_name: this.list[index].project_name,
-              item_id: this.list[index].item_id,
+              item_id: (this.list[index].item_id)*1,
               item_name: this.list[index].item_name,
               range_type: this.list[index].range_type,
               value: this.getvalue(this.list[index].item_id,row.inspect_date) ,
@@ -738,7 +739,6 @@ export default {
           for (var index in this.form.formItem) {
             this.form.formItem[index].value = '' + this.form.formItem[index].value
           }
-
           EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
             if (response.data.state == 1) {
               this.$notify({
@@ -747,8 +747,8 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.patient_info.remind_cycle =
-                response.data.data.remind_cycle
+              // this.patient_info.remind_cycle =
+              //   response.data.data.remind_cycle
               this.itemDate = this.form.inspect_date
               this.items = []
               var inspections = response.data.data.inspections
@@ -788,20 +788,23 @@ export default {
                   this.items.push(item)
                 }
               }
-
-              this.resetForm(formName)
-              this.dialogFormVisible = false
+              this.getchildlist(this.form.project_id)
+              // this.resetForm(formName)
+              
             } else {
               this.$message.error(response.data.msg)
+              // this.dialogFormVisible = false
               return false
             }
           })
-            .catch(v => {
-              this.$message.error(v)
-              return false
-            })
+            // .catch(v => {
+            //   this.$message.error(v)
+            //   return false
+            // })
           this.formLoading = false
-          return false
+          this.dialogFormVisible = false
+          
+          // return false
         } else {
           return false
         }
@@ -817,9 +820,6 @@ export default {
           }
           for (var index in this.form.formItem) {this.form.formItem[index].value ='' + this.form.formItem[index].value}
 
-          console.log("this.form",this.form)
-
-
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -833,9 +833,9 @@ export default {
                   duration: 2000
                 })
                 // this.form.remind_reycle = response.data.data.remind_reycc
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle
-                console.log(this.patient_info.remind_cycle)
+                // this.patient_info.remind_cycle =
+                //   response.data.data.remind_cycle
+                // console.log('this.patient_info.remind_cycle',this.patient_info.remind_cycle)
 
                 this.itemDate = this.form.inspect_date
                 this.items = []
@@ -883,25 +883,26 @@ export default {
                   }
                 }
 
-                this.resetForm(formName)
+                // this.resetForm(formName)
                 this.dialogFormVisible = false
 
                 this.queryParams.patient = this.patientID
                 this.queryParams.project_id = this.project.project_id
                 this.queryParams.page = 1
                 this.total = 0
-                this.fetchPatientInspections(this.queryParams)
+                this.getchildlist(this.project.project_id)
               } else {
                 this.$message.error(response.data.msg)
                 return false
               }
             })
-            .catch(v => {
-              this.$message.error(v)
-              return false
-            })
-          this.formLoading = false
-          return false
+            // .catch(v => {
+            //   this.$message.error(v)
+            //   return false
+            // })
+            // this.dialogFormVisible = false
+            this.formLoading = false
+          // return false
         } else {
           return false
         }
@@ -948,6 +949,8 @@ export default {
     //   this.$refs.singleTable.setCurrentRow(row)
     // },
     resetForm(formName) {
+      console.log('44444',formName);
+      
       this.$refs[formName].resetFields()
     },
     handleCurrentChange(row) {
@@ -1159,19 +1162,35 @@ export default {
 
     },
     getvalue(val,time){
-      console.log();
+      // console.log('val',this.items,val);
       const options = this.items
       for(let i in options){
         if( options[i].inspect_date == time){
           for(let j in options[i].Child){
             if(options[i].Child[j].item_id == val){
-              console.log('options[i].inspect_value',options[i].inspect_value);
+              // console.log('options[i].inspect_value',options[i].inspect_value);
               return options[i].Child[j].inspect_value
             }
 
           }
         }
 
+      }
+    },
+    getid(val,time){
+      // console.log('val',this.items,val);
+      const options = this.items
+      for(let i in options){
+        if( options[i].inspect_date == time){
+          for(let j in options[i].Child){
+            if(options[i].Child[j].item_id == val){
+              // console.log('options[i].inspect_value',options[i].inspect_value);
+              return options[i].Child[j].id
+            }
+
+          }
+        }
+
       }
     }
   },

src/xt_pages/user/patientInfo.vue

@@ -1,9 +1,9 @@
 
 <template>
   <div class="patient-container">
-  <patient-sidebar :id="patientID" v-if="org_id!=0&&org_id!=10702"></patient-sidebar>
-  <PatientSidebar_ord :id="patientID" v-if="org_id==0 || org_id==10702"></PatientSidebar_ord>
-   <!-- <PatientSidebar_new :id="patientID"></PatientSidebar_new> -->
+  <patient-sidebar :id="patientID" v-if="org_id!=10702"></patient-sidebar>
+  <PatientSidebar_ord :id="patientID" v-if="org_id==10702"></PatientSidebar_ord>
+  <!-- <PatientSidebar_new :id="patientID" v-if="org_id == 0"></PatientSidebar_new> -->
   <patient-detail :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-detail>
 
   </div>

src/xt_pages/user/patients.vue

@@ -427,7 +427,7 @@
               :to="'/patients/patient/' + scope.row.id"
               style="color:#409eff;width:100%;display:block;"
             >
-              <span v-if="scope.row.is_infectious == 1">{{ scope.row.name }}</span> 
+              <span v-if="scope.row.is_infectious == 1 || scope.row.is_infectious == 0">{{ scope.row.name }}</span> 
               <span v-if="scope.row.is_infectious == 2" style="color: red;">{{ scope.row.name }}</span> 
             </router-link
             >

src/xt_pages/user/sickHistory_new.vue

@@ -17,24 +17,25 @@
             </div>
             <div>
               <el-table class="table"
-                ref="phy_table"
+                ref="record_table"
                 :data="tableData"
                 :highlight-current-row="true"
-                @row-click="rowclick"
+                @current-change="getCurrentChange"
                 style="width: 100%">
-                <el-table-column
-                  prop="index"
-                  label="序号"
-                  width="50">
+                <el-table-column prop="index" label="序号" width="50" align="center">
+                   <template slot-scope="scope">
+                       {{ scope.$index + 1 }}
+                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="date"
-                  label="时间"
-                  width="">
+                <el-table-column prop="date" label="时间" width="" align="center">
+                    <template slot-scope="scope">
+                         {{ getTime(scope.row.record_time) }}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                  prop="doctor"
-                  label="医生">
+                <el-table-column prop="doctor" label="医生" align="center">
+                  <template slot-scope="scope">
+                         {{ getDocName(scope.row.doctor_id) }}
+                  </template>
                 </el-table-column>
               </el-table>
             </div>
@@ -51,7 +52,7 @@
                   <el-button type="primary" size="small" @click="prints">打印</el-button>
                 </div>
                 <div v-if="add_index == 1">
-                  <el-button type="primary" size="small" @click="showSave">保存</el-button>
+                  <el-button type="primary" size="small" @click="createAction">保存2</el-button>
                   <el-button size="small" @click="showCancel">取消</el-button>
                 </div>
               </div>
@@ -60,7 +61,7 @@
               <div style="flex: 1;">
                 日期:
                 <el-date-picker
-                  v-model="history_date"
+                  v-model="start_time"
                   type="date"
                   :disabled="disabled"
                   style="width: 150px;"
@@ -93,12 +94,12 @@
             <div style="display: flex;">
               <div style="width: 30%;">
                 医生:
-                <el-select v-model="shen_yishen" placeholder="请选择" style="width: 120px;" :disabled="disabled">
+                <el-select v-model="admin_user_id" placeholder="请选择" style="width: 120px;" :disabled="disabled">
                   <el-option
-                    v-for="item in yishen_options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                    v-for="item in doctorOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
                   </el-option>
                 </el-select>
               </div>
@@ -112,13 +113,14 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
+                <el-input v-if="shen_guomi == 2" v-model="guominyaowu_desc"></el-input>
               </div>
             </div>
 
             <div style="margin-top: 15px;">
               <span style="display: inline-block;border-left: 5px solid #3891f1f5;padding-left: 5px;margin-bottom: 5px;">详情</span>
               <keep-alive>
-                <ueditor ref="ue" :content="new_content" id="editor"></ueditor>
+                <ueditor ref="edit" :content="new_content" id="editor"></ueditor>
               </keep-alive>
             </div>
             <div style="text-align: right;margin-top:10px ;">
@@ -174,7 +176,7 @@
               <div class="Second_title">模板内容</div>
               <div style="">
                 <keep-alive>
-                  <ueditor ref="ue" :content="new_content" id="editor"></ueditor>
+                  <ueditor ref="editor" id="editors" v-bind:r_content="new_content"></ueditor>
                 </keep-alive>
               </div>
             </div>
@@ -196,156 +198,11 @@
 
 
 
-      <!-- </div> -->
-      <el-dialog title="新增病史记录" width="70%" top="5vh" :visible.sync="show_dialog">
-        <div>
-          <div class="new_record_form">
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="title" style="width: 150px"></el-input>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
-              <el-date-picker v-model="sick_history_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd "></el-date-picker>
-
-
-              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
-              <el-select style="width: 150px;" v-model="is_shenyizhishi" placeholder="选择肾移植史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-            </div>
-
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-
-              <label class="title" ><span class="name">腹膜透析史</span> : </label>
-              <el-select style="width: 150px;" v-model="is_fumotouxishi" placeholder="选择腹膜透析史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
-              <el-select style="width: 100px;" v-model="doctor_id" placeholder="请选择医生">
-                <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
-              <el-select style="width: 100px;" v-model="is_guominyaowu" placeholder="选择过敏药物">
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-                <el-option label="不详" value="2"></el-option>
-
-              </el-select>
-              <el-input v-if="is_guominyaowu == 1" v-model="guominyaowu_desc"></el-input>
-
-            </div>
-
-            <div class="cell clearfix" >
-              <label class="title"><span class="name">病史模版</span> : </label>
-              <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
-                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
-                           :value="option.content"></el-option>
-              </el-select>
-            </div>
-
-            <div class="textarea_panel">
-              <keep-alive>
-                <editor ref="editor"
-                        id="editors"
-                        style="width: 100%"
-                        v-bind:r_content="new_content"
-                >
-                </editor>
-              </keep-alive>
-            </div>
-
-            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
-              <el-button @click="show_dialog = false">取消</el-button>
-              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
-                         @click="createAction" :loading="uploading_new_record">保存
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </el-dialog>
-
-      <el-dialog title="修改病史记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
-        <div>
-          <div class="new_record_form">
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="edit_title" style="width: 150px"></el-input>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
-              <el-date-picker v-model="edit_sick_history_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd "
-                              value-format="yyyy-MM-dd "></el-date-picker>
-
-
-              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
-              <el-select style="width: 150px;" v-model="edit_is_shenyizhishi" placeholder="选择肾移植史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-            </div>
-
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-
-              <label class="title" ><span class="name">腹膜透析史</span> : </label>
-              <el-select style="width: 150px;" v-model="edit_is_fumotouxishi" placeholder="选择腹膜透析史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
-              <el-select style="width: 100px;" v-model="edit_doctor_id" placeholder="请选择医生">
-                <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
-              <el-select style="width: 100px;" v-model="edit_is_guominyaowu" placeholder="选择过敏药物">
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-              <el-input v-if="edit_is_guominyaowu == 1" v-model="edit_guominyaowu_desc"></el-input>
-
-            </div>
-
-            <div class="cell clearfix">
-              <label class="title"><span class="name">病史模版</span> : </label>
-              <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
-                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
-                           :value="option.content"></el-option>
-              </el-select>
-            </div>
-
-            <div class="textarea_panel">
-              <keep-alive>
-                <editor ref="edit_neditor"
-                        id="editors"
-                        style="width: 100%"
-                        v-bind:r_content="edit_new_content"
-                >
-                </editor>
-              </keep-alive>
-            </div>
-
-
-            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
-              <el-button @click="show_edit_dialog = false">取消</el-button>
-              <el-button type="primary"
-                         @click="modifyAction" :loading="uploading_new_record">保存
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </el-dialog>
+     
+     
     </div>
   </div>
-  <!-- </div> -->
+ 
 </template>
 
 <script>
@@ -356,14 +213,15 @@ import ueditor from '@/components/Uedtior'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
  import print from 'print-js'
 import {
-  createSickHistoryRecord,
+  createNewSickHistoryRecord,
   deleteSickHistoryRecords,
-  GetSickHistoryRecords,
+  getNewSickHistory,
   ModifySickHistoryRecord,
+  getSickHistoryByPatient
 } from '@/api/patient'
 import { parseTime } from '@/utils'
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-
+import BreadCrumb from '@/xt_pages/components/bread-crumb' 
+import { uParseTime } from '@/utils/tools'
 export default {
   name: 'CourseOfDisease',
   components: {
@@ -402,7 +260,7 @@ export default {
       uploading_new_record: false,
       templates: this.$store.getters.configlist.sick_history,
       select_template:"",
-      new_content: '111111',
+      new_content: '',
       edit_new_content: '',
       edit_sick_history_time: '',
       selectingRows: [],
@@ -427,11 +285,15 @@ export default {
       yizhi_options:[{value:1,label:'无'},{value:2,label:'有'}],
       yishen_options:[],
       guomi_options:[{value:1,label:'无'},{value:2,label:'有'},{value:3,label:'不详'}],
-      tableData:[{index:1,date:'2024-11-12',doctor:'王启年'}],
+      tableData:[],
+      admin_user_id:"",
     }
   },
   created() {
+    this.admin_user_id = this.$store.getters.xt_user.user.id
+    
     this.patient_id = parseInt(this.$route.query.id)
+
     if (isNaN(this.patient_id) || this.patient_id <= 0) {
       this.$notify.error({
         title: '错误',
@@ -464,7 +326,7 @@ export default {
       '-' +
       (nowDay < 10 ? '0' + nowDay : nowDay)
 
-    this.requestSickHistory()
+    this.getlist()
     this.fetchAllDoctorAndNurse()
 
   },
@@ -476,6 +338,9 @@ export default {
     // },10)
   },
   methods: {
+    template_dele(){
+
+    },
     add_click(){
       this.disabled = false
       this.add_index = 1
@@ -529,29 +394,7 @@ export default {
         }
       });
     },
-    requestSickHistory: function() {
-      this.loading = true
-      let params = {
-        patient_id:this.patient_id,
-        start_time:this.start_time,
-        end_time:this.end_time,
-      }
-      GetSickHistoryRecords(params).then(rs => {
-        this.loading = false
-        var resp = rs.data
-        if (resp.state == 1) {
-          this.current_select_record = null
-          this.records = resp.data.records
-          this.doctors = resp.data.doctors
-          this.$refs.record_table.setCurrentRow(this.records[0])
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(error => {
-        this.loading = false
-        this.$message.error(error)
-      })
-    },
+  
 
     didChangeCurrentRecord: function(record) {
       this.current_select_record = record
@@ -560,15 +403,6 @@ export default {
       var time = new Date(timestamp * 1000)
       return parseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
     },
-    doctorName: function(doctor_id) {
-      for (let index = 0; index < this.doctorOptions.length; index++) {
-        const doctor = this.doctorOptions[index]
-        if (doctor.id == doctor_id) {
-          return doctor.name
-        }
-      }
-      return ''
-    },
     modifyAction: function() {
       this.edit_new_content = this.$refs.edit_neditor.content
       if (this.edit_new_content.length == 0) {
@@ -577,16 +411,16 @@ export default {
       }
       this.uploading_new_record = true
       let params = {
-        id:this.edit_current_id,
+        id:this.id,
         patient_id: this.patient_id,
-        content: this.edit_new_content,
-        record_time: this.edit_sick_history_time + " 00:00:00",
-        title: this.edit_title,
-        is_shenyizhishi:this.edit_is_shenyizhishi,
-        is_fumotouxishi:this.edit_is_fumotouxishi,
-        is_guominyaowu:this.edit_is_guominyaowu,
-        guominyaowu_desc:this.edit_guominyaowu_desc,
-        doctor_id: this.edit_doctor_id
+        content: this.new_content,
+        record_time: this.sick_history_time +" 00:00:00",
+        title: this.title,
+        is_shenyizhishi:this.shen_yizhi,
+        is_fumotouxishi:this.shen_fumo,
+        is_guominyaowu:this.shen_guomi,
+        guominyaowu_desc:this.guominyaowu_desc,
+        doctor_id: this.admin_user_id
       }
 
       ModifySickHistoryRecord(params).then(rs => {
@@ -619,36 +453,30 @@ export default {
     },
 
     createAction: function() {
-      this.new_content = this.$refs.editor.content
+    
+      this.new_content = this.$refs.edit.contents
       if (this.new_content.length == 0) {
         this.$message.error('请填写病程内容')
         return
       }
-      this.uploading_new_record = true
       let params = {
         patient_id: this.patient_id,
         content: this.new_content,
-        record_time: this.sick_history_time +" 00:00:00",
+        record_time: this.start_time,
         title: this.title,
-        is_shenyizhishi:this.is_shenyizhishi,
-        is_fumotouxishi:this.is_fumotouxishi,
-        is_guominyaowu:this.is_guominyaowu,
+        is_shenyizhishi:this.shen_yizhi,
+        is_fumotouxishi:this.shen_fumo,
+        is_guominyaowu:this.shen_guomi,
         guominyaowu_desc:this.guominyaowu_desc,
-        doctor_id: this.doctor_id
+        doctor_id: this.admin_user_id
       }
-      createSickHistoryRecord(params).then(rs => {
-        this.uploading_new_record = false
-        this.$message.success("新增成功")
-        var resp = rs.data
-        if (resp.state == 1) {
-          this.records.unshift(resp.data.record)
-          this.show_dialog = false
-          this.new_content = ''
-          this.title = ''
-          this.$refs.record_table.setCurrentRow(this.records[0])
-        } else {
-          this.$message.error(resp.msg)
-        }
+      console.log("params-------------",params)
+      createNewSickHistoryRecord(params).then(response => {
+         if(response.data.state == 1){
+           var patientSickHistory = response.data.data.patientSickHistory
+           this.$message.success("保存成功!")
+           this.getlist()
+         }
 
       }).catch(error => {
         this.uploading_new_record = false
@@ -712,20 +540,8 @@ export default {
         this.loading = false
         this.$message.error(err)
       })
-    }, startTimeChange(val) {
-      this.requestSickHistory()
-    }, endTimeChange(val) {
-      this.requestSickHistory()
     },
-    showDialog(){
-      for(let i = 0; i < this.doctorOptions.length; i++){
-        if(this.doctorOptions[i].id == this.$store.getters.xt_user.user.id){
-          this.doctor_id =this.$store.getters.xt_user.user.id
-        }
-      }
-      this.show_dialog = true
-
-    },showEdit() {
+    showEdit() {
       if (this.table_current_index == -1) {
         this.$message.error('请选择要修改的病程内容')
         return
@@ -760,6 +576,40 @@ export default {
         return
       }
       this.$router.push({ path: "/sickhistory/print?ids="+this.ids+"&patient_id="+this.patient_id});
+    },
+    getlist(){
+       var params = {
+        patient_id:this.patient_id
+       }
+      getNewSickHistory(params).then(response=>{
+        if(response.data.state ==1 ){
+          var list = response.data.data.list
+          this.tableData = list
+          this.$refs.record_table.setCurrentRow(this.tableData[0])
+        } 
+      })
+    },
+    getDocName(admin_user_id){
+      var user_name = ""
+      for(let i=0;i<this.doctorOptions.length;i++){
+        if(admin_user_id == this.doctorOptions[i].id){
+             user_name = this.doctorOptions[i].name
+        }
+      }
+      return user_name
+    },
+    getTime (time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
+    getCurrentChange(val){
+       console.log("VAL---------------",val)
+      this.record_time = this.getTime(val.record_time)
+      this.id = val.id
+      this.content = val.content
+      this.guominyaowu_desc = val.hypersusceptibility_desc
+
+      this.is_fumotouxishi = val.is_fumo_dialysis_history
+      this.is_hypersusceptibility  = val.is_shenyizhi_history
     }
   }
 }

static/ueditor/ueditor.config.js

@@ -229,9 +229,9 @@
         //]
 
         //打开右键菜单功能
-        //,enableContextMenu: true
+        // ,enableContextMenu: true
         //右键菜单的内容，可以参考plugins/contextmenu.js里边的默认菜单的例子，label留空支持国际化，否则以此配置为准
-        //,contextMenu:[
+        // ,contextMenu:[
         //    {
         //        label:'',       //显示的名称
         //        cmdName:'selectall',//执行的command命令，当点击这个右键菜单时
@@ -241,7 +241,7 @@
         //            //this.ui._dialogs['inserttableDialog'].open();
         //        }
         //    }
-        //]
+        // ]
 
         //快捷菜单
         //,shortcutMenu:["fontfamily", "fontsize", "bold", "italic", "underline", "forecolor", "backcolor", "insertorderedlist", "insertunorderedlist"]