|
@@ -718,7 +718,7 @@ export function selectLatestInfoData (
|
|
|
SELECT
|
|
|
pdid,
|
|
|
COUNT(pdid) as photoTotal,
|
|
|
- SUM(CASE WHEN photourl IS NOT NULL THEN 1 ELSE 0 END) as photoCount
|
|
|
+ SUM(CASE WHEN photourl IS NOT NULL and photourl != '' THEN 1 ELSE 0 END) as photoCount
|
|
|
FROM app_task_photo
|
|
|
GROUP BY pdid
|
|
|
) p ON m.pdid = p.pdid
|
|
@@ -726,7 +726,7 @@ export function selectLatestInfoData (
|
|
|
SELECT
|
|
|
pdid,
|
|
|
COUNT(pdid) as keyTotal,
|
|
|
- SUM(CASE WHEN measuredvaluemin IS NOT NULL OR measuredvaluemax IS NOT NULL THEN 1 ELSE 0 END) as keyCount
|
|
|
+ SUM(CASE WHEN (measuredvaluemin IS NOT NULL and measuredvaluemin != '') OR ( measuredvaluemax IS NOT NULL and measuredvaluemax !='' )THEN 1 ELSE 0 END) as keyCount
|
|
|
FROM app_task_keyprocess
|
|
|
GROUP BY pdid
|
|
|
) k ON m.pdid = k.pdid
|
|
@@ -734,7 +734,7 @@ export function selectLatestInfoData (
|
|
|
SELECT
|
|
|
r.pdid,
|
|
|
COUNT(i.sxid) as recordTotal,
|
|
|
- SUM(CASE WHEN i.measuredvalue IS NOT NULL THEN 1 ELSE 0 END) as recordCount
|
|
|
+ SUM(CASE WHEN i.measuredvalue IS NOT NULL and i.measuredvalue != '' THEN 1 ELSE 0 END) as recordCount
|
|
|
FROM app_task_record r
|
|
|
LEFT JOIN app_task_record_item i ON r.sxid = i.psxid
|
|
|
GROUP BY r.pdid
|