修改华侨bug

src/api/patient.js

@@ -148,10 +148,11 @@ export function getCourseOfDiseaseRecords(patient_id, start_time_ymd, end_time_y
   })
 }
 
-export function createCourseOfDiseaseRecord(patient_id, content) {
+export function createCourseOfDiseaseRecord(patient_id, content, record_time) {
   var params = {
     patient_id: patient_id,
-    content: content
+    content: content,
+    record_time: record_time,
   }
   return request({
     url: '/api/patient/course/create',

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -36,7 +36,7 @@
             <div class="inline_block" style="margin-left: 25px;">
               住院号：
               <div class="under_line" style="width: 100px;">
-                {{record.patient.admission_number?record.patient.admission_number:'无'}}
+                {{record.patient.admission_number?record.patient.admission_number:'/'}}
               </div>
             </div>
           </div>
@@ -184,7 +184,7 @@
                       <div class="inline_block">
                         跌倒风险评估：
                         评分：
-                        <div class="under_line" style="width: 50px;"></div>
+                        <div class="under_line" style="width: 50px;">{{record.receive_assessment.score}}</div>分
                         &emsp;风险程度：
                         <check-box text="无" :checked="isCheckBoxChecked(record.receive_assessment, 'danger_level', 1)"></check-box>
                         <check-box text="低风险" :checked="isCheckBoxChecked(record.receive_assessment, 'danger_level', 2)"></check-box>
@@ -247,19 +247,19 @@
                         </tr>
                         <!-- </thead>
                         <tbody> -->
-                        <tr v-if="(record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure != 0&&record.assessment_before_dislysis.diastolic_blood_pressure != 0)||(record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length > 0)">
+                        <tr v-if="(record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure != 0&&record.assessment_before_dislysis.diastolic_blood_pressure != 0)||(record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length > 0) ||(record.assessment_before_dislysis&&record.assessment_before_dislysis.pulse_frequency != 0) ||(record.assessment_before_dislysis&&record.assessment_before_dislysis.breathing_rate  != 0)">
                           <td>{{'透析前'}}</td>
                           <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure?record.assessment_before_dislysis.systolic_blood_pressure:''}}/{{record.assessment_before_dislysis &&record.assessment_before_dislysis.diastolic_blood_pressure?record.assessment_before_dislysis.diastolic_blood_pressure:''}}</td>
-                          <td>{{''}}</td>
-                          <td>{{''}}</td>
+                          <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.pulse_frequency?record.assessment_before_dislysis.pulse_frequency:''}}</td>
+                          <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.breathing_rate?record.assessment_before_dislysis.breathing_rate:''}}</td>
                           <td>{{''}}/{{''}}</td>
                           <td>{{''}}</td>
                           <td>{{''}}</td>
                           <td>{{''}}</td>
                           <td style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> {{record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length>0?record.assessment_before_dislysis.remark:''}}</span></div></td>
                           <td>
-                            <span v-if="setAdminUserES(record.assessment_before_dislysis.creater) == ''">{{getAdminUser(record.assessment_before_dislysis.creater)}}</span>
-                            <img class="es-img" :src="setAdminUserES(record.assessment_before_dislysis.creater)"  alt="" srcset="" v-else>
+                            <span v-if="setAdminUserES(record.assessment_before_dislysis, 'creater') == ''">{{getAdminUser(record.assessment_before_dislysis,'creater')}}</span>
+                            <img class="es-img" :src="setAdminUserES(record.assessment_before_dislysis,'creater')"  alt="" srcset="" v-else>
                           </td>
                         </tr>
                         <tr v-for="(monitor_record, index) in record.monitor_records" :key="index">
@@ -269,7 +269,7 @@
                           <td>{{monitor_record.breathing_rate?monitor_record.breathing_rate:''}}</td>
                           <td>{{monitor_record.venous_pressure?monitor_record.venous_pressure:''}}/{{monitor_record.arterial_pressure?monitor_record.arterial_pressure:''}}</td>
                           <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
-                          <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:''}}</td>
+                          <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:'/'}}</td>
                           <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                           <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></div></td>
                           <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else style="height: 20px;"></td>
