修改华侨医院bug

config/dev.env.js

@@ -6,5 +6,5 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
    //http://api.xt.test.sgjyun.com http://localhost:9529
-   BASE_API: '"http://localhost:9529"'
+   BASE_API: '"https://api.xt.kuyicloud.com"'
 })

src/api/dialysis.js

@@ -207,7 +207,7 @@ export function GetMonitor(params){
 
 export function PostSearch(keyword) {
   return request({
-    url: '/api/patients/search?keyword=' + keyword,
+    url: '/m/api/patients/search?keyword=' + keyword,
     method: 'post'
 
   })

src/pages/main/PrintIndex.vue

@@ -12,6 +12,7 @@
       </div>
       <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id != 2"> </DialysisPrintOrderOne>
       <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 2"></DialysisPrintOrderTwo>
+
     </div>
   </div>
 </template>
@@ -104,7 +105,7 @@ export default {
       summary: {},
       adminUser: [],
       receiverTreatmentAccess: {},
-    
+
 
       AlPanel: {
         id: 0,

src/pages/main/add_urgent_schedule.vue

@@ -283,7 +283,6 @@
             searchArray = response.data.data.patient
             cb(searchArray)
           } else {
-            this.$message.error(response.data.msg)
             cb([])
           }
         })

src/pages/main/dialog/ComputerDialog.vue

@@ -27,7 +27,7 @@
           <div class="item" @click="select_puncture_nurse">
             <h2 class="name">穿刺者</h2>
             <div class="content">
-              <span class="text" style="width: 100px">{{ admin_map[puncture_nurse_id].name}}</span>
+              <span class="text" style="width: 100px" v-if="admin_map[puncture_nurse_id]">{{ admin_map[puncture_nurse_id].name}}</span>
               <span class="iconfont">&#xe6f9;</span>
             </div>
           </div>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -219,7 +219,7 @@
             <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.displace_liqui_value"/>
           </div>
         </div>
-        
+
 
 
 
@@ -917,16 +917,17 @@
         }
       }
 
-      if (this.dialysisPrescription.dialysis_duration_hour == '' || this.dialysisPrescription.dialysis_duration_minute == '') {
+
+      if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
         this.timeValue = '';
         this.time = '03:00';
       } else {
         this.timeValue = this.dialysisPrescription.dialysis_duration_hour + "小时" + this.dialysisPrescription.dialysis_duration_minute + "分钟"
         this.time = (this.dialysisPrescription.dialysis_duration_hour > 10 ? this.dialysisPrescription.dialysis_duration_hour : "0" + this.dialysisPrescription.dialysis_duration_hour) + ":" + (this.dialysisPrescription.dialysis_duration_minute > 10 ? this.dialysisPrescription.dialysis_duration_minute : "0" + this.dialysisPrescription.dialysis_duration_minute)
-
       }
 
 
+
       this.dialyserList = this.machines_prop;
       // this.doctor = this.$store.getters.user.user.user_type;
 

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -10,6 +10,12 @@
            
           <check-box text="住院" :checked="patientInfo_source_2"></check-box>
         </div>
