Merge branch 'master' of http://git.shengws.com/csx/Pad_New

config/prod.env.js

@@ -1,8 +1,8 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/api/advice.js

@@ -86,7 +86,8 @@ export function getSchedualDoctors (params) {
   })
 }
 
-export function batchCreateAdvices (patient_id, group_no, data,mode) {
+export function batchCreateAdvices (patient_id, group_no, data,mode,is_child) {
+
   return request({
     url: '/m/api/advice/creategroup',
     method: 'post',
@@ -95,6 +96,7 @@ export function batchCreateAdvices (patient_id, group_no, data,mode) {
       id: patient_id,
       group_no: group_no,
       mode:mode,
+      is_child:is_child
     },
     data: data
   })

src/pages/main/DetailsPage.vue

@@ -144,7 +144,7 @@ export default {
           if (response.data.state == 1) {
             this.patient = response.data.data.patient;
           } else {
-            Toast.fail("网络异常");
+            Toast.fail(response.data.msg);
             return false;
           }
         })

src/pages/main/dialog/OrdersDialog.vue

@@ -30,16 +30,19 @@
           @click="checkAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || is_has_check != true }"
         >核对</span>
+
         <span
         id="fontSize"
           @click="openNewChild"
           :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1  }"
         >添加子药</span>
+
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="modifyAdviceAction"
           :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2 || (is_has_modify != true && is_has_modify_other != true) }"
         >修改</span>
+
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="deleteAdviceAction"
@@ -245,7 +248,8 @@
     EditDoctorAdvice,
     ExecDoctorAdvice,
     getAdviceConfig,