@@ -282,7 +282,7 @@
             </table>
           </div>
           <div v-if="record.monitor_records.length > 8 " :class="record.monitor_records.length > 8  ? 'margin-bottom-300': ''" style="text-align:center;margin-top:10px;">1</div>
-          
+
           <template v-if="record.monitor_records.length > 8 ">
             <div class="order-yy-name">{{orgname}}</div>
             <div class="order_title">血液净化专科护理记录单</div>
@@ -312,7 +312,7 @@
               <div class="inline_block" style="margin-left: 25px;">
                 住院号：
                 <div class="under_line" style="width: 100px;">
-                  {{record.patient.admission_number?record.patient.admission_number:'无'}}
+                  {{record.patient.admission_number?record.patient.admission_number:'/'}}
 
                 </div>
               </div>
@@ -352,7 +352,7 @@
                           <td>{{monitor_record.breathing_rate?monitor_record.breathing_rate:''}}</td>
                           <td>{{monitor_record.venous_pressure?monitor_record.venous_pressure:''}}/{{monitor_record.arterial_pressure?monitor_record.arterial_pressure:''}}</td>
                           <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
-                          <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:''}}</td>
+                          <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:'/'}}</td>
                           <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                           <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> {{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></div></td>
                           <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else style="height: 20px;"></td>
@@ -482,7 +482,7 @@
                       <div class="inline_block">
                         &emsp;核对时间：
                         <div class="under_line" style="width: 200px;">
-                          {{record.check&&record.check.modifier> 0?getTime(record.check.check_time,'{y}年{m}月{d}日 {h}时'):''}}
+                          {{record.check&&record.check.modifier> 0?getTime(record.check.check_time,'{y}年{m}月{d}日 {h}时{i}分'):''}}
                         </div>
                       </div>
                       <div class="inline_block" >
@@ -524,7 +524,7 @@
                       <div class="inline_block">
                         &emsp;时间：
                         <div class="under_line" style="width: 200px;">
-                          {{record.dialysis_order&&record.dialysis_order.end_time?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
+                          {{record.dialysis_order&&record.dialysis_order.end_time?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时{i}分'):''}}
                         </div>
                       </div>
                     </div>
@@ -569,7 +569,7 @@
             <div class="inline_block" style="margin-left:25px;">
               住院号：
               <div class="under_line" style="width: 120px;">
-                {{record.patient.admission_number?record.patient.admission_number:'无'}}
+                {{record.patient.admission_number?record.patient.admission_number:'/'}}
               </div>
             </div>
           </div>
@@ -849,7 +849,7 @@
               <div class="inline_block" style="margin-left:25px;">
                 住院号：
                 <div class="under_line" style="width: 120px;">
-                  {{record.patient.admission_number?record.patient.admission_number:'无'}}
+                  {{record.patient.admission_number?record.patient.admission_number:'/'}}
                 </div>
               </div>
             </div>
@@ -1313,15 +1313,24 @@
         }
       },
       setAdminUserES(key, id) {
+
+
         if (typeof (key) === 'undefined' || key == null || typeof (key[id]) === 'undefined') {
+          console.log("11111"+id)
+
           return ''
         }
         if (key[id] == 0) {
+          console.log("2222"+id)
+
           return ''
         }
         if (key[id] in this.operatorMaps) {
+          console.log(this.operatorMaps[key[id]].es_url)
           return this.operatorMaps[key[id]].es_url
         } else {
+          console.log("333333"+id)
+
           return ''
         }
       },getFloat: function(x) {

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="plate-box">
     <h2 class="DetailsTit"><span>{{ title }}</span></h2>
-    <div class="plate " >
+    <div class="plate ">
       <ul>
         <li v-if="isShow('入室方式')">
           <label>入室方式 : </label>
@@ -27,29 +27,38 @@
           <label>病人食欲 : </label>
           <span class="content">{{ appetite }}</span>
         </li>
-        <li  v-if="isShow('病情')">
+        <li v-if="isShow('病情')">
           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
       </ul>
+      <ul>
+        <li style="height: 0.6rem;" v-if="isShow('跌倒分险评估评分')">
+          <label>跌倒分险评估评分:</label>
+          <span class="content">{{this.record.score}}分</span>
+        </li>
 
+      </ul>
 
-      <ul >
-        <li v-if="isShow('风险程度')">
-          <label>风险程度:</label>
-          <span class="content">{{dangerLevel}}</span>
-        </li>
-        <li  v-if="isShow('摄入量')">
+      <ul>
+        <li v-if="isShow('摄入量')">
           <label>摄入量:</label>
           <span class="content">{{intakes}}</span>
         </li>
-      </ul>
-      <ul >
-        <li   v-if="isShow('营养状况')">
+
+        <li v-if="isShow('营养状况')">
           <label>营养状况:</label>
           <span class="content">{{nutritions}}</span>
         </li>
-        <li   v-if="isShow('心理评估')">
+      </ul>
+      <ul>
+
+        <li v-if="isShow('风险程度')">
+          <label>风险程度:</label>
+          <span class="content">{{dangerLevel}}</span>
+        </li>
+
+        <li v-if="isShow('心理评估')">
           <label> 心理评估</label>
           <span class="content">{{psychologicalAssessment}}</span>
         </li>
@@ -61,6 +70,10 @@
           <span class="content">{{this.record.psychological_assessment_other}}</span>
         </li>
       </ul>
+
+
+
+
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
     <div class="middleLine"></div>
@@ -69,149 +82,149 @@
 </template>
 
 <script>
-  import store from "@/store";
+  import store from '@/store'
 
   export default {
-  name: "AcceptsAssessment",
-  data() {
-    return {
-      title: "接诊评估 ",
-
-      ways: {
-        "1": "步行",
-        "2": "扶行",
-        "3": "轮椅",
-        "4": "平车",
-      },
-      conditions: {
-        "1": "住院",
-        "2": "门诊",
-        "3": "手术期",
-      },
-      consciousnesses: {
-        "1": "清醒",
-        "2": "嗜睡",
-        "3": "昏迷",
-      },
-      appetites: {
-        "1": "正常",
-        "2": "减退",
-        "3": "恶心",
-        "4": "呕吐",
-        "5": "腹泻",
-      },
-      postures: {
-        "1": "自动体位",
-        "2": "平卧位",
-        "3": "半卧位",
-        "4": "端坐位",
-        "5": "躁动不安",
-      }, sick_condition: {
-        "1": "一般",
-        "2": "重",
-        "3": "危",
-      }, danger_level: {
-        "1": "无",
-        "2": "低风险",
-        "3": "中度风险",
-        "4": "高风险",
-
-      }, intake: {
-        "1": "正常",
-        "2": "减少",
-      },nutrition: {
-        "1": "正常",
-        "2": "营养不良",
-      },psychological_assessment: {
-        "1": "正常",
-        "2": "异常",
-      }
-    };
-  },
-  props: {
-    record: {
-      type: Object
-    }
-  },
-  computed: {
-    way: function() {
-      if (this.record.id == 0) {
-        return ""
-      } else {
-        return this.ways[this.record.way] == undefined ? "" : (this.ways[this.record.way] + "")
-      }
-    },
-    condition: function() {
-      if (this.record.id == 0) {
-        return ""
-      } else {
-        return this.conditions[this.record.condition] == undefined ? "" : this.conditions[this.record.condition] + ""
+    name: 'AcceptsAssessment',
+    data() {
+      return {
+        title: '接诊评估 ',
+
+        ways: {
+          '1': '步行',
+          '2': '扶行',
+          '3': '轮椅',
+          '4': '平车'
+        },
+        conditions: {
+          '1': '住院',
+          '2': '门诊',
+          '3': '手术期'
+        },
+        consciousnesses: {
+          '1': '清醒',
+          '2': '嗜睡',
+          '3': '昏迷'
+        },
+        appetites: {
+          '1': '正常',
+          '2': '减退',
+          '3': '恶心',
+          '4': '呕吐',
+          '5': '腹泻'
+        },
+        postures: {
+          '1': '自动体位',
+          '2': '平卧位',
+          '3': '半卧位',
+          '4': '端坐位',
+          '5': '躁动不安'
+        }, sick_condition: {
+          '1': '一般',
+          '2': '重',
+          '3': '危'
+        }, danger_level: {
+          '1': '无',
+          '2': '低风险',
+          '3': '中度风险',
+          '4': '高风险'
+
+        }, intake: {
+          '1': '正常',
+          '2': '减少'
+        }, nutrition: {
+          '1': '正常',
+          '2': '营养不良'
+        }, psychological_assessment: {
+          '1': '正常',
+          '2': '异常'
+        }
       }
     },
-    consciousness: function() {
-      if (this.record.id == 0) {
-        return ""
-      } else {
-        return this.consciousnesses[this.record.consciousness] == undefined ? "" : this.consciousnesses[this.record.consciousness] + ""
+    props: {
+      record: {
+        type: Object
       }
     },
-    appetite: function() {
-      if (this.record.id == 0) {
-        return ""
-      } else {
-        return this.appetites[this.record.appetite] == undefined ? "" : this.appetites[this.record.appetite] + ""
+    computed: {
+      way: function() {
+        if (this.record.id == 0) {
+          return ''
+        } else {
+          return this.ways[this.record.way] == undefined ? '' : (this.ways[this.record.way] + '')
+        }
+      },
+      condition: function() {
+        if (this.record.id == 0) {
+          return ''
+        } else {
+          return this.conditions[this.record.condition] == undefined ? '' : this.conditions[this.record.condition] + ''
+        }
+      },
+      consciousness: function() {
+        if (this.record.id == 0) {
+          return ''
+        } else {
+          return this.consciousnesses[this.record.consciousness] == undefined ? '' : this.consciousnesses[this.record.consciousness] + ''
+        }
+      },
+      appetite: function() {
+        if (this.record.id == 0) {
+          return ''
+        } else {
+          return this.appetites[this.record.appetite] == undefined ? '' : this.appetites[this.record.appetite] + ''
+        }
+      },
+      posture: function() {
+        if (this.record.id == 0) {
+          return ''
+        } else {
+          return this.postures[this.record.posture] == undefined ? '' : this.postures[this.record.posture] + ''
+        }
+      }, sickCondition: function() {
+        if (this.record == null || this.record.id == '') {
+          return ''
+        } else {
+          return this.sick_condition[this.record.sick_condition] == undefined ? '' : this.sick_condition[this.record.sick_condition] + ''
+        }
+      }, dangerLevel: function() {
+        if (this.record == null || this.record.id == '') {
+          return ''
+        } else {
+          return this.danger_level[this.record.danger_level] == undefined ? '' : this.danger_level[this.record.danger_level] + ''
+        }
+      }, intakes: function() {
+        if (this.record == null || this.record.id == '') {
+          return ''
+        } else {
+          return this.intake[this.record.intake] == undefined ? '' : this.intake[this.record.intake] + ''
+        }
+      }, nutritions: function() {
+        if (this.record == null || this.record.id == '') {
+          return ''
+        } else {
+          return this.nutrition[this.record.nutrition] == undefined ? '' : this.nutrition[this.record.nutrition] + ''
+        }
+      }, psychologicalAssessment: function() {
+        if (this.record == null || this.record.id == '') {
+          return ''
+        } else {
+          return this.psychological_assessment[this.record.psychological_assessment] == undefined ? '' : this.psychological_assessment[this.record.psychological_assessment] + ''
+        }
       }
     },
-    posture: function() {
-      if (this.record.id == 0) {
-        return ""
-      } else {
-        return this.postures[this.record.posture] == undefined ? "" : this.postures[this.record.posture] + ""
-      }
-    },sickCondition: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
-      } else {
-        return this.sick_condition[this.record.sick_condition] == undefined ? "" : this.sick_condition[this.record.sick_condition] + ""
-      }
-    },dangerLevel: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
-      } else {
-        return this.danger_level[this.record.danger_level] == undefined ? "" : this.danger_level[this.record.danger_level] + ""
-      }
-    },intakes: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
-      } else {
-        return this.intake[this.record.intake] == undefined ? "" : this.intake[this.record.intake] + ""
-      }
-    },nutritions: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
-      } else {
-        return this.nutrition[this.record.nutrition] == undefined ? "" : this.nutrition[this.record.nutrition] + ""
-      }
-    },psychologicalAssessment: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
-      } else {
-        return this.psychological_assessment[this.record.psychological_assessment] == undefined ? "" : this.psychological_assessment[this.record.psychological_assessment] + ""
-      }
-    }
-  },
-  methods: {
-    isShow(name){
-      var filedList = store.getters.xt_user.fileds
-      for (let i = 0; i < filedList.length; i++){
-        if(filedList[i].module == 2 &&filedList[i].filed_name_cn == name &&filedList[i].is_show == 1){
-          return true
+    methods: {
+      isShow(name) {
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 2 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
+          }
         }
+        return false
       }
-      return false
-    },
+    }
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -64,6 +64,12 @@
           <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
           <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
         </li>
+
+        <li v-if="isShow('呼吸频率')">
+          <label>呼吸频率 : </label>
+          <span class="content" v-if="breathing_rate!='0'">{{ breathing_rate }}</span>
+          <span class="unit" v-if="breathing_rate!='0'">次/分</span>
+        </li>
         <li v-if="isShow('透析前症状')">
           <label>透析前症状 : </label>
           <span class="content">{{ symptom_before_dialysis }}</span>
@@ -194,6 +200,12 @@
       }
       return this.record.pulse_frequency
     },
+    breathing_rate: function() {
+      if (this.record.id == 0) {
+        return '-'
+      }
+      return this.record.breathing_rate
+    },
     symptom_before_dialysis: function() {
       if (this.record.id == 0) {
         return '-'

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

@@ -44,6 +44,13 @@
         <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
       </el-form-item>
 
+
+      <el-form-item label-width="100dp" label="跌倒分险评估评分 : "
+                    v-if="isShow('跌倒分险评估评分')">
+        <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
+      </el-form-item>
+
+
       <el-form-item label="风险程度: " v-if="isShow('风险程度')">
         <el-radio v-model="receiveTreatmentAsses.danger_level" label="1">无</el-radio>
         <el-radio v-model="receiveTreatmentAsses.danger_level" label="2">低风险</el-radio>
@@ -98,6 +105,7 @@
           nutrition: '1',
           psychological_assessment: '1',
           psychological_assessment_other: '',
+          score:'',
         },
       };
     },

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

