Setup PETL with jobs "diagnosis," "services," and "visit" #28

mhuamani98 · 2021-07-14T17:34:54Z

No description provided.

mogoodrich · 2021-07-14T17:40:40Z

@MiguelAHPpih was this PR supposed to just have the PETL reports in it? It seems to have a bunch of other stuff as well.

mhuamani98 · 2021-07-14T17:43:29Z

@mogoodrich It should be only about petl, but looks like it merged with the sample-collection branch. This was unexpected.

mogoodrich · 2021-07-14T19:41:29Z

Ah... is the sample-collection branch something we want to merge as well, or does the PR need to be reworked?

brandones · 2021-07-14T21:27:30Z

You can git rebase -i origin/master to just select the commits you want to include. And then git push --force this branch (since we will have rewritten its history).

mhuamani98 · 2021-07-14T21:27:35Z

I'm going to clear any issues it has and then merge it, if that's okay with you.
PD: Have you got any errors while loading the seslab.csv file again? Because in that PR you mentioned that it happened.

brandones · 2021-07-14T21:31:16Z

Sure, that's fine.

Me? I don't remember, can you link to the PR you're talking about?

mhuamani98 · 2021-07-14T21:33:25Z

I was refering to @mogoodrich , since he mentioned it in the sample-collection PR #26

brandones · 2021-07-14T21:39:28Z

Oh yeah, right, we already have a PR for that, and there are a bunch of JavaScript issues we were talking about there: #26 . It would be great if we could deal with that separately from all this PETL stuff.

brandones · 2021-07-16T17:22:14Z

@MiguelAHPpih If you just git rebase to get rid of the sample-collection commits, I think we can go ahead and merge this

brandones · 2021-07-21T16:49:23Z

@MiguelAHPpih Now this branch is deleting files, while master is editing those same files, causing conflicts.

Instead of deleting those files, you can git checkout master [path/to/file] to reset them to whatever's in master (make sure master is up to date). Or you can git rebase -i master.

configuration/pih/petl/jobs/general/visit/source.sql

mhuamani98 · 2021-07-21T23:51:53Z

@brandones All done!. Thanks for the help

configuration/pih/petl/jobs/general/diagnosis/source.sql

brandones · 2021-07-22T17:32:47Z

configuration/pih/petl/jobs/general/diagnosis/source.sql

