修改华侨医院

package.json

@@ -94,7 +94,6 @@
     "file-loader": "1.1.5",
     "friendly-errors-webpack-plugin": "1.6.1",
     "html-webpack-plugin": "2.30.1",
-    "husky": "0.14.3",
     "lint-staged": "7.2.0",
     "node-notifier": "5.1.2",
     "node-sass": "^4.7.2",

src/xt_pages/data/druguseTemplate.vue

@@ -1073,7 +1073,7 @@ export default {
           name: [{ required: true, message: '请填写执行频率' }]
         },
         templateRules: {
-          advice_name: [{ required: true, message: '请填写医嘱内容' }],
+          advice_name: [{ required: true, message: '请填写医嘱内容' }]
 
         },
         templateEditRules: {
@@ -1152,11 +1152,11 @@ export default {
       this.unitsOption = getDataConfig('hemodialysis', 'units')
   },
     methods: {
-      adviceNameShow({row, column, rowIndex, columnIndex}){
-        if(columnIndex==1) {
-          return 'templateadvicenamedisplay';
-        }else {
-          return '';
+      adviceNameShow({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return 'templateadvicenamedisplay'
+        } else {
+          return ''
         }
       },
       showCreatedTimes() {
@@ -1710,7 +1710,7 @@ export default {
         }
         return true
       }, cancelEditHandle() {
-        this.templateTableVisible = true
+        // this.templateTableVisible = true
         this.templateEditFormVisible = false
       }, submitEditTemplate(formName) {
         this.$refs[formName].validate(valid => {

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -34,7 +34,7 @@
             <div class="inline_block" style="margin-left: 25px;">
               性别：
               <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-              &nbsp;
+              &nbsp
               <check-box text="女" :checked="record.patient.gender == 2"></check-box>
             </div>
             <div class="inline_block" style="margin-left: 25px;">
@@ -1124,17 +1124,17 @@
             this.advice_groups = []
             this.advice_groups_2 = []
             var dlegh = 0
-            if((this.records[recordIndex].assessment_before_dislysis&&this.records[recordIndex].assessment_before_dislysis.systolic_blood_pressure != 0&&this.records[recordIndex].assessment_before_dislysis.diastolic_blood_pressure != 0) || (this.records[recordIndex].assessment_before_dislysis&&record.assessment_before_dislysis.remark.length > 0) ||(this.records[recordIndex].assessment_before_dislysis&&record.assessment_before_dislysis.pulse_frequency != 0) ||(this.records[recordIndex].assessment_before_dislysis&&record.assessment_before_dislysis.breathing_rate  != 0)||(this.records[recordIndex].assessment_before_dislysis&&record.assessment_before_dislysis.temperature  != 0)) {
+            if ((this.records[recordIndex].assessment_before_dislysis && this.records[recordIndex].assessment_before_dislysis.systolic_blood_pressure != 0 && this.records[recordIndex].assessment_before_dislysis.diastolic_blood_pressure != 0) || (this.records[recordIndex].assessment_before_dislysis && record.assessment_before_dislysis.remark.length > 0) || (this.records[recordIndex].assessment_before_dislysis && record.assessment_before_dislysis.pulse_frequency != 0) || (this.records[recordIndex].assessment_before_dislysis && record.assessment_before_dislysis.breathing_rate != 0) || (this.records[recordIndex].assessment_before_dislysis && record.assessment_before_dislysis.temperature != 0)) {
               var nl = 8
               this.records[recordIndex].print_length = 8
-            } else{
+            } else {
               var nl = 9
               this.records[recordIndex].print_length = 9
             }
             if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
               dlegh = nl - this.records[recordIndex].monitor_records.length
             }
-            if(this.records[recordIndex].monitor_records.length <=0 ){
+            if (this.records[recordIndex].monitor_records.length <= 0) {
               dlegh = nl
             }
             if (dlegh > 0) {
@@ -1147,7 +1147,7 @@
             }
 
             this.records[recordIndex].monitor_records2 = []
-            if (this.records[recordIndex].monitor_records.length > 13){
+            if (this.records[recordIndex].monitor_records.length > 13) {
               const tempMonitors = []
               const tempMonitors2 = []
 
@@ -1202,7 +1202,6 @@
                 if ('children' in this.doctor_advices[index] && this.doctor_advices[index].children.length > 0) {
                   new_advice_index = index + this.doctor_advices[index].children.length + 1
 
-
                   var doctor_advice = {
                     delivery_way: this.doctor_advices[index].delivery_way,
                     execution_frequency: this.doctor_advices[index].execution_frequency,
@@ -1214,8 +1213,7 @@
                     execution_staff: this.doctor_advices[index].execution_staff,
                     checker: this.doctor_advices[index].checker,
                     advice_doctor: this.doctor_advices[index].advice_doctor,
-                    execution_time: this.doctor_advices[index].execution_time,
-
+                    execution_time: this.doctor_advices[index].execution_time
 
                   }
                   doctor_advice['isShow'] = 1
@@ -1237,8 +1235,8 @@
                   if (advice.parent_id > 0) {
                     if (this.advice_groups.length > 0) {
                       var parent_group = this.advice_groups[
-                      this.advice_groups.length - 1
-                        ]
+                        this.advice_groups.length - 1
+                      ]
                       if (parent_group.advices.length > 0) {
                         if (parent_group.advices[0].id == advice.parent_id) {
                           parent_group.advices.push(advice)
@@ -1284,8 +1282,8 @@
                     if (advice.parent_id > 0) {
                       if (this.advice_groups_2.length > 0) {
                         var parent_group = this.advice_groups_2[
-                        this.advice_groups_2.length - 1
-                          ]
+                          this.advice_groups_2.length - 1
+                        ]
                         if (parent_group.advices.length > 0) {
                           if (parent_group.advices[0].id == advice.parent_id) {
                             parent_group.advices.push(advice)
@@ -1437,23 +1435,22 @@
         } else {
           return ''
         }
-      },getFloat: function(x) {
+      }, getFloat: function(x) {
         if (x != '.') {
-          var f = Math.round(x * 100) / 100;
-          var s = f.toString();
-          var rs = s.indexOf('.');
+          var f = Math.round(x * 100) / 100
+          var s = f.toString()
+          var rs = s.indexOf('.')
           if (rs <= 0) {
-            rs = s.length;
-            s += '.';
+            rs = s.length
+            s += '.'
           }
           while (s.length <= rs + 1) {
-            s += '0';
+            s += '0'
           }
-          return s;
+          return s
         } else {
-          return '0.0';
+          return '0.0'
         }
-
       },
       getAdminUser(key, id) {
         if (typeof (key) === 'undefined' || key == null || typeof (key[id]) === 'undefined') {
@@ -1508,7 +1505,7 @@
             advices: []
           }
         )
-      },getNumber:function(record) {
+      }, getNumber: function(record) {
         console.log(record)
       }
     }

src/xt_pages/dialysis/details/index.vue

@@ -302,8 +302,8 @@
           { title: '接诊评估', finish: false },
           { title: '透前评估', finish: false },
           { title: '临时医嘱', finish: false },
-          { title: '透析上机', finish: false },
           { title: '双人核对', finish: false },
+          { title: '透析上机', finish: false },
           { title: '透析监测', finish: false },
           { title: '透析下机', finish: false },
           { title: '透后评估', finish: false },

src/xt_pages/home/index.vue

@@ -82,8 +82,8 @@ export default {
         { title: '接诊评估' },
         { title: '透前评估' },
         { title: '临时医嘱' },
-        { title: '透析上机' },
         { title: '双人核对' },
+        { title: '透析上机' },
         { title: '透析监测' },
         { title: '透析下机' },
         { title: '透后评估' },
@@ -173,8 +173,8 @@ export default {
 
       var leaveTime = 0
 
-      this.subscibe.state = 2;//强制改为免费版
-      
+      this.subscibe.state = 2// 强制改为免费版
+
       switch (this.subscibe.state) {
         case 9:
           this.subscibeBan = {

src/xt_pages/user/components/PatientForm.vue

@@ -737,7 +737,7 @@
                     this.formSubmit = true
                     return false
                   } else {
-                    this.formSubmit = false
+                    this.formSubmit = true
                     this.$notify({
                       title: '成功',
                       message: this.submitMsg,
@@ -881,7 +881,6 @@
         fetchPatient(id)
           .then(response => {
             if (response.data.state == 1) {
-
               this.$emit('tran-patient-info', response.data.data.patient)
               var patietInfo = response.data.data.patient
               this.form.avatar = patietInfo.avatar
@@ -962,15 +961,12 @@
               this.form.sbp = patietInfo.sbp
               this.form.dbp = patietInfo.dbp
 
-              if (patietInfo.age == 0){
-                this.form.age = jsGetAge(this.form.birth, "-");
-              }else{
+              if (patietInfo.age == 0) {
+                this.form.age = jsGetAge(this.form.birth, '-')
+              } else {
                 this.form.age = patietInfo.age
               }
 
-
-
-
               // this.form.initial = patietInfo.initial_dialysis + "";
               // this.form.dialysisTotal = patietInfo.total_dialysis + "";
               // this.form.assessment = patietInfo.evaluate;