@@ -109,6 +109,12 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="呼吸频率(次/分)：" v-if="isShow('呼吸频率')">
+            <el-input type="number" v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="8">
 
           <el-form-item label="血管通路部位： " v-if="isShow('血管通路部位')">
@@ -186,7 +192,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-<!-- 
+<!--
       </el-row>
 
       <el-row :gutter="20"> -->
@@ -390,7 +396,7 @@ export default {
           hemorrhage: '',
           hemorrhage_other: '',
           puncture_method:'',
-
+          breathing_rate:'',
           dialysis_count: '',
           emergency_treatment: '',
           emergency_treatment_other: '',

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

@@ -20,7 +20,7 @@
               {{scope.row.systolic_blood_pressure?scope.row.systolic_blood_pressure:''}}/{{scope.row.diastolic_blood_pressure?scope.row.diastolic_blood_pressure:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="pulse_frequency" align="center" width="100" label="心率(次/分)">
+          <el-table-column prop="pulse_frequency" align="center" width="100" label="脉率(次/分)">
             <template slot-scope="scope">
               {{scope.row.pulse_frequency?scope.row.pulse_frequency:''}}
             </template>
@@ -104,8 +104,8 @@
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
-            <el-col :span="8"  v-if="isShow('心率')">
-              <el-form-item label="心率(次/分)：" >
+            <el-col :span="8"  v-if="isShow('脉率')">
+              <el-form-item label="脉率(次/分)：" >
                 <el-input v-model="form.pulse_frequency"></el-input>
               </el-form-item>
             </el-col>

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -68,7 +68,7 @@
       if (this.record == null || this.record.id == '') {
         return "-"
       }
-      return parseTime(this.record.start_time, "{y}年{m}月{d}日 {h}时");
+      return parseTime(this.record.start_time, "{y}年{m}月{d}日 {h}时{i}分");
 
 
     },

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -6,7 +6,7 @@
       <tr>
         <th  v-if="isShow('监测时间')"  width="124px">时间</th>
         <th v-if="isShow('血压')" width="72px">血压(mmhg)</th>
-        <th v-if="isShow('心率')" width="80px">心率(次/分)</th>
+        <th v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
         <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
         <th width="76px">静脉压/动脉压(mmhg)</th>
@@ -23,7 +23,7 @@
       <tr v-for="(monitor, index) in monitores" :key="index">
         <td  v-if="isShow('监测时间')">{{ parseTime(monitor.operate_time, "{y}-{m}-{d} {h}:{i}") }}</td>
         <td v-if="isShow('血压')">{{ monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:'' }}/{{ monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:'' }}</td>
-        <td v-if="isShow('心率')">{{ monitor.pulse_frequency?monitor.pulse_frequency:'' }}</td>
+        <td v-if="isShow('脉率')">{{ monitor.pulse_frequency?monitor.pulse_frequency:'' }}</td>
         <td v-if="isShow('呼吸')">{{ monitor.breathing_rate?monitor.breathing_rate:'' }}</td>
         <td v-if="isShow('血流量')">{{ monitor.blood_flow_volume?monitor.blood_flow_volume:'' }}</td>
         <td>{{ monitor.venous_pressure?monitor.venous_pressure:'' }} /{{ monitor.arterial_pressure?monitor.arterial_pressure:'' }} </td>

src/xt_pages/dialysis/details/dialysisOff.vue

@@ -60,7 +60,7 @@
       } else if (this.record.stage == 1) {
         return "-"
       } else {
-        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时");
+        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时{i}分");
 
       }
     },

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -28,7 +28,7 @@
         <div class="inline_block" style="margin-left: 25px;">
           住院号：
           <div class="under_line" style="width: 100px;">
