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

src/api/device/device.js

@@ -122,12 +122,13 @@ export function getDeviceNumbers() {
     })
 }
 
-export function createDeviceNumber(number, zone_id, group_id,sort) {
+export function createDeviceNumber(number, zone_id, group_id,sort,number_type) {
     const params = {
         number: number,
         zone: zone_id,
         group: group_id,
         sort:sort,
+        number_type:number_type,
     }
    
     return request({
@@ -137,13 +138,14 @@ export function createDeviceNumber(number, zone_id, group_id,sort) {
     })
 }
 
-export function modifyDeviceNumber(id, number, zone_id, group_id,sort) {
+export function modifyDeviceNumber(id, number, zone_id, group_id,sort,number_type) {
     const params = {
         id: id,
         number: number,
         zone: zone_id,
         group: group_id,
-        sort:sort
+        sort:sort,
+        number_type:number_type,
     }
     return request({
         url: '/api/device/number/modify',

src/store/modules/globalConfig.js

@@ -188,7 +188,7 @@ const global_config = {
         id: 12,
         name: '退休人员'
       },
-    
+
     ],
     induction_options: [ // 诱导期
       {
@@ -1070,9 +1070,9 @@ const global_config = {
         zongliang: 1,
         gaimingcheng: -1,
         gaijiliang: -1,
-        shouji_unit: 'mg',
-        weichi_unit: 'mg/h',
-        zongliang_unit: 'mg',
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },

src/xt_pages/device/number_main.vue

@@ -36,6 +36,14 @@
               label="所属分组"
               align="center"
             ></el-table-column>
+            <el-table-column
+              label="透析机型号"
+              align="center"
+            >
+             <template slot-scope="scope">
+                {{ scope.row.number_type?scope.row.number_type:"" }}
+             </template>
+            </el-table-column>
             <el-table-column prop="sort" label="排序" align="center">
                 <template slot-scope="scope">
                     {{scope.row.sort?scope.row.sort:""}}
@@ -104,6 +112,8 @@
               style="width: 220px"
             ></el-input>
           </el-form-item>
+
+          
           <el-form-item
             size="small"
             label="所属分区 : "
@@ -121,6 +131,10 @@
               ></el-option>
             </el-select>
           </el-form-item>
+
+
+        
+          
           <el-form-item
             size="small"
             label="所属分组 : "
@@ -138,6 +152,20 @@
               ></el-option>
             </el-select>
           </el-form-item>
+
+          <el-form-item
+            size="small"
+            label="透析机型号 : "
+            prop="number"
+          >
+            <el-input
+              v-model="number_form.number_type"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+
+
+
           <el-form-item label="排序:">
               <el-input style="width:220px" v-model="number_form.sort"></el-input>
           </el-form-item>
@@ -186,6 +214,7 @@ export default {
         zone: "",
         group: "",
         sort:"",
+        number_type:"",
       },
       formLabelWidth: "110px",
       showEditDeviceNumber: false,
@@ -222,6 +251,7 @@ export default {
       this.number_form.number = row.number;
       this.number_form.zone = row.zone_id;
       this.number_form.group = row.group_id;
+      this.number_form.number_type = row.number_type
       if(row.sort == 0){
         this.number_form.sort = ""
       }
@@ -237,6 +267,7 @@ export default {
       this.number_form.zone = "";
       this.number_form.group = "";
       this.number_form.sort = ""
+      this.number_form.number_type=""
       this.$refs.form_number.clearValidate();
       this.showEditDeviceNumber = false;
     },
@@ -248,7 +279,8 @@ export default {
               this.number_form.number,
               this.number_form.zone,
               this.number_form.group,
-              this.number_form.sort
+              this.number_form.sort,
+              this.number_form.number_type,
             ).then(rs => {
               var resp = rs.data;
               if (resp.state === 1) {
@@ -265,7 +297,8 @@ export default {
               this.number_form.number,
               this.number_form.zone,
               this.number_form.group,
-              this.number_form.sort
+              this.number_form.sort,
+              this.number_form.number_type,
             ).then(rs => {
               var resp = rs.data;
               // console.log(resp.data)
@@ -283,6 +316,7 @@ export default {
                     number.zone_name = resp.data.number.zone_name;
                     number.group_name = resp.data.number.group_name;
                     number.sort = resp.data.number.sort;
+                    number.number_type = resp.data.number.number_type
                     break;
                   }
                 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1406,11 +1406,14 @@
                         <span v-if="record.prescription.anticoagulant == 15"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 14"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 16"
                           >mg</span
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
-                          >mg</span
+                          >U</span
                         >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1473,6 +1476,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 14"
+                          >iu/h</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 15"
                           >mg/h</span
                         >
@@ -1480,7 +1486,7 @@
                           >mg/h</span
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
-                          >mg/h</span
+                          >U/h</span
                         >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1523,6 +1529,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 14"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 15"
                           >mg</span
                         >
@@ -1530,8 +1539,7 @@
                           >mg</span
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
-                          >mg</span
-                        >
+                          >U</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -100,6 +100,21 @@
            </template>
         </el-table-column>
 
+        <el-table-column label="透析器/灌流器/滤过器" align="center" width="160">
+           <template slot-scope="scope">
+              <span v-if="scope.row.dialysis_prescription!=null">
+                 {{ scope.row.dialysis_prescription.dialysis_dialyszers }} &nbsp;&nbsp; {{ scope.row.dialysis_prescription.dialysis_irrigation }} &nbsp;&nbsp;  {{ scope.row.dialysis_prescription.dialysis_strainer }}
+              </span>
+
+              <span v-if="scope.row.dialysis_prescription==null">
+                {{ scope.row.dialysis_solution.dialysis_dialyszers }}  &nbsp;&nbsp; {{ scope.row.dialysis_solution.dialysis_irrigation }} &nbsp;&nbsp;  {{ scope.row.dialysis_solution.dialysis_strainer }}
+              </span>
+           </template>
+        </el-table-column>
+
+
+
+
         <el-table-column label="推送医嘱" align="center" width="1280">
            <template slot-scope="scope">
              <span v-if="config.is_open !=1">{{getAdviceContent(scope.row.patient_id)}}</span> 
@@ -250,7 +265,6 @@
         allGoodInfo:[],
         list:[],
         new_list:[],
-
         good_types: [],
         arrKey:[],
         arrList:[],
@@ -404,6 +418,18 @@
       if(val == 39){
         name = "HF16"
       }
+      if(val == 40){
+        name = "HD(无肝素)"
+      }
+      if(val == 41){
+        name = "HDF17H"
+      }
+      if(val == 42){
+        name = "HD."
+      }
+      if(val == 43){
+        name = "HD(2)"
+      }
       return name
       },
       getlist(){
@@ -412,7 +438,14 @@
           if(response.data.state == 1){
           
             var list = response.data.data.list
-            this.list = list
+            if(list!=null && list.length>0){
+              for(let i=0;i<list.length;i++){
+                 list[i].sort =0
+                 list[i].sort = list[i].device_number.sort
+              }
+            }
+            console.log("lsit=================",list)
+            this.list = list.sort(this.compare('sort'))
             this.total = response.data.data.total
             var adviceList = response.data.data.adviceList
             this.adviceList = adviceList
@@ -461,7 +494,13 @@
           }
         })
       },
-
+      compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
       handleSizeChange(val) {
         this.query.limit = val;
         this.getlist();
@@ -521,7 +560,11 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.partitionArr = response.data.data.zone
+           
+            var obj = {id:0,name:"全部"}
+            this.partitionArr.push(obj)
+            var zones = response.data.data.zone
+            this.partitionArr.push(...zones)
             for(let i=0;i<this.partitionArr.length;i++){
               this.zoneIdList.push(this.partitionArr[i].id)
             }

src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue

@@ -30,6 +30,7 @@
                 <td width="100">姓名</td>
                 <td width="100">透析号</td>
                 <td width="100">透析模式</td>
+                <td width="200">透析器/灌流器/滤过器</td>
                 <td width="800">推送医嘱</td>
              
               </tr>
@@ -41,6 +42,15 @@
                 <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td>{{getModeId(item.mode_id)}}</td>
+                <td width="200">
+                  <span v-if="item.dialysis_prescription!=null">
+                    {{ item.dialysis_prescription.dialysis_dialyszers }} &nbsp;&nbsp; {{ item.dialysis_prescription.dialysis_irrigation }} &nbsp;&nbsp;  {{ item.dialysis_prescription.dialysis_strainer }}
+                   </span>
+
+                  <span v-if="item.dialysis_prescription==null">
+                    {{ item.dialysis_solution.dialysis_dialyszers }}  &nbsp;&nbsp; {{ item.dialysis_solution.dialysis_irrigation }} &nbsp;&nbsp;  {{ item.dialysis_solution.dialysis_strainer }}
+                  </span>
+                </td>
                  <td width="800">
                      <span v-if="config.is_open !=1">{{getAdviceContent(item.patient_id)}}</span> 
                      <span v-if="config.is_open == 1"> {{getHisAdviceContent(item.patient_id)}}</span>
@@ -113,6 +123,13 @@
      this.getlist()
     },
     methods: {
+     compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+     },
      getModeId(val){
       var name =""
       if(val == 1){
@@ -220,6 +237,18 @@
       if(val == 39){
         name = "HF16"
       }
+      if(val == 40){
+        name = "HD(无肝素)"
+      }
+      if(val == 41){
+        name = "HDF17H"
+      }
+      if(val == 42){
+        name = "HD."
+      }
+      if(val == 43){
+        name = "HD(2)"
+      }
       return name
       },
       getlist(){
@@ -235,6 +264,14 @@
           if(response.data.state == 1){
           
             var list = response.data.data.list
+            if(list!=null && list.length>0){
+              for(let i=0;i<list.length;i++){
+                 list[i].sort =0
+                 list[i].sort = list[i].device_number.sort
+              }
+            }
+            console.log("lsit=================",list)
+            this.list = list.sort(this.compare('sort'))
             this.list = list
             this.total = response.data.data.total
             var adviceList = response.data.data.adviceList

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -278,6 +278,36 @@
               {{ scope.row.advice_spc }}
            </template>
         </el-table-column>
+
+        <el-table-column align="center" label="左卡" v-if="org_id!=10599 && org_id!=10629">
+           <template slot-scope="scope">
+              {{ scope.row.advice_spc_one }}
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="低分子" v-if="org_id!=10599 && org_id!=10629">
+           <template slot-scope="scope">
+              {{ scope.row.advice_spc_two }}
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="肝素钠" v-if="org_id!=10599 && org_id!=10629">
+           <template slot-scope="scope">
+              {{ scope.row.advice_spc_three }}
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="蔗糖铁" v-if="org_id!=10599 && org_id!=10629">
+           <template slot-scope="scope">
+              {{ scope.row.advice_spc_four }}
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="尿激酶" v-if="org_id!=10599 && org_id!=10629">
+           <template slot-scope="scope">
+              {{ scope.row.advice_spc_five }}
+           </template>
+        </el-table-column>
        <el-table-column align="center" label="封管液" v-if="dialysisSett.sealing_fluid_dispose == 1">
            <template slot-scope="scope">
              <span>{{scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose}} </span> 
@@ -686,11 +716,34 @@
 
               for(let i=0;i<list.length;i++){
                 list[i].advice_spc =""
+                list[i].advice_spc_one = ""
+                list[i].advice_spc_three = ""
+                 list[i].advice_spc_four = ""
+                  list[i].advice_spc_five = ""
                  for(let j=0;j<list[i].advice.length;j++){
                      if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                         list[i].advice_spc+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
                      }
+
+                     if((list[i].advice[j].advice_name).indexOf("左卡")!=-1){
+                        list[i].advice_spc_one+= (list[i].advice[j].single_dose + "g"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+
+                     if((list[i].advice[j].advice_name).indexOf("低分子")!=-1){
+                        list[i].advice_spc_two+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+
+                     if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
+                        list[i].advice_spc_three+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+                     if((list[i].advice[j].advice_name).indexOf("蔗糖铁")!=-1){
+                        list[i].advice_spc_four+= (list[i].advice[j].single_dose + "mg"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+                     if((list[i].advice[j].advice_name).indexOf("尿激酶")!=-1){
+                        list[i].advice_spc_five+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
                  }
+                
               }
               console.log("listwowowowowowo日本",this.list)
               this.list = list

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -52,8 +52,13 @@
                 <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1 && org_id!=10629">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">封管液</td>
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">促红</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">封管液</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">促红</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">左卡</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">低分子</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">肝素钠</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">蔗糖铁</td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">尿激酶</td>
               </tr>
               </thead>
               <tbody>
@@ -181,9 +186,24 @@
                 </td>
                 
                 
-                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599 && org_id!=10629">
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
                   {{ item.advice_spc }}
                 </td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                  {{ item.advice_spc_one }}
+                </td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                  {{ item.advice_spc_two }}
+                </td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                  {{ item.advice_spc_three }}
+                </td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                  {{ item.advice_spc_four }}
+                </td>
+                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                  {{ item.advice_spc_five }}
+                </td>
                </tr>
               </tbody>
             </table>
@@ -282,12 +302,33 @@
             var total_three =0  
             console.log("listoowowowwoww",list)
             for(let i=0;i<list.length;i++){
-              list[i].advice_spc =""
+                list[i].advice_spc =""
+                list[i].advice_spc_one = ""
+                list[i].advice_spc_three = ""
+                list[i].advice_spc_four = ""
+                list[i].advice_spc_five = ""
                 for(let j=0;j<list[i].advice.length;j++){
                     total_two +=parseInt(list[i].advice[j].prescribing_number) 
                     if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                       list[i].advice_spc+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
                     }
+                    if((list[i].advice[j].advice_name).indexOf("左卡")!=-1){
+                        list[i].advice_spc_one+= (list[i].advice[j].single_dose + "g"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+
+                     if((list[i].advice[j].advice_name).indexOf("低分子")!=-1){
+                        list[i].advice_spc_two+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+
+                     if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
+                        list[i].advice_spc_three+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+                     if((list[i].advice[j].advice_name).indexOf("蔗糖铁")!=-1){
+                        list[i].advice_spc_four+= (list[i].advice[j].single_dose + "mg"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
+                     if((list[i].advice[j].advice_name).indexOf("尿激酶")!=-1){
+                        list[i].advice_spc_five+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                     }
                 }
               this.total_two =total_two
               if(list[i].dialysis_solution.anticoagulant == 3){
@@ -301,6 +342,7 @@
               this.total_three = total_three
              
             }
+            console.log("list====================",list)
             this.list = list
             this.dialysisSett = response.data.data.dialysisSett
             console.log("设置",this.dialysisSett)

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1444,7 +1444,11 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                       <span v-if="org_id!=10644">mg</span> 
+                       <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
 
                     <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10460">
@@ -1459,7 +1463,11 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     <span v-if="prescription.anticoagulant == 14">mg</span>
+                     <span v-if="prescription.anticoagulant == 14">
+                      <span v-if="org_id!=10644">mg</span> 
+                      <span v-if="org_id==10644">iu</span> 
+                     </span>
+                     <span v-if="prescription.anticoagulant == 17">U</span>
 
                     </span>
                     </div>
@@ -1501,7 +1509,11 @@
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 14">
+                            <span v-if="org_id!=10644">mg/h</span> 
+                            <span v-if="org_id==10644">iu/h</span> 
+                          </span>
+                          <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -1515,7 +1527,11 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 14">
+                            <span v-if="org_id!=10644">mg/h</span> 
+                            <span v-if="org_id==10644">iu/h</span> 
+                          </span>
+                          <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
                     </div>
                     <div
@@ -1584,7 +1600,11 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">U</span>
                      </span>
                     <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471|| org_id == 10460">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1598,7 +1618,11 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      <span v-if="prescription.anticoagulant == 14">mg/h</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">

src/xt_pages/eleFaPiao/fapiao.vue

@@ -89,6 +89,18 @@
         </el-table-column>
 
 
+        <el-table-column
+          align="center"
+          width="100"
+          prop="name"
+          label="处方日期"
+        >
+          <template slot-scope="scope">
+            {{scope.row.orders?getTimes(scope.row.orders[0].settle_accounts_date):""}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" width="90" prop="name" label="开票员">
           <template slot-scope="scope">
             {{scope.row.creator}}

src/xt_pages/workforce/remind_print.vue

@@ -37,6 +37,7 @@
                   <td width="30" v-if="printObj.anticoagulant_zongliang == 1">维持</td>
                   <td width="30" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
                   <td width="">血管通路</td>
+                  <td width="" v-if="org_id == 0 || org_id ==10567">管路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
@@ -125,6 +126,11 @@
                 <td >
                    <span>{{getBloodName(main_collection.prescription.blood_access)  }}</span>
                 </td>
+                <td v-if="org_id == 0 || org_id ==10567">
+                   <span>
+                     {{ getProjectName(main_collection.projectList,main_collection.schedule_date) }}
+                   </span>
+                </td>
                 <td  style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
                    <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
@@ -207,7 +213,19 @@
            console.log("list2323323",list)
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
+              list[i].projectList = []
+              if(list[i].his_prescription_template.his_prescription_info.length>0){
+                for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
+                  if(list[i].his_prescription_template.his_prescription_info[j].project.length >0){
+                    for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
+                      list[i].projectList.push(list[i].his_prescription_template.his_prescription_info[j].project[z])
+                    }
+                    
+                  }
+                }
+              }
            }
+           console.log("likst==========================",list)
            var arr = list.sort(this.compare('sort'))
             
              this.scheduleData = arr
@@ -494,6 +512,27 @@
 
         return type_name 
 
+      },
+      getProjectName(val,schedule_date){
+       var project_name = ""
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+          if(val[i].good_info.good_type_id == 9716){
+            if(val[i].frequency_type == 1 || (val[i].frequency_type == 3 && val[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+              project_name += val[i].good_info.good_name +val[i].count + val[i].good_info.packing_unit +","
+            }
+          }
+           
+         }
+       }
+       return project_name
+      },
+      getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
       }
     },
   }