新分支

config/sit.env.js

@@ -1,7 +1,8 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
+  BASE_API: '"https://api.xt.test.sgjyun.com"',
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/api/advice.js

@@ -376,6 +376,7 @@ export function CreateNewDoctorAdvice(id, advice, mode) {
 }
 
 export function CreateNewGroupAdvice(id, groupno, advices, mode) {
+  console.log("advices2332332233w",advices)
   if (advices.remind > 0) {
     return request({
       url:

src/api/patient.js

@@ -509,7 +509,7 @@ export function getInspectionItemList(params) {
 }
 
 export function saveCreation(data) {
-  console.log('中国龚3223呃3额', data)
+ 
   return request({
     url: '/api/patient/savecreationinspection',
     method: 'post',

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -463,6 +463,7 @@ export default {
         shift: this.shift,
         partition: this.partition,
       };
+      console.log("班次---------------------",params)
       waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
           this.waitmount_data = res.data.data.list;

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -52,7 +52,7 @@
               <div class="inline_block">
                 姓名：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ record.patient.name }}
+                  {{nameSplit(record.patient.name) }}
                 </div>
               </div>
               <div class="inline_block" style="margin-left: 10px">
@@ -309,7 +309,13 @@
                             class="under_line"
                             style="width: 200px; text-align: center"
                           >
-                            {{
+                          <span v-if="record.dialysis_order != null">
+                          
+                            {{QueryPartById(record.dialysis_order.blood_access_id) }}
+                          <!-- {{
+                              record.dialysisOrder && QueryPartById(record.dialysisOrder.blood_access_id)? QueryPartById(record.dialysisOrder.blood_access_id): ""}} -->
+                          </span>
+                            <!-- {{
                               record.assessment_before_dislysis &&
                               record.assessment_before_dislysis
                                 .blood_access_part_id
@@ -324,7 +330,7 @@
                                 ? record.assessment_before_dislysis
                                     .blood_access_part_opera_name
                                 : ""
-                            }}
+                            }} -->
                           </div>
                         </div>
                      
@@ -683,7 +689,19 @@
                             class="under_line"
                             style="width: 100px; text-align: center"
                           >
-                            {{
+                          <span v-if="record.dialysis_order != null"
+                                  >{{
+                                    record.dialysis_order.dialysis_dialyszers
+                                      ? record.dialysis_order.dialysis_dialyszers
+                                      : ""
+                                  }}&nbsp;&nbsp;
+                                  {{
+                                    record.dialysis_order.dialysis_irrigation
+                                      ? record.dialysis_order.dialysis_irrigation
+                                      : ""
+                                  }}
+                           </span>
+                            <!-- {{
                               record.prescription &&
                               record.prescription.dialyzer_perfusion_apparatus
                                 ? record.prescription.dialyzer_perfusion_apparatus
@@ -694,7 +712,7 @@
                               record.prescription.dialysis_dialyszers
                                 ? record.prescription.dialysis_dialyszers
                                 : "/"
-                            }}
+                            }} -->
                           </div>
                         </div>
                         <div class="inline_block" style="flex: 1">
@@ -703,12 +721,24 @@
                             class="under_line"
                             style="width: 70px; text-align: center"
                           >
-                            {{
+                            <!-- {{
                               record.prescription &&
                               record.prescription.dialysis_irrigation
                                 ? record.prescription.dialysis_irrigation
                                 : "/"
-                            }}
+                            }} -->
+                            <span v-if="record.dialysis_order != null"
+                                  >{{
+                                    record.dialysis_order.dialysis_dialyszers
+                                      ? record.dialysis_order.dialysis_dialyszers
+                                      : ""
+                                  }}&nbsp;&nbsp;
+                                  {{
+                                    record.dialysis_order.dialysis_irrigation
+                                      ? record.dialysis_order.dialysis_irrigation
+                                      : ""
+                              }}
+                           </span>
                           </div>
                         </div>
                         <div
@@ -1859,10 +1889,6 @@
                           kg
                         </div>
   
-                       
-  
-                      
-  
                         <div class="inline_block" style="flex: 1">
                           实际超滤量：
                           <div
@@ -1875,7 +1901,7 @@
                                 .actual_ultrafiltration
                                 ? record.assessment_after_dislysis
                                     .actual_ultrafiltration
-                                : "/"
+                                : "0"
                             }}
                           </div>
                           ml
@@ -2969,6 +2995,36 @@
       getNumber: function (record) {
         console.log(record);
       },
+
+      // 切割患者姓名
+      nameSplit(val) {
+        var reg = /[\u4e00-\u9fa5]/g;
+        let name = val;
+        name = name.substr(-3);
+        var names = name.match(reg);
+        name = names.join("");
+        if (name.includes("区")) {
+          name = name.replace("区", "");
+        }
+        if (name.includes("右")) {
+          name = name.replace("右", "");
+        }
+        return name;
+      },
+      QueryPartById: function (val) {
+      let vascular_access_part_name = "/";
+      const vascular_access = getDataConfig(
+        "hemodialysis",
+        "vascular_access_desc"
+      );
+
+      for (let i = 0; i < vascular_access.length; i++) {
+        if (vascular_access[i].id == val) {
+          vascular_access_part_name = vascular_access[i].name;
+        }
+      }
+      return vascular_access_part_name;
+    },
     },
   };
   </script>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -934,8 +934,8 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469">ml</span> 
-                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469">L</span>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -392,14 +392,14 @@
                       >置换方式:
                        <label-box
                          :isChecked="
-                          record.prescription.displace_liqui_part == 1 && record.prescription.mode_id != 2 &&  record.prescription.mode_id != 5 && record.prescription.mode_id != 12 ? true : false
+                          record.prescription.displace_liqui_part == 1 && (record.prescription.mode_id == 2 ||  record.prescription.mode_id == 5 || record.prescription.mode_id == 12) ? true : false
                           "
                          showValue="前"
                          ></label-box
                          >&nbsp;
                         <label-box
                           :isChecked="
-                            record.prescription.displace_liqui_part == 2 && record.prescription.mode_id != 2 &&  record.prescription.mode_id != 5 && record.prescription.mode_id != 12? true : false
+                            record.prescription.displace_liqui_part == 2 && (record.prescription.mode_id == 2 ||  record.prescription.mode_id == 5 || record.prescription.mode_id == 12)? true : false
                           "
                           showValue="后"
                         ></label-box>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -543,6 +543,15 @@
           align="center"
           width="100"
         ></el-table-column>
+
+        <el-table-column
+          v-if="org_id == 10469"
+          prop="prescription_water"
+          label="处方脱水量"
+          align="center"
+          width="100"
+        ></el-table-column>
+
         <el-table-column
           prop="dry_weight"
           label="干体重(kg)"
@@ -1590,6 +1599,10 @@ export default {
                 SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
               }
 
+              if(response.data.data.schedule[i].prescription!=null){
+                SchedualPatientsTable["prescription_water"] = response.data.data.schedule[i].prescription.prescription_water;
+              }
+
               if (response.data.data.schedule[i].assessment_before_dislysis != null) {
                 SchedualPatientsTable["dialysis_before_weight"] =response.data.data.schedule[i].assessment_before_dislysis.weight_before;
               }

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -66,6 +66,11 @@
           <span class="content">{{ this.record.puncture_needle }}</span>
         </li>
 
+        <li v-if="isShow('穿刺点')">
+          <label>穿刺点 : </label>
+          <span class="content">{{ this.record.point_puncture }}</span>
+        </li>
+
         <li v-if="isShow('位置')">
           <label>位置</label>
           <span

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

@@ -507,7 +507,7 @@
       this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
       var filedList = this.$store.getters.xt_user.fileds
       for (let i = 0; i < filedList.length; i++) {
-        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针')) {
+        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针' || filedList[i].filed_name_cn == '滤过器')) {
           this.rowList.push(filedList[i])
         }
       }
@@ -524,7 +524,7 @@
          arr.push('透析机号')
          arr.push('姓名')
          arr.push('透析号')
-
+     
         //  console.log("list23322323232",this.rowList)
          if(this.rowList!=null && this.rowList.length > 0){
            for(let i=0;i<this.rowList.length;i++){
@@ -802,6 +802,7 @@
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
                  list[i].puncture_needle_arr = []
+                 list[i].dialysis_strainer_arr = []
 
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
@@ -812,6 +813,9 @@
                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_solution.dialysis_strainer!=""){
+                   list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 }
                  if(list[i].dialysis_solution.puncture_needle!="" ){
                     list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
                  }
@@ -996,6 +1000,7 @@
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
+            var dialysisStrainerArr = []
             var punctureNeedleArr = []
 
 
@@ -1013,11 +1018,15 @@
              for(let h=0;h<list[i].puncture_needle_arr.length;h++){
                punctureNeedleArr.push(list[i].puncture_needle_arr[h])
              }
+             for(let w=0;w<list[i].dialysis_strainer_arr.length;w++){
+              dialysisStrainerArr.push(list[i].dialysis_strainer_arr[w])
+             }
             }
            let obj = {}
            let objOne = {}
            let objTwo = {}
            let objThree = {}