+        <div class="inline_block" style="margin-left: 25px;">
+          住院号：
+          <div class="under_line" style="width: 100px;text-align: left">
+            {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+          </div>
+        </div>
         <div class="inline_block" style="margin-left:25px;">
           姓名：
           <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
@@ -25,12 +31,7 @@
           <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
           岁
         </div>
-        <div class="inline_block" style="margin-left: 25px;">
-          住院号：
-          <div class="under_line" style="width: 100px;text-align: left">
-            {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
-          </div>
-        </div>
+
       </div>
 
       <div class="row flex">
@@ -293,6 +294,12 @@
             &nbsp;
             <check-box text="住院" :checked="patientInfo_source_2"></check-box>
           </div>
+          <div class="inline_block" style="margin-left: 25px;">
+            住院号：
+            <div class="under_line" style="width: 100px;text-align: left">
+              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+            </div>
+          </div>
           <div class="inline_block" style="margin-left:25px;">
             姓名：
             <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
@@ -308,12 +315,7 @@
             <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
             岁
           </div>
-          <div class="inline_block" style="margin-left: 25px;">
-            住院号：
-            <div class="under_line" style="width: 100px;text-align: left">
-              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
-            </div>
-          </div>
+
         </div>
         <div class="row flex">
           <div class="inline_block">
@@ -470,7 +472,7 @@
               <div class="row" style="padding: 2px 0;line-height:19px;">
                 <div class="inline_block" >
                   责任护士：
-                  <div class="under_line" style="width: 100px;text-align: left">
+                  <div class="under_line" style="width: 80px;text-align: left">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                     <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                   </div>
@@ -478,35 +480,43 @@
 
                 <div class="inline_block" >
                   穿刺者：
-                  <div class="under_line" style="width: 100px;text-align: left">
+                  <div class="under_line" style="width: 80px;text-align: left">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block" >
                   &emsp;核对人：
-                  <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.modifier">
+                  <div class="under_line" style="width: 80px;text-align: left" v-if="dialysisOrder == null">
+                    <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
+                    <img class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
+                  </div>
+                  <div class="under_line" style="width: 80px;text-align: left" 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 class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
                   </div>
-                  <div class="under_line" style="width: 100px;text-align: left" v-if="dialysisOrder.start_nurse == check.creater">
+                  <div class="under_line" style="width: 100px;text-align: left" 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 class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
                   </div>
                 </div>
                 <div class="inline_block">
                   &emsp;核对时间：
-                  <div class="under_line" style="width: 200px;text-align: left" v-if="check.first_check_time > check.check_time">
+                  <div class="under_line" style="width: 200px;text-align: left" v-if="check == null">
                     {{getTime(check.check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
                   </div>
 
-                  <div class="under_line" style="width: 200px;text-align: left" v-if="check.check_time > check.first_check_time">
+                  <div class="under_line" style="width: 200px;text-align: left" v-if="check != null && check.first_check_time < check.check_time">
+                    {{getTime(check.check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
+                  </div>
+
+                  <div class="under_line" style="width: 200px;text-align: left" v-if="check != null &&check.check_time < check.first_check_time">
                     {{getTime(check.first_check_time,'{y}年{m}月{d}日 {h}时{i}分')}}
                   </div>
                 </div>
                 <div class="inline_block" >
                   &emsp;收针者：
-                  <div class="under_line" style="width: 100px;text-align: left">
+                  <div class="under_line" style="width: 80px;text-align: left">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
                     <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
                   </div>
@@ -571,6 +581,12 @@
             <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
             <check-box text="住院" :checked="patientInfo_source_2"></check-box>
           </div>
+          <div class="inline_block" style="margin-left:25px;">
+            住院号：
+            <div class="under_line" style="width: 120px;text-align: left">
+              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+            </div>
+          </div>
           <div class="inline_block" style="margin-left:25px;">
             姓名：
             <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
@@ -585,12 +601,7 @@
             <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
             岁
           </div>
-          <div class="inline_block" style="margin-left:25px;">
-            住院号：
-            <div class="under_line" style="width: 120px;text-align: left">
-              {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
-            </div>
-          </div>
+
         </div>
         <div class="row flex">
           <div class="inline_block">
@@ -611,7 +622,7 @@
               <div class="row" style="padding: 2px 0;line-height:24px;">
 
                 <div class="inline_block" style="margin-left: -10px" >
-                  &emsp;治疗方式：
+                  治疗方式：
                   <check-box text="HD" :checked="prescription.mode_id==1?true:false"></check-box>
                   <check-box text="HDF" :checked="prescription.mode_id==2?true:false"></check-box>
                   <check-box text="HF" :checked="prescription.mode_id==5?true:false"></check-box>
@@ -644,13 +655,31 @@
                   </div>
                   min
                 </div>
-              </div>
-              <div class="row" style="padding: 2px 0;line-height:24px;">
                 <div class="inline_block">
                   病情：
                   <check-box text="一般" :checked="receiverTreatmentAccess.sick_condition == 1?true:false"></check-box>
                   <check-box text="重" :checked="receiverTreatmentAccess.sick_condition == 2?true:false"></check-box>
                   <check-box text="危" :checked="receiverTreatmentAccess.sick_condition == 3?true:false"></check-box>
+                </div>
+              </div>
+              <div class="row" style="padding: 2px 0;line-height:24px;">
+                <div class="inline_block">
+
+                  <div class="inline_block">
+                    体液过多症状：
+                    <check-box text="无" :checked="prescription.body_fluid==1?true:false"></check-box>
+                    <check-box text="下肢水肿+" :checked="prescription.body_fluid==2?true:false"></check-box>
+                    <check-box text="下肢水肿++"  :checked="prescription.body_fluid==3?true:false"></check-box>
+                    <check-box text="下肢水肿+++"  :checked="prescription.body_fluid==4?true:false"></check-box>
+                  </div>
+
+                  <div class="inline_block">
+                    其它：
+                    <div class="under_line" style="width: 100px;">
+                      <div class="under-line" v-if="prescription&&prescription.body_fluid_other.length > 0">&nbsp;{{prescription.body_fluid_other}}</div>
+                    </div>
+                  </div>
+
                   <div class="inline_block">
                     &emsp;透析器型号：
                     <div class="under_line" style="width: 200px;text-align: left">
@@ -660,19 +689,7 @@
                 </div>
               </div>
               <div class="row" style="padding: 2px 0; line-height:24px;">
-                <div class="inline_block">
-                  体液过多症状：
-                  <check-box text="无" :checked="prescription.body_fluid==1?true:false"></check-box>
-                  <check-box text="下肢水肿+" :checked="prescription.body_fluid==2?true:false"></check-box>
-                  <check-box text="下肢水肿++"  :checked="prescription.body_fluid==3?true:false"></check-box>
-                  <check-box text="下肢水肿+++"  :checked="prescription.body_fluid==4?true:false"></check-box>
-                </div>
-                <!-- <div class="inline_block">
-                  其它：
-                  <div class="under_line" style="width: 100px;">
-                    <div class="under-line" v-if="prescription&&prescription.body_fluid_other.length > 0">&nbsp;{{prescription.body_fluid_other}}</div>
-                  </div>
-                </div> -->
+
                 <div class="inline_block" style="margin-left:20px;">
                   透析前使用特殊药物：
                   <check-box text="无" :checked="prescription.special_medicine==1?true:false"></check-box>
@@ -859,6 +876,12 @@
               <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
               <check-box text="住院" :checked="patientInfo_source_2"></check-box>
             </div>
+            <div class="inline_block" style="margin-left:25px;">
+              住院号：
+              <div class="under_line" style="width: 120px;text-align: left">
+                {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
+              </div>
+            </div>
             <div class="inline_block" style="margin-left:25px;">
               姓名：
               <div class="under_line" style="width: 120px;text-align: left">{{patientInfo.name}}</div>
@@ -873,12 +896,7 @@
               <div class="under_line" style="width: 70px;text-align: left">{{getAge(patientInfo)}}</div>
               岁
             </div>
-            <div class="inline_block" style="margin-left:25px;">
-              住院号：
-              <div class="under_line" style="width: 120px;text-align: left">
-                {{patientInfo.admission_number?patientInfo.admission_number:'/'}}
-              </div>
-            </div>
+
           </div>
           <div class="row flex">
             <div class="inline_block">

src/pages/waitingRoom/components/dialog/medicalOrder.vue

@@ -2,7 +2,7 @@
     <div class="popup-content" style="min-height:320px;">
         <h2 class="title">
             <span class="line"></span>
-            <p>{{title}}</p> 
+            <p>{{title}}</p>
             <span class="line"></span>
         </h2>
         <div class="content" v-show="index==0" >
@@ -37,7 +37,7 @@
                       <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span >{{advice.delivery_way}}</span>
                       <span >{{advice.execution_frequency}}</span>
-                      
+
                     </td>
                     <td><span v-if="advice.execution_time!=0" >{{ uParseTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}")}}</span>
                     </td>
@@ -91,7 +91,7 @@
                               </el-option>
                           </el-select>
                 </div>
-                
+
                 <div class="cell">
                             <label>给药途径</label>
                             <el-select v-model="adviceForm.delivery_way" :disabled="adviceForm.parent_id==0?false:true" filterable placeholder="请选择(输入可搜索)" >
@@ -114,7 +114,7 @@
                                 </el-option>
                             </el-select>
                 </div>
-                
+
                 <div class="cell">
                             <label>医嘱描述</label>
                             <input type="text" class="inputBox" v-model="adviceForm.advice_desc">
@@ -132,8 +132,8 @@
 
 
                 <div class="cell width center">
-                  <button class="smt-danger" @click="index=0">返回</button>                      
-                  <button @click="submitNewAdvice">提交</button>                      
+                  <button class="smt-danger" @click="index=0">返回</button>
+                  <button @click="submitNewAdvice">提交</button>
                 </div>
             </div>
        </div>
@@ -142,7 +142,7 @@
         type="datetime"
         @confirm="handleConfirm">
       </mt-datetime-picker>
-      
+
        <mt-datetime-picker
         ref="exec_time"
         type="datetime"
@@ -160,7 +160,7 @@ import {uParseTime} from "@/utils/tools";
 
 export default {
   name: "MedicalOrder",
- 
+
   data() {
     return {
       rowClass:'row-class-active',
@@ -202,7 +202,7 @@ export default {
     selectRow(index, row) {
       this.currentIndex = index;
       this.currentRow = row;
-    }, 
+    },
     uParseTime(time, format){
       return uParseTime(time, format);
     },
@@ -241,7 +241,7 @@ export default {
                           break;
                       }else if (this.adviceList[index].id === this.adviceForm.parent_id) {
                           spliceIndex = index;
-                          break; 
+                          break;
                       }
                   }
                   if (spliceIndex > -1) {
@@ -253,7 +253,7 @@ export default {
                           this.adviceList.push(response.data.data.advice);
                           this.adviceList = this.adviceList.concat(swapData);
                       }
-                  } 
+                  }
               }else {
                   this.adviceList.unshift(response.data.data.advice);
               }
@@ -304,7 +304,7 @@ export default {
 
       ExecDoctorAdvice(exceParams).then(response=>{
         if (response.data.state == 0) {
-          Toast('执行失败！');
+          Toast(response.data.msg);
           return false
         }else {
           Toast('执行成功！');
@@ -324,8 +324,8 @@ export default {
               break;
             }
           }
-          
-          
+
+
           return false
         }
       });
@@ -369,7 +369,7 @@ export default {
                 this.$emit('delete', this.adviceList[this.currentIndex]);
                 this.currentIndex = -1;
                 this.currentRow = null;
-                
+
             }
         });
       }).catch(() => {
@@ -405,7 +405,7 @@ export default {
       }
 
       this.index = 1;
-      
+
       this.adviceForm={
         id:0,
         advice_type:2,
@@ -445,9 +445,9 @@ export default {
         remark:"",
         parent_id:0,
       }
-     
+
     }
-  }, 
+  },
   props: {
     patient_prop: {
       type: Object,
@@ -458,7 +458,7 @@ export default {
     admin_users_prop:{
       type:Array,
     }
-   
+
   },
   created(){
     var date = this.$route.query && this.$route.query.date;
@@ -476,8 +476,8 @@ export default {
     }
     this.record_date = y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
 
- 
-    
+
+
     this.patient = this.patient_prop;
     this.adviceList = this.advice_list_prop;
     this.admin_users = this.admin_users_prop;
@@ -485,7 +485,7 @@ export default {
     this.adviceForm.advice_date = this.record_date;
     this.getAdviceConfig();
 
-    
+
   }
 };
 </script>
@@ -505,7 +505,7 @@ export default {
   border: $border-color;
   background: $text-color;
   padding: 0 0 0.28rem 0;
-  
+
   tr {
     padding: 0;
     margin: 0;
@@ -520,7 +520,7 @@ export default {
       line-height: 0.88rem;
       font-weight: normal;
     }
-   
+
   }
   .row-class-active>td{
     background: #badcff;