提交代码

src/xt_pages/Dialysisanalysis/albumin/albuminall.vue

           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
+
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",

src/xt_pages/Dialysisanalysis/bloodPhosphorus/phosphorusall.vue

           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
+
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",

src/xt_pages/Dialysisanalysis/bloodPotassium/potassiumall.vue

           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",

src/xt_pages/Dialysisanalysis/calcium/calciumall.vue

         if (response.data.state == 1) {
           this.reference = response.data.data.reference
 
-          this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
+          this.input = response.data.data.reference.range_min + "<=" + "钙" + "<=" + response.data.data.reference.range_max
           let objone = {
             value:  response.data.data.unusual_total / response.data.data.patient_count,
             name: '不达标值患者',
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
           }
+
           this.pieData.push(objthree)
           this.tableData.push(objthree)
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
+
+
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",

src/xt_pages/Dialysisanalysis/hemoglobin/hemoglobinall.vue

         </el-table-column>
       </el-table>
     </div>
+    <el-dialog
+      width="1000px" class="registerDialog" :visible.sync="detailVisibility"
+      :close-on-click-modal="isClose"
+      :close-on-press-escape="isClose"
+    >
+      <el-row :gutter="25">
+        <el-col :span="5">
+          <div class="block">
+            <span>查询时间:</span>
+            <el-select size="small" v-model="time_type_two" placeholder="请选择"
+                       style="width:100px;margin-left:5px;" @change="changeItemTwo">
+              <el-option
+                v-for="item,index in times"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+        <el-col :span="10">
+          <div>
+            <el-date-picker
+              style="width: 120px"
+              v-model="start_time_one"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+
+              placeholder="选择日期">
+            </el-date-picker>
+            <span>-</span>
+            <el-date-picker
+              style="width: 120px"
+              v-model="end_time_one"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </div>
+        </el-col>
+
+        <el-col :span="4">
+          <div>
+
+            <el-select size="small" v-model="statistics_type" placeholder="请选择"
+                       style="width:100px;margin-left:5px;">
+              <el-option
+                v-for="item,index in statistics_types"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+
+          </div>
+        </el-col>
+
+        <!--        <el-col :span="4">-->
+        <!--          <div>-->
+        <!--            <el-select size="small" v-model="sort_type" placeholder="请选择"-->
+        <!--                       style="width:100px;margin-left:5px;">-->
+        <!--              <el-option-->
+        <!--                v-for="item,index in sort_types"-->
+        <!--                :key="index"-->
+        <!--                :label="item.label"-->
+        <!--                :value="item.value">-->
+        <!--              </el-option>-->
+        <!--            </el-select>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+
+        <el-col :span="4">
+          <div >
+            <el-input v-model="keyword" placeholder="请输入患者姓名或透析号"></el-input>
+          </div>
+        </el-col>
+
+        <el-col :span="2">
+          <div>
+            <el-button @click="getDataTwo()">查询</el-button>
+          </div>
+        </el-col>
+
+        <el-col :span="2">
+          <div>
+            <el-button @click="exportAction()">导出</el-button>
+          </div>
+        </el-col>
+
+        <!--        <el-col :span="2">-->
+        <!--          <div>-->
+        <!--            <el-button @click="getDataTwo()">打印</el-button>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+
+
+
+
+
+      </el-row>
+
+      <el-table
+        :data="patientTableData"
+        border
+        ref="table"
+        max-height="500px"
+        style="width: 100%">
+        <el-table-column
+          prop="dialysis_no"
+          align="center"
+          label="透析号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="患者姓名"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          label="检查日期"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="inspect_value"
+          label="结果"
+        >
+        </el-table-column>
+
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detailVisibility = false">取消</el-button>
+        <el-button type="primary" @click="detailVisibility = false">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
+
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",
       return sums
     },
     handleClick(row) {
-      console.log(row)
       if(row.name == "不达标值患者"){
         this.statistics_type = 1
       }else if(row.name == "达标值患者"){

src/xt_pages/Dialysisanalysis/platelets/plateletsall.vue

           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
+
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",

src/xt_pages/Dialysisanalysis/qualitycontrol/totalSstatistics.vue

           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.patient_count / response.data.data.no_check_total,
+            value: response.data.data.no_check_total / response.data.data.patient_count,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
               top: '30%',
               orient: 'vertical'
             },
-            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            color: ['#F74587', '#32D79B', '#6590FF'],
             title: {
               // 设置饼图标题，位置设为顶部居中
               //   text: "国内院士前五省份图示",

src/xt_pages/outpatientCharges/costComparison.vue

                         type="index"
                 >
                 </el-table-column>
+              <el-table-column align="center" prop="name" label="对账日期">
+                <template slot-scope="scope">{{getTimes(scope.row.ctime)}}</template>
+              </el-table-column>
                 <el-table-column align="center" prop="name" label="对账结果">
                     <template slot-scope="scope">{{'平'}}</template>
                 </el-table-column>

src/xt_pages/outpatientTool/labelPrint.vue

 
             </el-table>
 
-<!--          <el-table  :data="tableDataTwo" border :row-style="{ color: '#303133' }" ref="table"-->
-<!--                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
-<!--                    highlight-current-row>-->
-
-<!--            <el-table-column align="center" prop="name" label="患者名字">-->
-<!--              <template slot-scope="scope">{{ scope.row.patient_name }}</template>-->
-<!--            </el-table-column>-->
-
-<!--            <el-table-column align="center" prop="name" label="创建时间">-->
-<!--              <template slot-scope="scope">{{scope.row.record_date)}}</template>-->
-<!--            </el-table-column>-->
-<!--&lt;!&ndash;            <el-table-column align="center" prop="name" label="创建医生">&ndash;&gt;-->
-<!--&lt;!&ndash;              <template slot-scope="scope">{{scope.row.doctor_name}}</template>&ndash;&gt;-->
-<!--&lt;!&ndash;            </el-table-column>&ndash;&gt;-->
-<!--            <el-table-column align="center" prop="name" label="项目名称">-->
-<!--              <template slot-scope="scope">-->
-<!--                <div>{{scope.row.project_name}}</div>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              label="操作"-->
-<!--              width="180"-->
-<!--              class-name="small-padding fixed-width"-->
-<!--            >-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-tooltip class="item" effect="dark" content="打印" placement="top">-->
-<!--                  <el-button-->
-<!--                    type="primary"-->
-<!--                    size="small"-->
-<!--                    icon="el-icon-printer"-->
-<!--                    @click="Print(scope.row, scope.$index)"-->
-<!--                  >-->
-
-<!--                    &lt;!&ndash; icon="el-icon-edit-outline" &ndash;&gt;-->
-<!--                  </el-button>-->
-<!--                </el-tooltip>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-
-
-<!--          </el-table>-->
 
             <el-pagination
               v-if="isShow"
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img style="width:300px;height:200px;margin-left:10px;" id="barcode">
+                          <img  v-if="$store.getters.xt_user.org.id != 0 &&  $store.getters.xt_user.org.id != 10138" style="width:300px;height:200px;margin-left:10px;" id="barcode">
                       </div>
                       <div style="margin-bottom:5px;">{{current_number}}</div>
                       <div style="display:flex;">
-                          <div style="padding-left:20px;">{{current_project_name}}</div>
+                          <div style="font-size:24px;padding-left:20px;">{{current_project_name}}</div>
                           <div style="font-size:24px;margin-left:20px;">{{current_name}}</div>
                       </div>
                   </div>
     },
     methods: {
       printTwo(){
+        if(this.selecting_schs.length == 0){
+          this.$message.error("请选择需要组合打印的记录")
+          return
+        }
         let patient_ids = []
         for(let i = 0; i < this.selecting_schs.length; i++){
           patient_ids.push(this.selecting_schs[i].patient_id)
           this.$message.error("请选择同一患者打印")
           return
         }else{
-          let ids = []
           var name = ""
           var patient_name = ""
           var team_ids = ""
-          var project_ids = ""
-
+          var ids = ""
 
+          var project_ids = ""
           for(let i = 0; i < this.selecting_schs.length; i++){
-            ids.push(this.selecting_schs[i].id)
+            if(ids.length == 0){
+                ids = this.selecting_schs[i].id
+            }else{
+                ids = ids + "," + this.selecting_schs[i].id
+            }
             patient_name = this.selecting_schs[0].patient_name
             if(name.length == 0){
               name = this.selecting_schs[i].project_name
             }else{
               name = name + "," + this.selecting_schs[i].project_name
-
             }
-
             if(team_ids.length == 0){
-              if(this.selecting_schs[i].team_id > 0) {
-                team_ids = this.selecting_schs[i].team_id
+              if(this.selecting_schs[i].item_id > 0) {
+                team_ids = this.selecting_schs[i].item_id
               }
             }else{
-              if(this.selecting_schs[i].team_id > 0) {
-                team_ids = team_ids + "," + this.selecting_schs[i].team_id
+              if(this.selecting_schs[i].item_id > 0) {
+                team_ids = team_ids + "," + this.selecting_schs[i].item_id
               }
             }
 
             if(project_ids.length == 0){
-              if(this.selecting_schs[i].team_id > 0) {
-                project_ids = this.selecting_schs[i].project_ids
+              console.log(this.selecting_schs[i])
+              if(this.selecting_schs[i].item_id == 0) {
+                project_ids = this.selecting_schs[i].project_id
+                console.log(project_ids)
+
               }
             }else{
-              if(this.selecting_schs[i].team_id > 0) {
-                project_ids = project_ids + "," + this.selecting_schs[i].project_ids
+              if(this.selecting_schs[i].item_id == 0) {
+                project_ids = project_ids + "," + this.selecting_schs[i].project_id
+                console.log(project_ids)
+
               }
             }
           }
+          console.log(project_ids)
+
           let params = {
             patient_id: patient_ids[0],
             ids: ids,
                   is_team:0,
                   record_date:this.chargeDate,
                 }
+
                 this.current_params = params
                 console.log(this.current_params)
                 if(!this.current_params.is_combination_print){
                       this.$message.error(response.data.msg)
                       return false
                     } else {
-                      this.current_ctime = row.ctime
-                      this.current_number = row.number
-                      this.current_project_name = row.project_name
-                      this.current_name = row.patient_name
+                      this.current_ctime = response.data.data.hlpsi.ctime
+                      this.current_number = ""
+                      this.current_project_name = name
+                      this.current_name = patient_name
                       this.$nextTick(() => {
                         JsBarcode('#barcode',response.data.data.hlpsi.id, {
                           format: 'CODE39',
                       this.$message.error(response.data.msg)
                       return false
                     } else {
-                      this.current_ctime = row.ctime
-                      this.current_number = row.number
-                      this.current_project_name = row.project_name
-                      this.current_name = row.patient_name
+                      this.current_ctime =  response.data.data.hlpsi.ctime
+                      this.current_number =""
+                      this.current_project_name = name
+                      this.current_name = patient_name
                       this.$nextTick(() => {
                         JsBarcode('#barcode',response.data.data.hlpsi.id, {
                           format: 'CODE39',