生物防控人员

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseProcessMapper.xml

@@ -26,10 +26,11 @@
    SELECT NULL AS qualified_date,NULL AS pass_user_name, NULL AS pcr_type, process_id ,id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL AS isolate_end_date ,3  AS `type` ,NULL AS isolate_day_num FROM  `bill_dry`
     UNION
 
-   SELECT  NULL AS qualified_date,NULL AS pass_user_name,  NULL AS pcr_type, process_id ,id,farm_id,admission_user_id , isolate_location AS test_location,
+    SELECT  NULL AS qualified_date,NULL AS pass_user_name,  NULL AS pcr_type, process_id ,id,farm_id,admission_user_id , isolate_location AS test_location,
    isolate_start_date AS check_date ,
-   isolate_end_date ,
-   isolate_end_date AS test_location_id  ,bill_status, isolate_day_num,
+   isolate_location_id AS test_location_id  ,
+   bill_status,
+      isolate_end_date , isolate_day_num,
   4 AS `type`
     FROM  `bill_isolate`) a  where  a.process_id  = #{processId} and test_location_id  = #{locationId} order by a.check_date desc