-    ModifyExecDoctorAdvice
+    ModifyExecDoctorAdvice,
+    batchCreateAdvices
   } from '@/api/advice'
   import {uParseTime} from '@/utils/tools'
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
@@ -290,6 +294,7 @@
     },
     data () {
       return {
+        group_no:0,
         is_has_create:true,
         is_has_exce:true,
         is_has_check:true,
@@ -564,11 +569,12 @@
       didAddSubdrug: function (subdrug) {
         Toast.loading({forbidClick: true, duration: 0})
         let mode = "1"
-        CreateDoctorAdvice(this.patient.id,{
+       var  is_child = 2
+        batchCreateAdvices(this.patient.id, subdrug.group_no, {
           parent_id: subdrug.parent_id,
           advice_type: 2,
           advice_date: subdrug.record_time,
-          start_time: subdrug.start_time,
+          start_time: subdrug.start_time+":00",
           advice_name: subdrug.title,
           advice_desc: subdrug.advice_desc,
           drug_spec: String(subdrug.drug_spec),
@@ -579,7 +585,8 @@
           prescribing_number_unit: subdrug.prescribing_number_unit
           // delivery_way: subdrug.delivery_way,
           // execution_frequency: subdrug.execution_frequency
-        }, mode)
+        },mode, is_child)
+
           .then(response => {
             if (response.data.state == 0) {
               Toast.fail(response.data.msg)
@@ -1180,15 +1187,18 @@
         this.$refs.exec_time.open()
       },
       openNewChild () {
+        console.log(this.current_advice)
+
 
         if (this.current_advice == null){
           return
         }
 
-        if (this.currentAdvices.length == 0) {0
+        if (this.currentAdvices.length == 0) {
           return false
         }
         this.current_advice = this.currentAdvices[0]
+        this.group_no = this.current_advice.groupno
 
         if (
           this.current_advice.stop_state == 1 ||
@@ -1210,11 +1220,14 @@
           this.record_date,
           start_time,
           this.current_advice.delivery_way,
-          this.current_advice.execution_frequency
+          this.current_advice.execution_frequency,
+          this.group_no,
         )
         return
       },
       openNewAdvice () {
+        console.log("222222222")
+
         if(this.is_has_create == false){
           Toast.fail('你没有新增医嘱权限')
           return false

src/pages/main/dialog/ThorougDialog.vue

@@ -582,6 +582,83 @@
           </div>
         </div>
 
+
+        <div class="item" v-if="isShow('脉搏')">
+          <label class="name" for="ml">脉搏(次/分)</label>
+          <div class="content">
+            <input
+              type="number"
+              @click="newClick($event)"
+              @focus="inputFocus"
+              id="ml"
+              v-model="formValue.pulse_frequency"
+            />
+            <!--<span class="text">HD</span>-->
+            <!--<span class="iconfont">&#xe6f9;</span>-->
+          </div>
+        </div>
+
+        <div class="item" v-if="isShow('中心静脉封管(肝素-A端)')">
+          <label class="name" for="ml">中心静脉封管(肝素-A端)(ml)</label>
+          <div class="content">
+            <input
+              type="number"
+              @click="newClick($event)"
+              @focus="inputFocus"
+              id="ml"
+              v-model="formValue.cvc_a"
+            />
+            <!--<span class="text">HD</span>-->
+            <!--<span class="iconfont">&#xe6f9;</span>-->
+          </div>
+        </div>
+
+
+        <div class="item" v-if="isShow('中心静脉封管(肝素-B端)')">
+          <label class="name" for="ml">中心静脉封管(肝素-B端)(ml)</label>
+          <div class="content">
+            <input
+              type="number"
+              @click="newClick($event)"
+              @focus="inputFocus"
+              id="ml"
+              v-model="formValue.cvc_b"
+            />
+          </div>
+        </div>
+
+
+        <div
+          @click="showSubMenu('channel')"
+          class="item"
+          ref="intravenous_tube"
+          v-if="isShow('静脉管道')"
+        >
+          <label class="name" for="dg">静脉管道</label>
+          <div class="content">
+            <span class="text" id="dg">{{getIntravenousTubeName(formValue.intravenous_tube)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
+
+        <div
+          @click="showSubMenu('channel')"
+          class="item"
+          ref="channel"
+          v-if="isShow('管路')"
+        >
+          <label class="name" for="dg">管路</label>
+          <div class="content">
+            <span
+              class="text"
+              id="dg"
+            >{{getChannelName(formValue.channel)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
+
         <!-- <div class="line"></div> -->
         <div>
           <div class="item">
@@ -722,7 +799,11 @@ export default {
         dialyzer: "",
         is_eat: "",
         breathing_rate: "",
-        dialysis_intakes_unit: 0
+        dialysis_intakes_unit: 0,
+        channel:"",
+        cvc_a: 0,
+        cvc_b: 0,
+
       },
 
       record_date: ""
@@ -1257,6 +1338,18 @@ export default {
           this.propForm.selectId = this.formValue.dialysis_intakes_unit;
           this.propForm.click_ref = "dialysis_intakes_unit";
           break;
+        case "channel":
+          this.propForm.type = 24;
+          this.isShowDialog = false;
+          this.propForm.title = "管路";
+          this.visibility = true;
+          this.propForm.list = [];
+          this.propForm.isHasOther = 2;
+          this.propForm.optionList = this.$store.getters.channel;
+          this.propForm.isMultiple = 1;
+          this.propForm.selectId = this.formValue.channel;
+          this.propForm.click_ref = "channel";
+          break;
       }
     },
     menuCancle: function() {
@@ -1380,6 +1473,9 @@ export default {
         case 23:
           this.formValue.dialysis_intakes_unit = val.selectId;
           break;
+        case 24:
+          this.formValue.channel = val.selectId;
+          break;
       }
     },
     getUnit: function(val) {
@@ -1540,6 +1636,15 @@ export default {
         }
       }
       return intravenousTubeName;
+    },getChannelName:function(id){
+      var channel = this.$store.getters.channel
+      var channelName = "";
+      for (let i = 0; i < channel.length; i++) {
+        if (channel[i].id == id) {
+          channelName = channel[i].name;
+        }
+      }
+      return channelName
     },
     getDialyzer: function(id) {
       var dialyzer = this.$store.getters.dialyzer;

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

@@ -348,7 +348,9 @@ export default {
 
       this.loading = true;
       let mode = "1"
-      batchCreateAdvices(this.patient_id, this.group_no, data,mode)
+      var  is_child = 1
+
+      batchCreateAdvices(this.patient_id, this.group_no, data,mode,is_child)
         .then(rs => {
           this.loading = false;
           var resp = rs.data;

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

@@ -220,6 +220,7 @@ export default {
         prescribing_number: "",
         prescribing_number_unit: "",
         remark: "",
+        group_no:"",
 
         // 在新增子药才用到的字段
         parent_id: 0, // 父医嘱ID
@@ -277,18 +278,19 @@ export default {
       parent_record_time,
       parent_start_time,
       parent_delivery_way,
-      parent_execution_frequency
+      parent_execution_frequency,
+      group_no,
     ) {
       this.mode = 3;
       this.visibility = true;
 
+      this.order.group_no = group_no
       this.order.parent_id = parent_id;
       this.order.record_time = parent_record_time;
       this.order.start_time = parent_start_time;
       this.order.title = "";
       this.order.advice_desc = "";
       this.order.remark = "";
-
       this.order.drug_spec = "";
       this.order.drug_spec_unit = "";
       this.order.delivery_way =
@@ -351,6 +353,7 @@ export default {
         });
       } else if (this.mode == 3) {
         this.$emit("did-create-subdrug", {
+          group_no: this.order.group_no,
           parent_id: this.order.parent_id,
           record_time: this.order.record_time,
           start_time: this.order.start_time,

src/pages/main/records/RecordsTab.vue

@@ -309,7 +309,7 @@ export default {
 
             this.patient.source = this.patient.source == 1 ? "门诊" : "住院";
           } else {
-            Toast.fail("网络异常");
+            Toast.fail(response.data.msg);
             return false;
           }
         })
@@ -337,7 +337,7 @@ export default {
 }
 .data-bg {
   width: 100%;
-  padding-top:62px; 
+  padding-top:62px;
   min-height: calc(100vh - 130px);
   @media only screen and (min-width: 737px) and (max-width: 768px) {
     padding-top: 100px;

src/pages/main/template/DialysisPrintOrderTen.vue

@@ -839,48 +839,49 @@
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                 <div class="inline_block" style="flex:1;">
                   穿刺护士：
-                  <div class="under_line" style="width: 80px;text-align: center">
+                  <div class="under_line" style="width: 70px;text-align: center">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">
                   治疗护士：
-                  <div class="under_line" style="width: 80px;text-align: center">
+                  <div class="under_line" style="width: 70px;text-align: center">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">
                   核对人员：
-                  <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder == null">
+                  <div class="under_line" style="width: 70px;text-align: center" v-if="dialysisOrder == null">
                     <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
                   </div>
-                  <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
+                  <div class="under_line" style="width: 70px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
                     <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
                   </div>
-                  <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
+                  <div class="under_line" style="width: 70px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
                     <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
                   </div>
-                  <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater&&dialysisOrder.start_nurse != check.modifier">
+                  <div class="under_line" style="width: 70px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater&&dialysisOrder.start_nurse != check.modifier">
                     <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">
                   下机护士：
-                  <div class="under_line" style="width: 80px;text-align: center">
+                  <div class="under_line" style="width: 70px;text-align: center">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
-                  <div class="under_line" style="width: 150px;text-align: center">
+                  <div class="under_line" style="width: 80px">
                     <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">
+                    <!--<img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">-->
                     <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{getAdminUser(prescription.prescription_doctor)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else>
                   </div>
@@ -888,8 +889,7 @@
 
                 <div class="inline_block" style="flex:1;">
                   患者签名：
-                  <div class="under_line" style="width: 80px;text-align: center">
-                    <span></span>
+                  <div class="under_line" style="width: 70px">
                   </div>
                 </div>
               </div>

src/pages/main/today/assessmentAfter.vue

@@ -186,6 +186,24 @@
           <label for="bzh">透析期间进食: </label>
           <span id="bzh" class="content">{{eat_name}}</span>
         </li>
+
+        <li v-if="isShow('中心静脉封管(肝素-A端)')">
+          <label for="bzh">中心静脉封管(肝素-A端): </label>
+          <span class="content" id="tzjs">{{this.record.cvc_a?this.record.cvc_a:''}}</span>
+          <span class="unit">{{this.record.cvc_a?'ml':''}}</span>
+        </li>
+        <li v-if="isShow('中心静脉封管(肝素-B端)')">
+          <label for="bzh">中心静脉封管(肝素-B端): </label>
+          <span class="content" id="tzjs">{{this.record.cvc_b?this.record.cvc_b:''}}</span>
+          <span class="unit">{{this.record.cvc_b?'ml':''}}</span>
+        </li>
+
+        <li v-if="isShow('管路')">
+          <label for="bzh">管路: </label>
+          <span class="content" id="tzjs">{{getChannelName(this.record.channel)}}</span>
+        </li>
+
+
       </ul>
     </div>
     <div class="note">备注 : <span>{{remark}}</span></div>
@@ -591,6 +609,18 @@
           }
         }
         return intravenousTubeName
+      },getChannelName:function(id){
+        var channel = this.$store.getters.channel
+        var channelName = ''
+        for (let i = 0; i < channel.length; i++) {
+          if (channel[i].id == id) {
+            channelName = channel[i].name
+          }
+        }
+        return channelName
+
+
+
       },
       getDialyzer: function (id) {
         var dialyzer = this.$store.getters.dialyzer

src/pages/waitingRoom/components/patientInfo.vue

@@ -369,7 +369,7 @@ export default {
 
             this.patient.source = this.patient.source == 1 ? "门诊" : "住院";
           } else {
-            Toast.fail("网络异常");
+            Toast.fail(response.data.msg);
             return false;
           }
         })

src/store/index.js

@@ -65,6 +65,9 @@ const getters = {
   intravenous_tube: state => state.global_config.intravenous_tube,
   dialyzer: state => state.global_config.dialyzer,
 
+  channel: state => state.global_config.channel,
+
+
 
   dialysis_duration: state => state.global_config.dialysis_duration,
   last_dialysis_after: state => state.global_config.last_dialysis_after,

src/store/modules/globalConfig.js

@@ -2215,6 +2215,24 @@ const global_config = {
         id: 4,
         name: 'A钝针'
       }
+    ],
+    channel: [
+      {
+      id: 1,
+      name: '无'
+    },
+      {
+        id: 2,
+        name: '+'
+      },
+      {
+        id: 3,
+        name: '++'
+      },
+      {
+        id: 4,
+        name: '+++'
+      }
     ]
 
   },