+(count(encounter_type)/(WEEK(MAX(encounter_datetime)) - WEEK(MIN(encounter_datetime))+1)) as frecuencia_mes,
+(count(encounter_type)/(MONTH(MAX(encounter_datetime))-MONTH(MIN(encounter_datetime))+1)) as frecuencia_mes,
+(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 01 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,
+(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 12 AND 23 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 ) as frecuencia_tarde


Tal vez queriras excluyir 00:00 y 23:59, que son horas associadas con encuentros sin hora exacto

Incluyo las 24 horas para contar todos los encuentros que se hayan hecho, ya que por motivos de red algunas citas puede que no se registren ese mismo día en que se realizo el registro y tenga que hacerlo el siguiente.
No se si eso te parece correcto.

brandones · 2021-07-22T17:33:13Z

configuration/pih/petl/jobs/general/diagnosis/source.sql

+select 'tuberculosis',(count(encounter_type))/251 as frecuencia_dia,
+(count(encounter_type)/(WEEK(MAX(encounter_datetime)) - WEEK(MIN(encounter_datetime))+1)) as frecuencia_mes,
+(count(encounter_type)/(MONTH(MAX(encounter_datetime))-MONTH(MIN(encounter_datetime))+1)) as frecuencia_mes,
+(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 01 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,


Suggested change

(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 01 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,

(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 00 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,

no? Para la hora despues de medianoche?

configuration/pih/petl/jobs/general/services/source.sql

brandones · 2021-07-22T17:40:05Z

configuration/pih/petl/jobs/general/diagnosis/source.sql

+(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 01 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,
+(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 12 AND 23 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 ) as frecuencia_tarde
+from encounter
+where encounter_type=@tb_general and YEAR(encounter_datetime) = @YEAR;


El calculacion que quieres es para este año del calendario?

En este caso, debes adaptar el numero de dias de trabajo (251) para ser el numero aproximo de estos dias que han pasado, no? Algo como DATEDIFF(NOW(), YEAR(NOW) + "-1-1") / 365 * 251?

O quieres calcular por los ultimos 365 dias?

Que hace el "-1-1"(puedes explicarlo en ingles para mayor precisión)?
PD: Gracias por el tip, la idea era al principio esa pero no encontré un modo de aplicarla en el momento..

YEAR(NOW) + "-1-1" debe producir 2021-1-1, la fecha.

¿Se supone que arroja un null en lugar de un decimal o un integer ?. Además, ejecutar YEAR (NOW) +" -1-1 ", muestra solo el año 2020 en lugar del formato de fecha completo y el año correcto. Quizás sería mejor dejarlo con "2021-01-01" por ahora.¿?

Oh noooo, SQL es un fracaso. Hace CONCAT(YEAR(NOW()), '-01-01')

brandones · 2021-07-22T17:41:23Z

@MiguelAHPpih Hay unos errores y unas preguntas.

Co-authored-by: Brandon Istenes <[email protected]>

brandones · 2021-07-27T16:37:32Z

configuration/pih/petl/jobs/general/diagnosis/source.sql

+select 'covid',(count(encounter_type))/@diaslaborales as frecuencia_dia,
+(count(encounter_type)/(WEEK(MAX(encounter_datetime)) - WEEK(MIN(encounter_datetime))+1)) as frecuencia_semana,
+(count(encounter_type)/(MONTH(MAX(encounter_datetime))-MONTH(MIN(encounter_datetime))+1)) as frecuencia_mes,
+(select count(encounter_type)/@diaslaborales from encounter where HOUR (encounter_datetime) BETWEEN 01 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,


We're still missing the hour after midnight, from 0:00 to 0:59. But you might want to just do 0:01 to 0:59 to exclude dates with no actual time associated with them.

configuration/pih/petl/jobs/general/diagnosis/source.sql

Co-authored-by: Brandon Istenes <[email protected]>

brandones

Looks great @MiguelAHPpih , thanks!

mhuamani98 requested a review from mogoodrich July 14, 2021 17:34

petl folder strucutre plus jobs

986b4c1

mhuamani98 force-pushed the peru-petl branch from a1969d9 to 986b4c1 Compare July 21, 2021 22:17

brandones reviewed Jul 21, 2021

View reviewed changes

configuration/pih/petl/jobs/general/visit/source.sql Outdated Show resolved Hide resolved

mhuamani98 added 3 commits July 21, 2021 18:39

Update source.sql

10c2d20

Update source.sql

ad2d47f

Update source.sql

ab62caa

brandones reviewed Jul 22, 2021

View reviewed changes

configuration/pih/petl/jobs/general/diagnosis/source.sql Outdated Show resolved Hide resolved

brandones reviewed Jul 22, 2021

View reviewed changes

configuration/pih/petl/jobs/general/diagnosis/source.sql Outdated Show resolved Hide resolved

brandones reviewed Jul 22, 2021

View reviewed changes

configuration/pih/petl/jobs/general/diagnosis/source.sql Outdated Show resolved Hide resolved

brandones reviewed Jul 22, 2021

View reviewed changes

configuration/pih/petl/jobs/general/services/source.sql Outdated Show resolved Hide resolved

brandones reviewed Jul 22, 2021

View reviewed changes

mhuamani98 and others added 4 commits July 22, 2021 15:09

Update configuration/pih/petl/jobs/general/diagnosis/source.sql

fdd4f68

Co-authored-by: Brandon Istenes <[email protected]>

Update configuration/pih/petl/jobs/general/diagnosis/source.sql

834258c

Co-authored-by: Brandon Istenes <[email protected]>

Update configuration/pih/petl/jobs/general/diagnosis/source.sql

56c0f76

Co-authored-by: Brandon Istenes <[email protected]>

Update configuration/pih/petl/jobs/general/services/source.sql

5078ea7

Co-authored-by: Brandon Istenes <[email protected]>

mhuamani98 added 3 commits July 26, 2021 23:01

Added Working days

f1f40b9

Added working days

ef74cde

Added working days

219658e

brandones reviewed Jul 27, 2021

View reviewed changes

mhuamani98 added 3 commits July 27, 2021 13:35

Update source.sql

a66ea16

Update source.sql

7f6f3b6

Update source.sql

7749080

brandones reviewed Jul 27, 2021

View reviewed changes

configuration/pih/petl/jobs/general/diagnosis/source.sql Outdated Show resolved Hide resolved

mhuamani98 and others added 4 commits July 27, 2021 17:11

Update configuration/pih/petl/jobs/general/diagnosis/source.sql

a357d99

Co-authored-by: Brandon Istenes <[email protected]>

Update source.sql

c96a37e

Update source.sql

3ebf7b9

Update source.sql

8be5ea5

brandones approved these changes Jul 28, 2021

View reviewed changes

brandones changed the title ~~Peru petl~~ Setup PETL with jobs "diagnosis," "services," and "visit" Jul 28, 2021

brandones merged commit a55712b into master Jul 28, 2021

brandones deleted the peru-petl branch July 28, 2021 00:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Setup PETL with jobs "diagnosis," "services," and "visit" #28

Setup PETL with jobs "diagnosis," "services," and "visit" #28

mhuamani98 commented Jul 14, 2021

mogoodrich commented Jul 14, 2021

mhuamani98 commented Jul 14, 2021

mogoodrich commented Jul 14, 2021

brandones commented Jul 14, 2021

mhuamani98 commented Jul 14, 2021

brandones commented Jul 14, 2021

mhuamani98 commented Jul 14, 2021

brandones commented Jul 14, 2021

brandones commented Jul 16, 2021

brandones commented Jul 21, 2021

mhuamani98 commented Jul 21, 2021

brandones Jul 22, 2021

mhuamani98 Jul 26, 2021

brandones Jul 22, 2021

brandones Jul 22, 2021

mhuamani98 Jul 26, 2021

brandones Jul 26, 2021

mhuamani98 Jul 27, 2021

brandones Jul 27, 2021

mhuamani98 Jul 27, 2021

brandones commented Jul 22, 2021

brandones Jul 27, 2021

brandones left a comment

	(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 01 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,
	(select count(encounter_type)/251 from encounter where HOUR (encounter_datetime) BETWEEN 00 AND 11 AND MINUTE (encounter_datetime) BETWEEN 00 AND 59 )as frecuencia_manana,

Setup PETL with jobs "diagnosis," "services," and "visit" #28

Setup PETL with jobs "diagnosis," "services," and "visit" #28

Conversation

mhuamani98 commented Jul 14, 2021

mogoodrich commented Jul 14, 2021

mhuamani98 commented Jul 14, 2021

mogoodrich commented Jul 14, 2021

brandones commented Jul 14, 2021

mhuamani98 commented Jul 14, 2021

brandones commented Jul 14, 2021

mhuamani98 commented Jul 14, 2021

brandones commented Jul 14, 2021

brandones commented Jul 16, 2021

brandones commented Jul 21, 2021

mhuamani98 commented Jul 21, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brandones commented Jul 22, 2021

Choose a reason for hiding this comment

brandones left a comment

Choose a reason for hiding this comment