-            {{patientInfo.admission_number?patientInfo.admission_number:'无'}}
+            {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
           </div>
         </div>
       </div>
@@ -180,7 +180,7 @@
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
                     跌倒风险评估：&nbsp;评分：
-                    <div class="under_line" style="width: 50px;"> {{predialysis.score}}</div>
+                    <div class="under_line" style="width: 50px;"> {{receiverTreatmentAccess.score}}</div>分
                     &emsp;风险程度：
                     <check-box text="无" :checked="receiverTreatmentAccess.danger_level == 1?true:false"></check-box>
                     <check-box text="低风险" :checked="receiverTreatmentAccess.danger_level == 2?true:false"></check-box>
@@ -238,11 +238,11 @@
                       <td  width="100">护士签名</td>
                     </tr>
 
-                    <tr v-if="this.predialysis.systolic_blood_pressure != 0&&this.predialysis.diastolic_blood_pressure != 0||this.predialysis.remark.length > 0">
+                    <tr v-if="this.predialysis.systolic_blood_pressure != 0&&this.predialysis.diastolic_blood_pressure != 0||this.predialysis.remark.length > 0 || predialysis.pulse_frequency != 0 || predialysis.breathing_rate != 0">
                       <td>{{'透析前'}}</td>
                       <td>{{predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:''}}/{{predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:''}}</td>
-                      <td>{{''}}</td>
-                      <td>{{''}}</td>
+                      <td>{{predialysis.pulse_frequency?predialysis.pulse_frequency:''}}</td>
+                      <td>{{predialysis.breathing_rate?predialysis.breathing_rate:''}}</td>
                       <td>{{''}}/{{''}}</td>
                       <td>{{''}}</td>
                       <td>{{''}}</td>
@@ -262,7 +262,7 @@
                       <td>{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
                       <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
                       <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'/'}}</td>
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                       <td style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}} </span> </div></td>
                       <td>
