Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -1549,7 +1549,30 @@
                           <tbody>
                             <tr>
                               <td width="70">抗凝方式:</td>
-                              <td width="80">
+                              <td width="120">
+                                <div class="under-line">
+                                  <span v-if="record.prescription.anticoagulant == 0">&nbsp;/</span>
+                                  <span v-if="record.prescription.anticoagulant == 1">&nbsp;无肝素</span>
+                                  <span v-if="record.prescription.anticoagulant == 2">&nbsp;普通肝素</span>
+                                  <span v-if="record.prescription.anticoagulant == 3">&nbsp;低分子肝素</span>
+                                  <span v-if="record.prescription.anticoagulant == 4">&nbsp;阿加曲班</span>
+                                  <span v-if="record.prescription.anticoagulant == 5">&nbsp;枸橼酸钠</span>
+                                  <span v-if="record.prescription.anticoagulant == 6">&nbsp;低分子肝素钙</span>
+                                  <span v-if="record.prescription.anticoagulant == 16">&nbsp;低分子量肝素钙</span>
+                                  <span v-if="record.prescription.anticoagulant == 7">&nbsp;低分子肝素钠</span>
+                                  <span v-if="record.prescription.anticoagulant == 8">&nbsp;依诺肝素</span>
+                                  <span v-if="record.prescription.anticoagulant == 9">&nbsp;达肝素</span>
+                                  <span v-if="record.prescription.anticoagulant == 10">&nbsp;体外抗凝</span>
+                                  <span v-if="record.prescription.anticoagulant == 11">&nbsp;那屈肝素</span>
+                                  <span v-if="record.prescription.anticoagulant == 12">&nbsp;无抗凝剂</span>
+                                  <span v-if="record.prescription.anticoagulant == 13">&nbsp;那屈肝素钙</span>
+                                  <span v-if="record.prescription.anticoagulant == 14">&nbsp;肝素钙注射液</span>
+                                  <span v-if="record.prescription.anticoagulant == 15">&nbsp;甲磺酸萘莫司他</span>
+                                  <span v-if="record.prescription.anticoagulant == 16">&nbsp;低分子量肝素钙</span>
+                                  <span v-if="record.prescription.anticoagulant == 17">&nbsp;肝素钠</span>
+                                </div>
+                              </td>
+                              <!-- <td width="80">
                                   <label-box :isChecked="record.prescription.anticoagulant == '8' ? true : false" showValue="依诺肝素"></label-box>
                               </td>
                               <td width="80">
@@ -1563,7 +1586,7 @@
                               </td>
                               <td width="90">
                                   <label-box :isChecked="(record.prescription.anticoagulant == '低分子肝素' || record.prescription.anticoagulant == '低分子肝素钙' || record.prescription.anticoagulant == '低分子肝素钠') ? true : false" showValue="低分子肝素"></label-box>
-                              </td>
+                              </td> -->
 
                               <td width="50">首剂量</td>
                               <td width="60">

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -1414,20 +1414,11 @@ export default {
         this.nameForm = {
           advice_name: this.groupSelectRow.advice_name,
           advice_desc: this.groupSelectRow.advice_desc,
-          single_dose:
-            this.groupSelectRow.single_dose != 0
-              ? this.groupSelectRow.single_dose
-              : "",
+          single_dose:this.groupSelectRow.single_dose != 0? this.groupSelectRow.single_dose: "",
           single_dose_unit: this.groupSelectRow.single_dose_unit,
-          drug_spec:
-            this.groupSelectRow.drug_spec != 0
-              ? this.groupSelectRow.drug_spec
-              : "",
+          drug_spec:this.groupSelectRow.drug_spec != 0? this.groupSelectRow.drug_spec: "",
           drug_spec_unit: this.groupSelectRow.drug_spec_unit,
-          prescribing_number:
-            this.groupSelectRow.prescribing_number != 0
-              ? this.groupSelectRow.prescribing_number
-              : "",
+          prescribing_number:this.groupSelectRow.prescribing_number != 0? this.groupSelectRow.prescribing_number: "",
           prescribing_number_unit: this.groupSelectRow.prescribing_number_unit,
           delivery_way: this.isChild ? "" : this.groupSelectRow.delivery_way,
           execution_frequency: this.isChild? "": this.groupSelectRow.execution_frequency,
@@ -1439,6 +1430,7 @@ export default {
           id: this.groupSelectRow.id,
           children: [],
           parent_row: this.groupSelectRow.parent_row,
+          remark:this.groupSelectRow.remark
           // row_key:this.groupSelectRow.row_key,
         };
         this.nameFormTitle = "修改医嘱内容";

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

@@ -2764,6 +2764,28 @@ mu
             var hours = date.getHours()
             var minites = date.getMinutes()
 
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10587){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
             if (month < 10) {
               month = '0' + month
             }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -668,7 +668,12 @@
                   <tbody>
                     <tr>
                       <td width="70">抗凝方式:</td>
-                      <td width="80">
+                      <td width="220">
+                        <div class="under-line">
+                          &nbsp;{{ prescription.anticoagulant ? prescription.anticoagulant : ' ' }}
+                        </div>
+                      </td>
+                      <!-- <td width="80">
                           <label-box :isChecked="prescription.anticoagulant == '依诺肝素' ? true : false" showValue="依诺肝素"></label-box>
                       </td>
                       <td width="80">
@@ -682,10 +687,12 @@
                       </td>
                       <td width="90">
                           <label-box :isChecked="(prescription.anticoagulant == '低分子肝素' || prescription.anticoagulant == '低分子肝素钙' || prescription.anticoagulant == '低分子肝素钠') ? true : false" showValue="低分子肝素"></label-box>
-                      </td>
+                      </td> -->
+
+                      
 
                       <td width="40">首剂量</td>
-                      <td width="60">
+                      <td width="100">
                         {{prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : ""}}
                         <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml</span>
                         <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
@@ -702,7 +709,7 @@
                       </td>
 
                       <td width="30">维持</td>
-                      <td width="60">
+                      <td width="100">
                         {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : ""}}
                         <span v-if="prescription.anticoagulant == '阿加曲班'">iu</span>
                         <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
@@ -718,7 +725,7 @@
                       </td>
 
                       <td width="30">总量</td>
-                      <td width="60">
+                      <td width="100">
                         {{prescription.anticoagulant_zongliang ?prescription.anticoagulant_zongliang : ""}}
                         <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
                         <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>

src/xt_pages/medicalScheduling/index.vue

@@ -1005,7 +1005,7 @@ export default {
                     obj.user_name = "合计"
                     obj.user_type = 10
                     obj.list = arr2
-                    arr.push(obj)
+                    arr2.push(obj)
 
                     let data = []