增加机构 体检人类型参数

Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php

@@ -137,6 +137,7 @@ class AppointmentController extends Controller
         $list=$list
             ->where([['a.is_del','=',0],['a.created_at','>=',$searchInfo['start']],['a.created_at','<=',$searchInfo['end']]])
             ->groupBy('a.org_code','b.org_name')
+            ->orderBy('count','desc')
             ->get();
         return \Yz::Return(true,'查询成功',['list'=>$list,'dateRange'=>[$searchInfo['start'],$searchInfo['end']]]);
     }

Laravel/app/Http/Controllers/API/Admin/YeWu/InstitutionController.php

@@ -53,6 +53,7 @@ class InstitutionController extends Controller
                         'bind_unit_id'=>$item['bind_unit_id'],
                         'bind_group_id'=>$item['bind_group_id'],
                         'bind_batch_id'=>$item['bind_batch_id'],
+                       'bind_user_type'=>$item['bind_user_type'],
                         'enable_yuyue'=>$item['enable_yuyue'],
                     ]);
                    if($i1) $i1_count++;
@@ -67,6 +68,7 @@ class InstitutionController extends Controller
                         'bind_unit_id'=>$item['bind_unit_id'],
                         'bind_group_id'=>$item['bind_group_id'],
                         'bind_batch_id'=>$item['bind_batch_id'],
+                        'bind_user_type'=>$item['bind_user_type'],
                         'enable_yuyue'=>$item['enable_yuyue'],
                     ]);
                     if($i2) $i2_count++;

Laravel/app/Services/mH5/PersonService.php

@@ -110,16 +110,17 @@ class PersonService
             return \Yz::echoError1('调用HSM加密失败');
         }
         $arr['id_num']=$HSM_sfz['data'];
-
         $cha = DB::select("SELECT a.*,b.sex,b.tel,b.status,c.org_name from  appointment_record as a INNER JOIN
     persons as b on a.person_id=b.id INNER JOIN medical_institution as c on a.org_id=c.id   where a.id_card_num=?
     and a.status in (1,2) and is_del=0",[$arr['id_num']]);
 
-
+//dd($cha);
         if(count($cha)>0){
+
             //HSM解密
             $HSM_tel =\App\Lib\HSM::HsmDecrypt($cha[0]->tel);
-            if($HSM_sfz['status']!=true){
+
+            if($HSM_tel['status']!=true){
                 return \Yz::echoError1('调用HSM解密失败');
             }
             $cha[0]->tel=$HSM_tel['data'];
@@ -142,6 +143,7 @@ class PersonService
                 $cha[0]->bind_unit_id=$org_seting->bind_unit_id;
                 $cha[0]->bind_group_id=$org_seting->bind_group_id;
                 $cha[0]->bind_batch_id=$org_seting->bind_batch_id;
+                $cha[0]->bind_user_type=$org_seting->bind_user_type;
             }
             $cha_img =DB::table('appointment_img')->where('appointment_record_id',$cha[0]->id)->get();
            //env('APP_URL')

el-admin/src/views/MedicalCenter/Dashboard.vue

@@ -111,7 +111,16 @@
 		  title: {
 		    text: resdata.dateRange[0].substr(0,10)+'~'+resdata.dateRange[1].substr(0,10)+'体检数量统计'
 		  },
-		  tooltip: {},
+		  tooltip: {
+			  trigger:'axis',
+			  axisPointer:{
+				  type:'shadow',
+				  shadowStyle:{
+					  color:'rgba(74,211,164,0.15)',
+					  width:"1"
+				  }
+			  }
+		  },
 		  xAxis: {
 		    data: jigou_list
 		  },
@@ -139,7 +148,16 @@
 		  title: {
 		    text: resdata.dateRange[0].substr(0,7)+'~'+resdata.dateRange[1].substr(0,7)+'体检数量走势'
 		  },
-		  tooltip: {},
+		  tooltip: {
+		  			  trigger:'axis',
+		  			  axisPointer:{
+		  				  type:'shadow',
+		  				  shadowStyle:{
+		  					  color:'rgba(74,211,164,0.15)',
+		  					  width:"1"
+		  				  }
+		  			  }
+		  },
 		  xAxis: {
 		    data: month_list
 		  },

el-admin/src/views/SystemMngr/Institution/InstitutionMngr.vue

@@ -66,6 +66,9 @@
 								<el-form-item class="bindinput" label="绑定批次id:">
 									<el-input v-model="SetingInfo.laonianren_mf.fenlei[index].bind_batch_id" />
 								</el-form-item>
+								<el-form-item class="bindinput" label="绑定体检用户类型:">
+									<el-input v-model="SetingInfo.laonianren_mf.fenlei[index].bind_user_type" />
+								</el-form-item>
 							</div>
 						</div>
 
@@ -97,6 +100,9 @@
 									<el-form-item class="bindinput" label="绑定批次id:">
 										<el-input v-model="SetingInfo.jiankangzheng_mf.fenlei[index].bind_batch_id" />
 									</el-form-item>
+									<el-form-item class="bindinput" label="绑定体检用户类型:">
+										<el-input v-model="SetingInfo.jiankangzheng_mf.fenlei[index].bind_user_type" />
+									</el-form-item>
 								</div>
 
 							</div>
@@ -180,7 +186,8 @@
 				bind_check_type: '',
 				bind_unit_id: '',
 				bind_group_id: '',
-				bind_batch_id:''
+				bind_batch_id:'',
+				bind_user_type:'',
 			}]
 		},
 		jiankangzheng_mf: {
@@ -190,35 +197,40 @@
 				bind_check_type: '',
 				bind_unit_id: '',
 				bind_group_id: '',
-				bind_batch_id:''
+				bind_batch_id:'',
+				bind_user_type:'',
 			}, {
 				enable_yuyue: 0,
 				name: '化妆品类',
 				bind_check_type: '',
 				bind_unit_id: '',
 				bind_group_id: '',
-				bind_batch_id:''
+				bind_batch_id:'',
+				bind_user_type:'',
 			}, {
 				enable_yuyue: 0,
 				name: '公共场所类',
 				bind_check_type: '',
 				bind_unit_id: '',
 				bind_group_id: '',
-				bind_batch_id:''
+				bind_batch_id:'',
+				bind_user_type:'',
 			}, {
 				enable_yuyue: 0,
 				name: '生活饮用水类',
 				bind_check_type: '',
 				bind_unit_id: '',
 				bind_group_id: '',
-				bind_batch_id:''
+				bind_batch_id:'',
+				bind_user_type:'',
 			}, {
 				enable_yuyue: 0,
 				name: '消毒产品生产类',
 				bind_check_type: '',
 				bind_unit_id: '',
 				bind_group_id: '',
-				bind_batch_id:''
+				bind_batch_id:'',
+				bind_user_type:'',
 			}]
 		},
 	})