@@ -306,7 +306,7 @@
           <div class="inline_block" style="margin-left: 25px;">
             住院号：
             <div class="under_line" style="width: 100px;">
-              {{patientInfo.admission_number?patientInfo.admission_number:'无'}}
+              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
             </div>
           </div>
         </div>
@@ -344,7 +344,7 @@
                       <td>{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
                       <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
                       <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'/'}}</td>
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                       <td style="line-height:16px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}</span></div>  </td>
                       <td>
@@ -478,7 +478,7 @@
                     <div class="inline_block">
                       &emsp;核对时间：
                       <div class="under_line" style="width: 200px;">
-                        {{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时')}}
+                        {{getTime(check.updated_time,'{y}年{m}月{d}日 {h}时{i}分')}}
                       </div>
                     </div>
                     <div class="inline_block" >
@@ -521,7 +521,7 @@
                   <div class="inline_block">
                     &emsp;时间：
                     <div class="under_line" style="width: 200px;" v-if="dialysisOrder != null">
-                      {{getTime(dialysisOrder.end_time,'{y}年{m}月{d}日 {h}时')}}
+                      {{getTime(dialysisOrder.end_time,'{y}年{m}月{d}日 {h}时{i}分')}}
                     </div>
                   </div>
                 </div>
@@ -565,7 +565,7 @@
           <div class="inline_block" style="margin-left:25px;">
             住院号：
             <div class="under_line" style="width: 120px;">
-              {{patientInfo.admission_number?patientInfo.admission_number:'无'}}
+              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
             </div>
           </div>
         </div>
@@ -855,7 +855,7 @@
             <div class="inline_block" style="margin-left:25px;">
               住院号：
               <div class="under_line" style="width: 120px;">
-                {{patientInfo.admission_number?patientInfo.admission_number:'无'}}
+                {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
               </div>
             </div>
           </div>

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -56,6 +56,16 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            align="center"
+            label="单价"
+            property="buy_price"
+          >
+            <template slot-scope="scope">
+              <span>{{scope.row.buy_price}}</span>
+            </template>
+          </el-table-column>
+
         </el-table>
       </el-col>
     </el-row>

src/xt_pages/stock/Dialog/stockOutDialog.vue

@@ -49,6 +49,8 @@
         </el-form-item>
       </el-col>
 
+
+
       <el-col>
         <el-form-item label="备注 " prop="remark">
           <el-input type="textarea" :row="5" v-model="propForm.formValue.remark"

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -232,12 +232,13 @@
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
+              this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
             } else {
               const tempForm = {}
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              tempForm['price'] = ''
+              tempForm['price'] = val.selectedGoodInfo[i].buy_price
               tempForm['remark'] = ''
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
@@ -452,6 +453,7 @@
         }, [])
 
 
+
         // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
         //   for (let i = 0; i < this.warehouseInfoList.length; i++) {
         //     this.propForm.goodType.push(this.warehouseInfoList[i].info.type)

src/xt_pages/user/courseOfDisease.vue

@@ -60,12 +60,19 @@
         <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog">
             <div>
                 <div class="new_record_form">
-                    <diV>
-                        <span class="filter_title">日常病程:</span>
-                        <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="cell clearfix">
+                    <label class="title"><span class="name">病程日期</span> : </label>
+                    <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false" style="width: 150px;"
+                                    type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"></el-date-picker>
+
+                    <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">
                         <el-input v-model="new_content" type="textarea" rows="6" resize="none"></el-input>
                     </div>
@@ -103,11 +110,10 @@ export default {
             date: [],
             start_time: '',
             end_time: '',
-
+            course_of_disease_time:'',
             records: [],
             doctors: [],
             current_select_record: null,
-
             show_dialog: false,
             uploading_new_record: false,
             templates: this.$store.getters.configlist.course_disease,
@@ -203,7 +209,7 @@ export default {
                 return
             }
             this.uploading_new_record = true
-            createCourseOfDiseaseRecord(this.patient_id, this.new_content).then(rs => {
+            createCourseOfDiseaseRecord(this.patient_id, this.new_content,this.course_of_disease_time).then(rs => {
                 this.uploading_new_record = false
                 var resp = rs.data
                 if (resp.state == 1) {