+           let objFour = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
@@ -1084,8 +1093,28 @@
               a.specification_name = i
               Arr.push(a);
             }
+           
+          
+       
+           for(let i=0;i<dialysisStrainerArr.length;i++){
+            if(objFour[dialysisStrainerArr[i]]){
+              objFour[dialysisStrainerArr[i]] +=1
+             }else{
+              objFour[dialysisStrainerArr[i]] = 1
+             }
+           }
+          
+            for (let i in objFour) {
+              let a = {};
+              a[i] = objFour[i];
+              a.name = "滤过器"
+              a.count = objFour[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
 
-
+       
+           
 
 
           //  var objfive = {name:"钾(mmol/L)",specification_name:"2.0",count:""}
@@ -1103,7 +1132,7 @@
             // this.tableList.push(objsix)
             // this.tableList.push(objseven)
             // this.tableList.push(objeight)
-
+            console.log("arARRRR2323223232=------------",Arr)
             for(let i=0;i<Arr.length;i++){
               for(let j=0;j<this.rowList.length;j++){
                 if(Arr[i].name == this.rowList[j].filed_name_cn){
@@ -1187,7 +1216,7 @@
                  newArr[i].count += parseInt(newArr[i].child[j].count)
               }
             }
-            // console.log("newArr32323233223wo",newArr)
+            console.log("newArr32323233223wo",newArr)
             this.tableList = newArr
           }
         })
@@ -1361,6 +1390,10 @@
         if(filed_name_cn == "最大超滤率"){
           return val.max_ultrafiltration_rate?val.max_ultrafiltration_rate:""
         }
+
+        if(filed_name_cn == "滤过器"){
+          return val.dialysis_strainer?val.dialysis_strainer:""
+        }
       },
       getModeName(id){
         var name = ""

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

@@ -108,7 +108,7 @@
       this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
       var filedList = this.$store.getters.xt_user.fileds
       for (let i = 0; i < filedList.length; i++) {
-        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针')) {
+        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针'|| filedList[i].filed_name_cn == '滤过器')) {
           this.rowList.push(filedList[i])
         }
       }
@@ -347,6 +347,10 @@
         if(filed_name_cn == "最大超滤率"){
           return val.max_ultrafiltration_rate
         }
+
+        if(filed_name_cn == "滤过器"){
+          return val.dialysis_strainer?val.dialysis_strainer:""
+        }
       },
 
        getModeName(id){
@@ -553,6 +557,7 @@
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
                  list[i].puncture_needle_arr = []
+                 list[i].dialysis_strainer_arr = []
                 
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
@@ -566,6 +571,10 @@
                  if(list[i].dialysis_solution.puncture_needle!="" ){
                     list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
                  }
+
+                 if(list[i].dialysis_solution.dialysis_strainer!=""){
+                   list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 }
                  kaliumCount += parseInt(list[i].dialysis_solution.kalium) 
                  sodiumCount += parseInt(list[i].dialysis_solution.sodium)
                  calciumCount +=parseInt(list[i].dialysis_solution.calcium)
@@ -749,6 +758,7 @@
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
             var punctureNeedleArr = []
+            var dialysisStrainerArr = []
             
           
             for(let i=0;i<list.length;i++){
@@ -765,11 +775,15 @@
              for(let h=0;h<list[i].puncture_needle_arr.length;h++){
                punctureNeedleArr.push(list[i].puncture_needle_arr[h])   
              }
+             for(let w=0;w<list[i].dialysis_strainer_arr.length;w++){
+              dialysisStrainerArr.push(list[i].dialysis_strainer_arr[w])
+             }
             }
            let obj = {}
            let objOne = {}
            let objTwo = {}
            let objThree = {}
+           let objFour = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
@@ -838,6 +852,22 @@
             }
             
           
+           for(let i=0;i<dialysisStrainerArr.length;i++){
+            if(objFour[dialysisStrainerArr[i]]){
+              objFour[dialysisStrainerArr[i]] +=1
+             }else{
+              objFour[dialysisStrainerArr[i]] = 1
+             }
+           }
+          
+            for (let i in objFour) {
+              let a = {};
+              a[i] = objFour[i];
+              a.name = "滤过器"
+              a.count = objFour[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
 
 
           //  var objfive = {name:"钾(mmol/L)",specification_name:"2.0",count:""}

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

@@ -135,7 +135,7 @@
       this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
       var filedList = this.$store.getters.xt_user.fileds
       for (let i = 0; i < filedList.length; i++) {
-        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针')) {
+        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针' || filedList[i].filed_name_cn == '滤过器')) {
           this.rowList.push(filedList[i])
         }
       }
@@ -429,6 +429,10 @@
         if(filed_name_cn == "最大超滤率"){
           return val.max_ultrafiltration_rate?val.max_ultrafiltration_rate:""
         }
+
+        if(filed_name_cn == "滤过器"){
+          return val.dialysis_strainer?val.dialysis_strainer:""
+        }
       },
 
        getModeName(id){

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

@@ -1648,6 +1648,36 @@ export default {
           }
       }
 
+
+      if( this.$store.getters.xt_user.org.id == 10471 ){
+          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
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          if (this.schedulePatient.schedule_type == 1) {
+            this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+          } else if (this.schedulePatient.schedule_type == 2) {
+            this.groupForm.start_time= year + '-' + month + '-' + day + ' ' + '11:00'
+          } else if (this.schedulePatient.schedule_type == 3) {
+           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+          }
+      }
+
     },
     selectAllTemplateAdvice(selection) {
       console.log("params",selection)

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

@@ -340,6 +340,15 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="穿刺点： " :prop="isName('穿刺点')"  v-if="isShow('穿刺点')&& assessmentBeforeDislysis.puncture_way.indexOf('绳梯')!==-1">
+              <el-input v-model="assessmentBeforeDislysis.point_puncture" readonly
+                      @focus="showInnerDialog('21')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+
 
           <el-col :span="8">
             <el-form-item label="出血： " :prop="isName('出血')"
@@ -839,6 +848,7 @@
           age:"",
           his_department:"",
           his_bed:"",
+          point_puncture:""
         },
 
         InnerDialogProps: {
@@ -856,6 +866,7 @@
         catheter_maintenancelist:[],
         thrombuShow:false,
         body_weight_before:"",
+        point_punctures:[],
       }
     },
     props: {
@@ -940,6 +951,7 @@
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            console.log("filedList",filedList)
             return true
           }
         }
@@ -961,6 +973,10 @@
            this.thrombuShow = true
         }
 
+        if(this.lastPredialysisEvaluation.thromubus_type == 2){
+          this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
+        }
+
           if (this.lastPredialysisEvaluation.is_hemorrhage == 1) {
             this.lastPredialysisEvaluation.is_hemorrhage = "1"
           }
@@ -1250,6 +1266,15 @@
             this.InnerDialogProps.type = 'suction'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.suction
             this.InnerDialogProps.isShowTextArea = false
+
+            case '21': // 穿刺点
+            this.InnerDialogProps.values =  this.point_punctures
+            this.InnerDialogProps.titles = '穿刺点'
+            this.InnerDialogProps.type = 'point_puncture'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.point_puncture
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
          
         }
       },
@@ -1320,6 +1345,9 @@
           case 'suction':
            this.assessmentBeforeDislysis.suction = val.value.join(',')
            break
+           case 'point_puncture':
+            this.assessmentBeforeDislysis.point_puncture = val.value.join(',')
+            break
         }
       },
       innerDialogCancle: function() {
@@ -1514,6 +1542,8 @@
       console.log("导管维护",this.catheter_maintenancelist)
        
       console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
+
+      this.point_punctures = getDataConfig('hemodialysis','point_puncture')
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

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

@@ -59,7 +59,7 @@
         >
           <el-select v-model="form.nurse_id" placeholder="请选择上机护士">
             <el-option
-              v-for="(admin, index) in admins"
+              v-for="(admin, index) in adminRoles"
               :key="index"
               :value="admin.id"
               :label="admin.name"
@@ -128,7 +128,7 @@
         >
           <el-select v-model="form.washpipe_nurse" placeholder="请选择冲管护士">
             <el-option
-              v-for="(admin, index) in admins"
+              v-for="(admin, index) in adminRoles"
               :key="index"
               :value="admin.id"
               :label="admin.name"
@@ -583,13 +583,15 @@ export default {
           : this.getTime(this.dialysis_order.start_time, "{y}-{m}-{d} {h}:{i}");
     },
     admins: function () {
-      console.log("admins", this.admins);
+      // console.log("admins", this.admins);
       if (this.admins.length > 0) {
         for (let i = 0; i < this.admins.length; i++) {
-          this.adminRoles.push(this.admins[i]);
+          if(this.admins[i].status == 1){
+            this.adminRoles.push(this.admins[i]);
+          }
         }
       }
-      console.log("人员", this.adminRoles);
+     console.log("人员", this.adminRoles);
     },
     stockType: function () {
       console.log("stockType", this.stockType);

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

@@ -2455,6 +2455,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10471){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

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

@@ -89,8 +89,16 @@
 
       <el-form-item style="padding-left: 17px;">
         <el-checkbox-group v-model="checkList" @change="changeBox">
-          <el-checkbox :label="diazes"></el-checkbox>
+          <el-checkbox :label="diazes"></el-checkbox>&nbsp;&nbsp;
+          <span v-if="org_id == 0 || org_id == 9671 || org_id == 10440 || org_id == 9675"><el-input style="width:200px" v-model="doubleReview.dialyzer_batch_number"></el-input></span> 
+        </el-checkbox-group>
+        <el-checkbox-group v-model="checkList" @change="changeBox">
           <el-checkbox :label="puncture_needle"></el-checkbox>
+          <span v-if="org_id == 0 || org_id == 9671 || org_id == 10440 || org_id == 9675"><el-input style="width:200px" v-model="doubleReview.needle_batch_number"></el-input></span>
+        </el-checkbox-group>
+        <el-checkbox-group v-model="checkList" @change="changeBox">
+          <!-- <el-checkbox :label="diazes"></el-checkbox>
+          <el-checkbox :label="puncture_needle"></el-checkbox> -->
           <el-checkbox :label="dialysate_formulation"></el-checkbox>
           <el-checkbox :label="kalium"></el-checkbox>
           <el-checkbox :label="calcium"></el-checkbox>
@@ -319,6 +327,8 @@ export default {
         check_time: 0,
         first_check_time: 0,
         employee_number: "",
+        dialyzer_batch_number:"",
+        needle_batch_number:""
       },
       dialysate_formulation_options: [],
       record_date: "",
@@ -393,6 +403,20 @@ export default {
       return false;
     },
     show() {
+    
+      if(this.admin_users!=null && this.admin_users.length >0){
+        var arr = []
+        for(let i=0;i<this.admin_users.length;i++){
+          if(this.admin_users[i].status == 1){
+            arr.push(this.admin_users[i])
+          }
+        }
+
+        this.admin_users = []
+        this.admin_users.push(...arr)
+       
+      }
+
       this.isVisibility = true;
       if (this.double_check.id > 0) {
         this.first_check_time = uParseTime(
@@ -480,7 +504,9 @@ export default {
 
           ParamsQuery["creater"] = this.doubleReview.creater;
           ParamsQuery["modifier"] = this.doubleReview.modifier;
-
+          ParamsQuery['employee_number'] = this.doubleReview.employee_number
+          ParamsQuery['dialyzer_batch_number'] = this.doubleReview.dialyzer_batch_number
+          ParamsQuery['needle_batch_number'] = this.doubleReview.needle_batch_number
           console.log(ParamsQuery, "提交参数");
           postDoubleCheck(ParamsQuery).then((response) => {
             if (response.data.state == 0) {
@@ -1268,22 +1294,46 @@ export default {
   },
   watch: {
     isVisibility(val) {
+      console.log("presciption23233223322323",this.prescription)
+      if(this.prescription != null && this.prescription.id == 0){
+         if(this.org_id == 10440 || this.org_id == 0){
+          this.diazes = "透析器/灌流器:" + "   " + "批号:";
+         }
+      }
       if (this.prescription != null && this.prescription.id != 0) {
-        if (
-          this.prescription.dialyzer_perfusion_apparatus != "" ||
-          this.prescription.dialysis_dialyszers != "" ||
-          this.prescription.dialysis_irrigation != ""
-        ) {
-          this.diazes = "透析器/灌流器:";
-          this.diazes =
-            this.diazes + this.prescription.dialyzer_perfusion_apparatus;
-          this.diazes =
-            this.diazes +
-            this.prescription.dialysis_dialyszers +
-            this.prescription.dialysis_irrigation;
+        if (this.prescription.dialyzer_perfusion_apparatus != "" ||this.prescription.dialysis_dialyszers != "" || this.prescription.dialysis_irrigation != "") {
+
+          if(this.org_id == 10440 || this.org_id == 0){
+            this.diazes = "透析器/灌流器:";
+            this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus;
+            this.diazes = this.diazes + this.prescription.dialysis_dialyszers + this.prescription.dialysis_irrigation + "  " +"批号:"+ " ";
+
+            console.log("hhahahahhahahahawowoowowowowo--------",this.diazes)
+          }
+
+          if(this.org_id!=0 && this.org_id!=10440){
+           
+            this.diazes = "透析器/灌流器:";
+            this.diazes =
+              this.diazes + this.prescription.dialyzer_perfusion_apparatus;
+            this.diazes =
+              this.diazes +
+              this.prescription.dialysis_dialyszers +
+              this.prescription.dialysis_irrigation 
+          }
+        
         } else {
-          this.diazes = "";
-          this.diazes = this.diazes;
+
+          if(this.org_id == 10440 || this.org_id == 0){
+            this.diazes = "";
+            this.diazes = this.diazes + "  " +"批号:"+ " ";
+          }
+
+          if(this.org_id!=0 && this.org_id!=10440){
+            this.diazes = "";
+            this.diazes = this.diazes;
+          }
+         
         }
 
         if (this.prescription.dialysate_formulation != "") {
@@ -1447,18 +1497,32 @@ export default {
             this.displace_liqui_value + this.prescription.displace_liqui_value;
         }
       }
-      if (
-        this.predialysis_evaluation != null &&
-        this.predialysis_evaluation.id != 0
-      ) {
-        this.puncture_needle = "穿刺针:";
+      if (this.predialysis_evaluation != null &&this.predialysis_evaluation.id != 0) {
+        if(this.org_id == 0 || this.org_id == 10440){
+          this.puncture_needle = "穿刺针:";
+          this.puncture_needle =this.puncture_needle + this.predialysis_evaluation.puncture_needle+ "  " + "批号:" + " ";
+        this.blood_access_part_opera_id =
+          this.blood_access_part_opera_id +
+          this.getBloodAccess(
+            this.predialysis_evaluation.blood_access_part_opera_id
+          );
+        }
+
+        if(this.org_id !=0 && this.org_id!=10440){
+         
+          this.puncture_needle = "穿刺针:";
         this.puncture_needle =
-          this.puncture_needle + this.predialysis_evaluation.puncture_needle;
+          this.puncture_needle + this.predialysis_evaluation.puncture_needle 
         this.blood_access_part_opera_id =
           this.blood_access_part_opera_id +
           this.getBloodAccess(
             this.predialysis_evaluation.blood_access_part_opera_id
           );
+        }
+       
+      }
+      if(this.predialysis_evaluation != null &&this.predialysis_evaluation.id == 0){
+        this.puncture_needle = "穿刺针:" + "   "+ "批号:"
       }
       if (this.double_check != null && this.double_check.id != 0) {
         if (
@@ -1780,6 +1844,7 @@ export default {
   },
   created() {
     var date = this.$route.query && this.$route.query.date;
+ 
     this.record_date = date
       ? uParseTime(date, "{y}-{m}-{d}")
       : parseTime(new Date(), "{y}-{m}-{d}");

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

@@ -741,7 +741,7 @@
             align="center"
             label="累计血容量(ml)"
             width="100"
-            v-if="isShow('累计血容量') && template_id != 41 && org_id != 9538 && org_id != 9671 && org_id != 10340"
+            v-if="isShow('累计血容量') && template_id != 41 && org_id != 9538 && org_id != 9671 && org_id != 10340 "
           >
              <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
@@ -752,7 +752,7 @@
             align="center"
             label="累计血容量(L)"
             width="100"
-            v-if="isShow('累计血容量') && (template_id == 41  || org_id == 9538 || org_id == 9671 || org_id == 10340)"
+            v-if="isShow('累计血容量') && (template_id == 41  || org_id == 9538) && org_id!=10340 && org_id!=9671"
           >
             <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
@@ -873,12 +873,18 @@
           </el-table-column>
 
           <el-table-column
-            prop="symptom"
+           
             align="center"
             label="病情变化"
             width="130"
             v-if="isShow('病情变化')"
           >
+           <template slot-scope="scope">
+             {{scope.row.symptom}}
+            
+            
+             <span v-if="(scope.$index == monitors.length - 1) && (org_id == 0 || org_id == 9671 || org_id == 10340)">累计血容量:{{scope.row.accumulated_blood_volume }}L</span>
+            </template>
           </el-table-column>
 
           <el-table-column
@@ -2006,7 +2012,7 @@ export default {
         // 静脉压
         if (this.org_id == 10060 || this.org_id == 10387) {
           this.form.venous_pressure = resp.monitor.venous_pressure;
-        }else if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10469 ){
+        }else if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10469 || this.org_id == 10471 ){
           this.form.venous_pressure = 80
         } else {
           this.form.venous_pressure = ""; // this.last_monitor_record.venous_pressure;
@@ -2061,7 +2067,7 @@ export default {
           ? resp.monitor.dialysate_temperature
           : "";
         
-         if(this.org_id == 9675 || this.org_id == 9671 || this.org_id == 10340 || this.org_id == 10469){
+         if(this.org_id == 9675 || this.org_id == 9671 || this.org_id == 10340 || this.org_id == 10469 || this.org_id == 10471){
             this.form.temperature = "36.5"
 
          }else{

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -32,7 +32,7 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
-          <th v-if="isShow('累计血容量')" width="92px">累计血容量 
+          <th v-if="isShow('累计血容量') && org_id!=10340 && org_id!=0" width="92px">累计血容量 
             <span v-if="template_id !=41 && org_id!=9671 && org_id!=9538 && org_id!=10340">(ml)</span>
             <span v-if="template_id == 41 || org_id == 9671 || org_id == 9538 || org_id == 10340">(L)</span>
           </th>
@@ -87,7 +87,7 @@
             <span v-if="monitor.monitor_anticoagulant == 12">无抗凝剂</span>
             <span v-if="monitor.monitor_anticoagulant_value!=''">（{{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }}）</span>
           </td>
-          <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
+          <th v-if="isShow('累计血容量') && org_id!=10340 && org_id!=0" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
           <th v-if="isShow('血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
           <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
@@ -97,7 +97,9 @@
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
-          <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
+          <td v-if="isShow('病情变化')">{{ monitor.symptom }}
+            <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
+          </td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
           <td v-if="isShow('结果')">{{ monitor.result }}</td>
         </tr>

src/xt_pages/dialysis/signPrint.vue

@@ -11,22 +11,45 @@
         <div class="app-container" style="background-color: white;" v-show="show">
             <div id="dialysisTable">
                 <div v-for="(item, index) in list" :key="index">
-                    <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
-                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                    <div class="signPrint" v-for="it in item.parent_advice" style="page-break-after: always;">
+                       
+                        <div v-if="org_id!=10278">分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-                        <div>医嘱内容:{{ it.advice_name }} 
-                           <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
-                            {{it.prescribing_number}}{{ it.prescribing_number_unit }}
-                          </span> 
-                        </div>  
-                        <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
-                          规格:{{getSpecialName(it.drug_id)}} 
+
+                        <div>
+                            <div>医嘱内容:{{ it.advice_name }} 
+                            <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
+                                {{it.prescribing_number}}{{ it.prescribing_number_unit }}
+                            
+                            
+                            </span> 
+                            </div>  
+                            <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
+                            规格:{{getSpecialName(it.drug_id)}} 
+                            
+                            </div>  
+                            <div v-if="(org_id ==0 || org_id==10440) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
+                            <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                             
+                        </div>
                          
-                        </div>  
-                        <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                        <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
-                        <div>给药途径:{{it.delivery_way}}</div>  
-                        <div>打印时间:{{time}}</div>   
+                       <span v-if="it.childAdvice.length >0">&nbsp;</span>  
+                       <div v-for="its in it.childAdvice">
+                            <div>医嘱内容:{{ its.advice_name }} 
+                            <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
+                                {{its.prescribing_number}}{{ its.prescribing_number_unit }}
+                            </span> 
+                            </div>  
+                            <div v-if="org_id ==0 || org_id == 10138 || org_id == 10278">
+                            规格:{{getSpecialName(its.drug_id)}} 
+                            
+                            </div>  
+                            <div v-if=" org_id ==0 || org_id==10440">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
+                            <div>给药途径:{{its.delivery_way}}</div>  
+                        </div>
+                        <div>打印时间:{{time}}</div> 
                     </div>  
                 </div>
             </div>
@@ -269,7 +292,26 @@ export default {
                     maps.new_advice = advice_groups
                     }
                  }
-                console.log("scheduleMap999999999999",schedules)
+               
+                 for(let i=0;i<schedules.length;i++){
+                    schedules[i].parent_advice = []
+                   for(let j=0;j<schedules[i].doctor_advice.length;j++){
+                      if(schedules[i].doctor_advice[j].parent_id== 0){
+                         schedules[i].parent_advice.push(schedules[i].doctor_advice[j])
+                      }
+                   }
+                  }
+                  for(let i=0;i<schedules.length;i++){
+                    for(let j=0;j<schedules[i].parent_advice.length;j++){
+                      schedules[i].parent_advice[j].childAdvice = []
+                      for(let z=0;z<schedules[i].doctor_advice.length;z++){
+                         if(schedules[i].parent_advice[j].id == schedules[i].doctor_advice[z].parent_id){
+                            schedules[i].parent_advice[j].childAdvice.push(schedules[i].doctor_advice[z])
+                         }
+                      }
+                    }
+                  }
+                  console.log("scheduleMap999999999999",schedules)
                   this.list = schedules
                 }
                
@@ -427,10 +469,29 @@ export default {
                     }
                     maps.new_advice = advice_groups
                     }
-                 }
-                
-                     this.list = schedules
-                     this.scheduleMap = scheduleMap  
+                 } 
+                  
+                 for(let i=0;i<schedules.length;i++){
+                    schedules[i].parent_advice = []
+                   for(let j=0;j<schedules[i].doctor_advice.length;j++){
+                      if(schedules[i].doctor_advice[j].parent_id== 0){
+                         schedules[i].parent_advice.push(schedules[i].doctor_advice[j])
+                      }
+                   }
+                  }
+
+                  for(let i=0;i<schedules.length;i++){
+                    for(let j=0;j<schedules[i].parent_advice.length;j++){
+                      schedules[i].parent_advice[j].childAdvice = []
+                      for(let z=0;z<schedules[i].doctor_advice.length;z++){
+                         if(schedules[i].parent_advice[j].id == schedules[i].doctor_advice[z].parent_id){
+                            schedules[i].parent_advice[j].childAdvice.push(schedules[i].doctor_advice[z])
+                         }
+                      }
+                    }
+                  }
+                   this.list = schedules
+                   this.scheduleMap = scheduleMap  
                  }
                 console.log("this.list",this.list)
                 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -959,8 +959,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469">ml</span> 
-                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469">L</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">L</span>
                     </div>
                     <div class="inline_block" style="flex: 1">
                       干体重：
@@ -1067,14 +1067,14 @@
                         }}
                       </div>
                      
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </span>
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471">
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1113,7 +1113,7 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
 
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -1121,7 +1121,7 @@
                           <span v-if="prescription.anticoagulant == 2">iu/h</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
                       </span>
-                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469">
+                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
                           <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1186,13 +1186,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -400,14 +400,14 @@
                 置换方式:
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 1 && prescription.mode_id != 2 && prescription.mode_id != 5 && prescription.mode_id != 12? true : false
+                    prescription.displace_liqui_part == 1 && (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12)? true : false
                   "
                   showValue="前"
                 ></label-box
                 >&nbsp;
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 2 && prescription.mode_id != 2 && prescription.mode_id != 5 && prescription.mode_id != 12? true : false
+                    prescription.displace_liqui_part == 2 && (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12)? true : false
                   "
                   showValue="后"
                 ></label-box>
@@ -429,6 +429,7 @@
                   v-if="setAdminUserES(dialysisOrder.quality_nurse_id) == ''"
                   >{{getAdminUser(dialysisOrder.quality_nurse_id)}}</span
                 >
+
                 <span v-else style="height: 36px">
                   <img style="height:30px;" :src="setAdminUserES(dialysisOrder.quality_nurse_id)" alt srcset />
                 </span>

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -357,6 +357,7 @@ export default {
       {id:1,name:"全部药品"},
       {id:2,name:"库存预警"},
       {id:3,name:"库存为零"},
+      {id:4,name:"库存不为零"},
      ],
      houseList:[],
      storehouse_id:0,

src/xt_pages/stock/query/goodNewQuery.vue

@@ -321,6 +321,7 @@ export default {
       {id:1,name:"全部耗材"},
       {id:2,name:"库存预警"},
       {id:3,name:"库存为零"},
+      {id:4,name:"库存不为零"},
      ],
      houseList:[],
      storehouse_id:0,
@@ -1095,10 +1096,10 @@ export default {
     this.getStorehouseList()
     this.getlist()
     
-    var org_id = this.$store.getters.xt_user.org_id
-    if(org_id == 9583 || org_id == 3907){
-     this.getStockDrugCount()
-    }
+    // var org_id = this.$store.getters.xt_user.org_id
+    // if(org_id == 9583 || org_id == 3907){
+    //  this.getStockDrugCount()
+    // }
  
   }
 }

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -248,6 +248,7 @@ export default {
       getNewPurchaseStockQuery(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
+           
             this.loading = false
             for(let i=0;i<list.length;i++){
                

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -207,6 +207,17 @@
                  {{scope.row.push_start_time}}
                 </template>
               </el-table-column>
+
+              <el-table-column
+                label="医嘱嘱托"
+                min-width="80"
+                property="execution_frequency"
+                align="center"
+              >
+               <template slot-scope="scope">
+                 {{scope.row.remark}}
+                </template>
+              </el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -583,6 +594,11 @@
                  </el-date-picker>
               </el-form-item>
           </el-col>
+          <el-col :span="24">
+             <el-form-item label="医嘱嘱托:">
+                <el-input v-model="nameForm.remark"></el-input>
+              </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -665,6 +681,7 @@ export default {
         src_type:"",
         drug_name_id:0,
         push_start_time:"",
+        remark:"",
       },
 
       drugOptions: [],
@@ -721,7 +738,8 @@ export default {
       remind: 0,
       frequency_type: 0,
       day_count: "",
-      doctor: 0
+      doctor: 0,
+      remark:"",
     },
     adviceTypeOptions: {
       type: Array,
@@ -934,7 +952,7 @@ export default {
                     return s && s.trim();
                   }).join(","),
                 push_start_time: _this.nameForm.push_start_time,
-                
+                remark:_this.nameForm.remark,
               };
             } else {
               submitForm = {
@@ -963,8 +981,8 @@ export default {
                 frequency_type: 0,
                 day_count: "0",
                 week_days: "",
-                push_start_time:_this.nameForm.push_start_time
-
+                push_start_time:_this.nameForm.push_start_time,
+                remark:_this.nameForm.remark,
               };
             }
             let mode = "";
@@ -1028,6 +1046,7 @@ export default {
                     _this.adviceTableData[index].drug_id = advice.drug_id
                     _this.adviceTableData[index].drug_name_id = advice.drug_name_id
                     _this.adviceTableData[index].push_start_time = advice.push_start_time
+                    _this.adviceTableData[index].remark = advice.remark
                     break;
                   }
                 }
@@ -1059,6 +1078,7 @@ export default {
                           _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id
                           _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id
                           _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time
+                          _this.groupForm.adviceNames[index].children[j].remark = _this.nameForm.remark
                           _this.$set(
                             _this.groupForm.adviceNames[index].children,
                             j,
@@ -1089,6 +1109,7 @@ export default {
                       _this.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
                       _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
                        _this.groupForm.adviceNames[index].push_start_time = _this.nameForm.push_start_time;
+                       _this.groupForm.adviceNames[index].remark = _this.nameForm.remark;
                       console.log(_this.weeks);
                       _this.$set(
                         _this.groupForm.adviceNames,
@@ -1127,7 +1148,8 @@ export default {
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
                 groupno: _this.groupForm.groupno,
-                push_start_time:_this.groupForm.push_start_time
+                push_start_time:_this.groupForm.push_start_time,
+                remark:_this.groupForm.push_start_time,
               };
 
               let mode = "";
@@ -1485,6 +1507,7 @@ export default {
           drug_name_id:0,
           push_start_time:this.groupSelectRow.push_start_time,
           way:0,
+          remark:this.groupSelectRow.remark
         };
 
         if (!this.isChild) {
@@ -1517,6 +1540,7 @@ export default {
           week_days: "",
           frequency_type: 0,
           push_start_time:"",
+          remark:""
         };
         this.nameFormTitle = "新增医嘱内容";
       }

src/xt_pages/user/coursePrint.vue

@@ -181,13 +181,12 @@
         return name
       },
        setAdminUserES(id) {
-        console.log("id2323233232232333322==-",id)
-        console.log("operatorMaps----",this.operatorMaps)
+        
         if (id === 0) {
           return ''
         }
         if (id in this.operatorMaps) {
-           console.log("----------",this.operatorMaps[id].url)
+          
           return this.operatorMaps[id].url
          
         } else {

src/xt_pages/user/doctorAdvice.vue

@@ -452,6 +452,16 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          label="医嘱嘱托"
+          width="180"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{scope.row.remark}}</span>
+          </template>
+        </el-table-column>
+
         <!-- <template v-if="adviceType==3">
                     <el-table-column key="advice_doctor_3" label="开嘱医生" min-width="80"  property="advice_doctor" align="center">
                         <template slot-scope="scope">
@@ -797,6 +807,17 @@
                 </template>
                 
                 </el-table-column>
+
+                <el-table-column 
+                 label="医嘱嘱托"
+                  min-width="80"
+                  align="center"
+                >
+                <template slot-scope="scope">
+                   {{scope.row.remark}}
+                </template>
+                
+                </el-table-column>
               </el-table>
             </el-col>
           </el-row>
@@ -1205,6 +1226,12 @@
                  </el-date-picker>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+               <el-form-item label="医嘱嘱托:">
+                 <el-input v-model="nameForm.remark"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -2182,6 +2209,7 @@ export default {
         id: 0,
         children: [],
         push_start_time:"",
+        remark:"",
       },
       groupForm: {
         day_count: "",
@@ -2426,7 +2454,7 @@ export default {
               }
           }
           console.log("模板数据",submitForm)
-
+          
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2520,7 +2548,7 @@ export default {
               this.adviceForm.advice_name = arr[0]
           }
           console.log("222222???????this.adviceForm",this.adviceForm)
-
+          
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2759,7 +2787,8 @@ export default {
           parent_row: this.groupSelectRow.parent_row,
           day_count: this.groupSelectRow.day_count,
           week_days: this.groupSelectRow.week_days,
-          frequency_type: this.groupSelectRow.frequency_type
+          frequency_type: this.groupSelectRow.frequency_type,
+          remark:this.groupSelectRow.remark,
         };
         this.weeks = this.groupSelectRow.week_days.split(",");
         this.nameFormTitle = "修改医嘱内容";
@@ -2792,6 +2821,7 @@ export default {
           way:0,
           drug_id:0,
           drug_name_id:0,
+          remark:"",
         };
         this.nameFormTitle = "新增医嘱内容";
       }
@@ -3131,7 +3161,8 @@ export default {
           parent_row: 0,
           row_key: this.rowKey,
           table: [],
-          push_start_time:uParseTime(groups[index].push_start_time, "{y}-{m}-{d}")
+          push_start_time:uParseTime(groups[index].push_start_time, "{y}-{m}-{d}"),
+          remark:groups[index].remark
         };
 
         if (item.id in childMap) {
@@ -3159,7 +3190,8 @@ export default {
               children: [],
               parent_row: item.row_key,
               row_key: this.rowKey,
-              push_start_time:uParseTime(childMap[item.id][key].push_start_time, "{y}-{m}-{d}")
+              push_start_time:uParseTime(childMap[item.id][key].push_start_time, "{y}-{m}-{d}"),
+              remark:childMap[item.id][key].remark
             };
             item.children.push(child);
           }
@@ -4185,7 +4217,8 @@ export default {
                       _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
                       _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
                       _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
-                       _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time;
+                      _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time;
+                      _this.groupForm.adviceNames[index].children[j].remark = _this.nameForm.remark;
 
                       _this.$set(
                         _this.groupForm.adviceNames[index].children,
@@ -4213,6 +4246,7 @@ export default {
                   _this.groupForm.adviceNames[index].delivery_way = _this.nameForm.delivery_way;
                   _this.groupForm.adviceNames[index].execution_frequency = _this.nameForm.execution_frequency;
                   _this.groupForm.adviceNames[index].push_start_time = _this.nameForm.push_start_time
+                  _this.groupForm.adviceNames[index].remark = _this.nameForm.remark
                   if (_this.nameForm.frequency_type == 1) {
                     _this.groupForm.adviceNames[index].frequency_type =
                       _this.nameForm.frequency_type;

src/xt_pages/user/firstDisease.vue

@@ -76,6 +76,23 @@
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">病例特点:
                    <span v-html="hosDetail.patient_case"></span> 
+                   <div>
+                    <div v-for="item in hosDetail.template_inspection_content">
+                    <p style="font-weight: bold;margin: 10px 0;">{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
+                    <div style="display:flex;flex-wrap: wrap;">
+                      <div v-for="it in item.arr" style="width:33%;margin-bottom:5px;">
+                        {{ it.item_name }} <span v-if="it.unit!=''">[{{it.unit}}]</span>:
+                         {{it.inspect_value}}
+                        <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
+                           ↓
+                          </span>
+                          <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
+                           ↑
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                  </div>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">初步诊断:
                     <span v-html="hosDetail.tentative_diagnosis"></span>
@@ -148,7 +165,9 @@
                   <el-option v-for="(option, index) in patientCaseList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
+                <el-button type="primary" @click="toInspection">选择检验检查</el-button>
+               
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorOne"
@@ -159,6 +178,24 @@
                     </keep-alive>
                 </div>
 
+                <div class="borderBox">
+                   <div v-for="item in form.patient_case_one">
+                    <p>{{ item.project_name }}</p>
+                    <div style="display:flex;flex-wrap: wrap;">
+                      <div v-for="it in item.arr" style="width:33%;">
+                        {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
+                        {{it.inspect_value}}
+                          <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
+                          ↓
+                        </span>
+                        <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
+                        ↑
+                      </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
                  <label class="title"><span class="name">初步诊断</span> : </label>
                 <el-select v-model="form.tentative_diagnosis_id" placeholder="可选择病程模板" @change="changeTentativeDiagnosis">
                   <el-option v-for="(option, index) in tentativeDiagnosisList" :key="index" :label="option.title"
@@ -285,7 +322,25 @@
                   <el-option v-for="(option, index) in patientCaseList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+                <el-button type="primary" @click="toInspection">选择检验检查</el-button>
+
+                <div class="borderBox">
+                   <div v-for="item in form.patient_case_one">
+                    <p>{{ item.project_name }}</p>
+                    <div style="display:flex;flex-wrap: wrap;">
+                      <div v-for="it in item.arr" style="width:33%;">
+                        {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
+                        {{it.inspect_value}}
+                          <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
+                          ↓
+                        </span>
+                        <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
+                        ↑
+                      </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTenOne"
@@ -370,6 +425,129 @@
           </div>
         </div>
       </el-dialog>
+
+
+
+      <el-dialog
+        title="提示"
+        :visible.sync="dialogVisibleInspection"
+        width="80%"
+        >
+        <span>
+          <el-form>
+            <el-row>
+              <el-form-item>
+                <span>选择检验检查时间:</span>
+                <div>
+
+                 <el-form-item label="时间:">
+                   <el-radio-group style="padding: 10px;"  v-model="radio" @change="changeRadio">
+                      <el-radio :label="1">月份</el-radio>
+                      <el-radio :label="2">季度</el-radio>
+                    </el-radio-group>
+                 </el-form-item>
+                 <el-form-item v-show="showquarty">
+                    <el-select v-model="quartype" placeholder="请选择" @change="changetype">
+                      <el-option
+                        v-for="item in quarterType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                 </el-form-item>
+                 <el-form-item v-show="showtime">
+                   <el-date-picker
+                      @change="changeYear"
+                      v-model="startYear"
+                      class="timePicker"
+                      type="month"
+                      placeholder=""
+                      format="yyyy-MM"
+                      value-format="yyyy-MM">
+                    </el-date-picker>
+                 </el-form-item>
+              
+                </div>
+              </el-form-item>
+            </el-row>
+            <el-row>
+               <span>选择检验检查项目:</span>
+                 <div class="record">
+                  <el-row :gutter="15">
+                    <el-col :span="10">
+                      <el-table :header-cell-style="{
+                          backgroundColor: 'rgb(245, 247, 250)',
+                          color: '#606266'
+                        }"
+                        :row-style="{ color: '#303133' }"
+                        ref="single_table"
+                        :data="tableList"
+                        border highlight-current-row
+                        @current-change="changeCurrentRecord"
+                        @selection-change="selectionChangeOne"
+                        :row-class-name="tableRow"
+                       
+                      >
+                        <el-table-column type="selection" width="60" align="center"></el-table-column>
+                        <el-table-column label="检验项目" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.project_name}}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </el-col>
+                    <el-col :span="14">
+                      <div class="record_content_panel">
+                        <el-table :header-cell-style="{
+                          backgroundColor: 'rgb(245, 247, 250)',
+                          color: '#606266'
+                        }"
+                        :row-style="{ color: '#303133' }" :data="tableData"
+                                border highlight-current-row 
+                                :row-class-name="tableRow"
+
+                      >
+                        <el-table-column label="检验项目" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.item_name}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="结果" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.inspect_value}}
+                           <span v-if="parseInt(scope.row.inspect_value) < parseInt(scope.row.range_min)">
+                            ↓
+                          </span>
+                           <span v-if="parseInt(scope.row.inspect_value) > parseInt(scope.row.range_max)">
+                             ↑
+                          </span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="参考值" align="center">
+                          <template slot-scope="scope">
+                           {{scope.row.range_min}} ~  {{scope.row.range_max}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="单位" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.unit}}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      </div>
+                    </el-col>
+                  </el-row>
+                </div>
+            </el-row>
+          </el-form>
+
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisibleInspection = false">取 消</el-button>
+          <el-button type="primary" @click="toContent">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -378,7 +556,7 @@
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
 
-  import { createFirstDisease,getFirstDiseaseList,getFirstDetail,updateFirstDisease,deleteFirstDisease} from '@/api/patient'
+  import {getInitDataList,getInspectionMajorItem,getInspectionDetail,getInspectionItemList,createFirstDisease,getFirstDiseaseList,getFirstDetail,updateFirstDisease,deleteFirstDisease} from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { uParseTime } from '@/utils/tools'
@@ -446,6 +624,7 @@
           main_content:"",
           patient_case_id:"",
           patient_case:"",
+          patient_case_one:"",
           tentative_diagnosis_id:"",
           tentative_diagnosis:"",
           diagnostic_basis_id:"",
@@ -453,7 +632,12 @@
           differential_diagnosis_id:"",
           differential_diagnosis:"",
           treatment_plan_id:"",
-          treatment_plan:""
+          treatment_plan:"",
+          radio:1,
+          quarter:1,
+          start_year:new Date(),
+          start_month:new Date(),
+          detai_id:0,
         },
        tableData:[],
        docList:[],
@@ -461,6 +645,25 @@
        hosDetail:{},
        ids:"",
        patient:{},
+       dialogVisibleInspection:false,
+       quarterType: [
+        { id: 1, name: "第一季度"},
+        { id: 2,  name: "第二季度"},
+        { id: 3, name: "第三季度"},
+        { id: 4, name: "第四季度"}
+       ],
+       quartype:1,
+       radio:1,
+       showtime:true,
+       showquarty:false,
+       startYear:moment(new Date()).endOf('month').subtract('month', +1).endOf('month').format("YYYY-MM-DD") ,
+       start_date: moment(new Date()).startOf("month").format("YYYY-MM-DD"),
+       end_date: moment(new Date()).endOf('month').format("YYYY-MM-DD"),
+       summaryList:[],
+       planList:[],
+       tableList:[],
+       projectList:[],
+       inspectionList:[],
       }
     },
     created() {
@@ -496,7 +699,8 @@
       
      this.getAllDoctorList()
      this.getlist()
-    
+     this.getInspectionMajor()
+     this.getInitDataList()
     },
     methods: {
       getTime(val) {
@@ -538,6 +742,22 @@
           this.getFirstDetail(row.id)
         }
       },
+      changeCurrentRecord(val){
+        this.tableData = []
+        this.getInspectionDetai(val)
+      },
+      selectionChangeOne(val){
+        this.getInspectionItemList(val)
+      },
+      getInspectionItemList(val){
+        this.projectList = []
+        this.inspectDataList = []
+       for(let i=0;i<val.length;i++){
+        this.projectList.push(val[i].project_id)
+        this.inspectDataList.push(val[i].inspect_date)
+       }
+
+      },
       selectSummary(row){
         var arr = []
         for(let i=0;i<row.length;i++){
@@ -582,6 +802,9 @@
           treatment_plan:this.$refs.editorFive.content,
           record_date:this.form.record_date,
           doctor:this.form.doctor,
+          project_id:this.projectStr,
+          inspect_date:this.projectIndate,
+         
          }
          console.log("params",params)
         
@@ -638,8 +861,12 @@
         getFirstDetail(id).then(response=>{
            if(response.data.state == 1){
              var detail = response.data.data.detail
-            
              this.hosDetail = detail
+             var inspectlist = response.data.data.inspectlist
+             let arr = this.unique(inspectlist,'project_name')
+             this.hosDetail.template_inspection_content = arr
+            
+             console.log("内容233323232323223",this.hosDetail)
            }
         })
       },
@@ -648,10 +875,14 @@
            if(response.data.state == 1){
              var detail = response.data.data.detail
              console.log("detial------",detail)
+              var inspectlist =  response.data.data.inspectlist
+              let arr = this.unique(inspectlist,'project_name')
+              this.form.patient_case_one = arr
              if(detail.doctor == 0){
                this.form.doctor = ""
              }
              this.form.id = detail.id
+             this.form.detai_id = detail.id
              this.form.title = detail.title
              this.form.record_date = this.getTimeOne(detail.record_date)
              this.form.doctor = detail.doctor
@@ -661,6 +892,8 @@
              this.form.diagnostic_basis = detail.diagnostic_basis
              this.form.differential_diagnosis = detail.differential_diagnosis
              this.form.treatment_plan =detail.treatment_plan
+             this.projectStr = detail.project_id
+             this.projectIndate = detail.inspect_date
              this.edit_show_dialog = true
            }
         })
@@ -720,7 +953,7 @@
          }
       
          var params = {
-          id:this.form.id,
+          id:this.form.detai_id,
           patient_id:parseInt(this.patient_id),
           title:this.form.title,
           doctor:this.form.doctor,
@@ -731,8 +964,11 @@
           diagnostic_basis:diagnostic_basis,
           differential_diagnosis:differential_diagnosis,
           treatment_plan:treatment_plan,
+          project_id:this.projectStr,
+          inspect_date:this.projectIndate,
          }
          console.log("poarams2323322323",params)
+         
         updateFirstDisease(params).then(response=>{
           if(response.data.state == 1){
             var detail = response.data.data.detail
@@ -778,7 +1014,188 @@
         
         this.show_dialog = true
       },
-     
+      toInspection(){
+       this.dialogVisibleInspection = true
+      },
+      changeRadio(val){
+       if(val == 1){
+         this.showtime = true
+         this.showquarty = false
+         this.getInspectionMajor()
+       }
+       if(val == 2){
+         this.showquarty = true
+         this.showtime = false
+         this.getInspectionMajor()
+       }
+     },
+        //获取大项数据来源
+      getInspectionMajor(){
+        var start_time = ""
+        var end_time = ""
+        console.log("radio2332322332",this.radio)
+        if(this.radio == 1){
+          console.log("start_year",this.startYear)
+          console.log("endyaer",this.lastYear)
+          end_time = this.startYear
+          start_time = this.lastYear
+        }
+        if(this.radio == 2){
+          if(this.quartype == 1){
+            start_time =  moment().startOf('year').format('YYYY-MM-DD')
+            end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
+          }
+          if(this.quartype == 2){
+            start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")
+            end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
+          }
+          if(this.quartype == 3){
+            start_time = moment().month(6).startOf('month').format("YYYY-MM-DD")
+            end_time = moment().month(8).endOf('month').format("YYYY-MM-DD")
+          }
+          if(this.quartype == 4){
+            start_time = moment().month(9).startOf('month').format("YYYY-MM-DD")
+            end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
+          }
+        }
+
+
+          console.log("start_time",start_time)
+          console.log("end_time",end_time)
+          var params = {
+            other_start_time:end_time,
+            patient_id:this.patient_id,
+            last_time:start_time,
+          }
+         console.log("开始数据",params)
+        getInspectionMajorItem(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("列表23232232323",list)
+            // this.$refs.single_table.setCurrentRow(list[0])
+            this.tableList = list
+
+          }
+        })
+      },
+      //获取小项的值
+      getInspectionDetai(val){
+        console.log("val2332232",val)
+        var params = {
+          project_id:val.project_id,
+          patient_id:val.patient_id,
+          inspect_date:val.inspect_date,
+        }
+        // console.log("param2233233223",params)
+       getInspectionDetail(params).then(response=>{
+          if(response.data.state ==1){
+            var list = response.data.data.list
+            // console.log("详情222",list)
+
+            this.tableData = list
+          }
+       })
+      },
+      getInitDataList(){
+        var params={
+          start_year:this.getTime(this.form.start_year),
+          start_month:this.getTime(this.form.start_month),
+          quarter:this.form.quarter,
+          patient_id:this.patient_id,
+          start_time:this.start_date,
+          end_time:this.end_date,
+        }
+        getInitDataList(params).then(response=>{
+          if(response.data.state == 1){
+           
+             var modelist = response.data.data.modelist
+             console.log("modelist",modelist)
+             var docList = response.data.data.docList
+            //  console.log("doctlist",docList)
+             this.docList = docList
+             var summaryList = response.data.data.summaryList
+            //  console.log("summaryList",summaryList)
+             this.summaryList = summaryList
+             var planList = response.data.data.planList
+            //  console.log("planlist",planList)
+             this.planList = planList
+          }
+       })
+      },
+      changeYear(val){
+        if(val == "2021-02"){
+          this.startYear = val+"-" + "28"
+        }else if(val == "2021-08"){
+          this.startYear = val+"-" + "31"
+        }else if(val == "2021-10"){
+          this.startYear = val+"-" + "31"
+        }else if(val == "2021-12"){
+          this.startYear = val+"-" + "31"
+        }else{
+          this.startYear = val+"-" + "30"
+        }
+
+        this.lastYear = val+"-"+"01"
+        this.getInspectionMajor()
+      },
+      selectSummary(val){
+        console.log("val23232",val)
+        var arr = []
+        for( let i=0;i<val.length;i++){
+           arr.push(val[i].id)
+        }
+
+        var str = arr.join(",")
+       console.log("str",str)
+       this.ids = str
+      },
+      toContent(){
+        var str = this.projectList.join(",")
+        this.projectStr = str
+        var inspe_date = this.inspectDataList.join(",")
+        this.projectIndate = inspe_date
+        var params = {
+          ids:str,
+          inspect_date:inspe_date,
+          patient_id:this.patient_id,
+        }
+        getInspectionItemList(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+           let arr = this.unique(list,'project_name')
+         
+           this.form.patient_case_one = arr
+           this.dialogVisibleInspection = false
+          
+           console.log("2323232owowowowowow",this.form.id)
+          }
+        })
+     },
+     unique(data, key) {
+        let lastData = [];
+        data.forEach(item => {
+          let status = lastData.some(project_name => project_name[key] == item[key]);
+          if (!status) {
+            let obj = {
+              project_name:'',
+              arr:[]
+            }
+            obj.project_name = item.project_name
+            obj.arr.push(item);
+            lastData.push(obj);
+          } else {
+            lastData.forEach((project_name, index) => {
+              if (project_name[key] === item[key]) {
+                project_name.arr.push(item);
+              }
+            });
+          }
+        });
+        return lastData;
+      },
+      changetype(){
+        this.getInspectionMajor()
+      },
     },
     watch: {
       tableData: function() {

src/xt_pages/user/firstDiseasePrint.vue

@@ -23,9 +23,24 @@
 
             <div class="inline_block" style="width:100%;">
                <span style="font-size:20px">病例特点：</span>
-                <div v-html="hosDetail.patient_case" class="printP" style="text-indent:20px">
-
-              </div>
+                <div v-html="hosDetail.patient_case" class="printP" style="text-indent:20px"></div>
+                <div class="borderBox">
+                  <div v-for="item in hosDetail.template_inspection_content">
+                    <p>{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
+                    <div style="display:flex;flex-wrap: wrap;">
+                      <div v-for="it in item.arr" style="width:33%;margin-bottom:10px;">
+                        {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
+                        {{it.inspect_value}}
+                        <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
+                        ↓
+                        </span> 
+                        <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
+                          ↑
+                        </span> 
+                      </div>
+                    </div>
+                  </div>
+                </div> 
             </div>
 
              <div class="inline_block" style="width:100%;">
@@ -155,8 +170,11 @@ export default {
        getFirstDetail(id).then(response=>{
         if(response.data.state == 1){
             var detail = response.data.data.detail
-        
             this.hosDetail = detail
+            var inspectlist = response.data.data.inspectlist
+             let arr = this.unique(inspectlist,'project_name')
+             this.hosDetail.template_inspection_content = arr
+          
         }
      })
     },
@@ -243,6 +261,28 @@ export default {
         return ''
       }
     },
+    unique(data, key) {
+      let lastData = [];
+      data.forEach(item => {
+        let status = lastData.some(project_name => project_name[key] == item[key]);
+        if (!status) {
+          let obj = {
+            project_name:'',
+            arr:[]
+          }
+          obj.project_name = item.project_name
+          obj.arr.push(item);
+          lastData.push(obj);
+        } else {
+          lastData.forEach((project_name, index) => {
+            if (project_name[key] === item[key]) {
+              project_name.arr.push(item);
+            }
+          });
+        }
+      });
+      return lastData;
+    },
   },
  
   created() {

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -14,7 +14,7 @@
             <td style="text-align:center;width:200px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:200px" colspan="1">
+             <td style="text-align:center;width:250px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
@@ -28,7 +28,7 @@
                 <span v-if="patient.gender == 2">女</span>
               </span>
             </td>
-            <td style="text-align:center;width:100px" colspan="1">
+            <td style="text-align:center;width:150px" colspan="1">
               年龄:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
@@ -36,7 +36,7 @@
                  {{getNewAge(patient.id_card_no)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px" colspan="1">
+            <td style="text-align:center;width:150px" colspan="1">
               婚姻:
             </td>
              <td style="text-align:center;width:100px" colspan="1">
@@ -48,10 +48,10 @@
                  <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;width:200px" colspan="1">
+             <td style="text-align:center;width:150px" colspan="1">
               职业: 
             </td>
-             <td style="text-align:center;width:100px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="4">
               <span style="display:inline-block;margin-left:10px;">
                {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
@@ -69,18 +69,18 @@
             <td style="text-align:center;width:100px" colspan="1">
               身份证:
             </td>   
-            <td style="text-align:left;width:500px" colspan="12">
+            <td style="text-align:left;width:500px" colspan="15">
             
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.id_card_no}}
               </span>
             </td>   
           </tr>
-          <tr>
+          <tr v-if="org_id!=10440">
             <td style="text-align:center;width:100px" colspan="1">
               住址:
             </td>   
-            <td style="text-align:center;width:500px" colspan="12">
+            <td style="text-align:center;width:500px" colspan="14">
             
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.home_address}}
@@ -88,15 +88,15 @@
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:300px" colspan="1">
+            <td style="text-align:center;width:350px" colspan="1">
               入院时间:
             </td>
-            <td style="text-align:center;width:200px" colspan="2">
+            <td style="text-align:center;width:200px" colspan="4">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.admission_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:250px" colspan="1">
+            <td style="text-align:center;width:350px" colspan="1">
               出院时间:
             </td>
             <td style="text-align:center;width:250px" colspan="3">
@@ -104,7 +104,7 @@
                 {{getTime(hosDetail.discharge_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px"  colspan="2">
+            <td style="text-align:center;width:150px"  colspan="3">
               住院天数:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
@@ -131,7 +131,7 @@
             <td style="text-align:center;width:50px" colspan="1">
               X线:
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.xray}}
               </span>
@@ -152,7 +152,7 @@
                 {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
-             <td style="text-align:center;width:100px" colspan="1">
+             <td style="text-align:center;width:150px" colspan="1">
               超声:
             </td>
              <td style="text-align:center;width:100px" colspan="1">
@@ -160,7 +160,7 @@
                 {{hosDetail.ultrasound}}
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:50px" colspan="3">
               病理:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
@@ -176,7 +176,7 @@
                
               </span>
             </td>   
-            <td style="text-align:center;" colspan="11">
+            <td style="text-align:center;" colspan="14">
               <span style="display:block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.admitting_diagnosis"></span>
               </span>
@@ -186,7 +186,7 @@
             <td style="text-align:center;width:300px" colspan="1">
               出院诊断:
             </td>
-             <td style="text-align:center;" colspan="11">
+             <td style="text-align:center;" colspan="14">
              
               <span style="display:block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.discharge_diagnosis"></span>  
@@ -195,10 +195,10 @@
             
           </tr>
            <tr>
-            <td style="text-align:center;width:300px" colspan="1">
+            <td style="text-align:center;width:350px" colspan="1">
               入院时病情:
             </td>
-           <td colspan="11">
+           <td colspan="14">
             
               <span style="display:block;margin-left:10px;text-align:left;">
                  <span v-html="hosDetail.diagnosis_admission"></span>
@@ -212,7 +212,7 @@
               诊断经过:
            
             </td>
-            <td colspan="11">
+            <td colspan="14">
               <span style="display:block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.treatment"></span> 
               </span>
@@ -220,10 +220,10 @@
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:200px" colspan="1">
               出院时病情:
             </td>
-            <td colspan="11">
+            <td colspan="14">
             
               <span style="display:block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.illness_discharge"></span> 
@@ -236,7 +236,7 @@
             <td style="text-align:center;width:300px" colspan="1">
               出院医嘱:
             </td>
-            <td colspan="11">
+            <td colspan="14">
               <span style="display:block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.discharge_advice"></span> 
               </span>
@@ -244,7 +244,7 @@
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="3">
+            <td style="text-align:center;width:170px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                
               </span>
@@ -252,17 +252,29 @@
             <td style="text-align:center;width:170px" colspan="3">
               上级医师签名:
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:170px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
-                {{getDoctor(hosDetail.dean_id)}}
+                <!-- {{getDoctor(hosDetail.dean_id)}} -->
+                <span v-if="setAdminUserES(hosDetail.dean_id?hosDetail.dean_id:hosDetail.dean_id) == ''">
+                  {{getDoctor(hosDetail.dean_id)}} 
+             </span>
+              <span v-else>
+                <img style="height:30px;" :src="setAdminUserES(hosDetail.dean_id?hosDetail.dean_id:hosDetail.dean_id)" alt="" srcset="">
+              </span>
               </span>
             </td>
-           <td style="text-align:center;width:170px" colspan="2">
+           <td style="text-align:center;width:170px" colspan="3">
               住院医师签名:
             </td>
-             <td style="text-align:center;width:170px" colspan="2">
+             <td style="text-align:center;width:170px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
-                 {{getDoctor(hosDetail.doctor)}}
+                 <!-- {{getDoctor(hosDetail.doctor)}} -->
+                 <span v-if="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor) == ''">
+                  {{getDoctor(hosDetail.doctor)}} 
+             </span>
+              <span v-else>
+                <img style="height:30px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
+              </span>
               </span>
             </td>
           </tr>
@@ -302,6 +314,9 @@ export default {
      patient:{},
      doctorList:[],
     educationOptions:[],
+    org_id:0,
+    operators: [],
+    operatorMaps: {},
     }
   },
   methods: {
@@ -356,6 +371,17 @@ export default {
            if(response.data.state == 1){
              var detail = response.data.data.detail
              this.hosDetail = detail
+             this.operators = response.data.data.operators
+              if (this.operators.length > 0) {
+              var operatorsLen = this.operators.length
+              for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                  this.operatorMaps,
+                  this.operators[index].creator,
+                  this.operators[index]
+                )
+              }
+            }
            }
         })
     },
@@ -401,7 +427,21 @@ export default {
       var count = ""
       count = (end-start)/86400
       return count + 1
-    }
+    },
+    setAdminUserES(id) {
+        
+        if (id === 0) {
+          return ''
+        }
+        if (id in this.operatorMaps) {
+          
+          return this.operatorMaps[id].url
+         
+        } else {
+          return ''
+        }
+        
+     },
   },
  
   created() {
@@ -412,6 +452,7 @@ export default {
     this.getlist()
     this.getHospitalSummaryDetail(id)
     this.getAllDoctorList()
+    this.org_id = this.$store.getters.xt_user.org.id
     
   }
 }

src/xt_pages/workforce/components/editTableData.vue

@@ -3820,7 +3820,7 @@ export default {
         this.$refs.table.doLayout();
       });
 
-      if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
+   
 
       // if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
 
@@ -4441,7 +4441,7 @@ export default {
 
       // if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877 && this.$store.getters.xt_user.template_info.org_id != 10340){
       //   return sums;
-      // }
+     
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       var that = this;
@@ -4921,7 +4921,7 @@ export default {
     },
     // 双击有内容的单元格
     dblclickThis(row, column, cell, event){
-      this.msDialogVisible=true
+     
       var week = this.weekDay(column.property);
       if (week[0] == -1 || week[1] == -1) {
         return false;
@@ -4945,7 +4945,7 @@ export default {
         this.currentData.patient = row[column.property].patient;
         this.currentData.contagions = row[column.property].patient_contagions;
         this.tiaoZhengType = 1;
-
+        this.msDialogVisible=true
       }
     },
 

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -168,7 +168,7 @@
           <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
-          <span v-if="scope.row.dialysissolution.anticoagulant === 8">伊诺肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 8">依诺肝素</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 11">那屈肝素</span>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -255,7 +255,7 @@
                     <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
-                    <span v-if="scope.row.dialysissolution.anticoagulant === 8">伊诺肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 8">依诺肝素</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 11">那屈肝素</span>

src/xt_pages/workforce/editTableData.vue

@@ -3772,7 +3772,7 @@ export default {
         this.$refs.table.doLayout();
       });
       
-      if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
+
 
         //表格某列全部数据
         var Mon_M = []
@@ -4387,11 +4387,10 @@ export default {
       }
       sums[22]="总人数:"+ sums[22] +"\n"+result
             return sums;
-      }
+      
 
-      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877 && this.$store.getters.xt_user.template_info.org_id != 10340){
-        return sums;
-      }
+     
+      
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       var that = this;