pcvolkmer/bzkf-rwdp-check
1
0
Fork 0
mirror of https://github.com/pcvolkmer/bzkf-rwdp-check.git synced 2025-04-19 19:16:51 +00:00
Code Issues Packages Releases Activity

feat: display pat ID and diagnosis date in compare subcommand

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2024-02-28 16:52:45 +01:00
parent 540a7c7048
commit 31d8c9b6b6
3 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli.rs
View File

@ -91,6 +91,8 @@ pub enum SubCommand {
}, },
#[command(about = "Abgleich zwischen CSV-Datei für OPAL und Onkostar-Datenbank")] #[command(about = "Abgleich zwischen CSV-Datei für OPAL und Onkostar-Datenbank")]
Compare { Compare {
#[arg(long, help = "Klartext-Patienten-ID anzeigen")]
pat_id: bool,
#[arg(short = 'D', long, help = "Datenbank-Name", default_value = "onkostar")] #[arg(short = 'D', long, help = "Datenbank-Name", default_value = "onkostar")]
database: String, database: String,
#[arg( #[arg(

2
src/common.rs
View File

@ -32,7 +32,9 @@ pub struct Record {
} }
pub struct DiffRecord { pub struct DiffRecord {
pub pat_id: Option<String>,
pub condition_id: String, pub condition_id: String,
pub diagnosis_date: String,
pub csv_icd10_code: String, pub csv_icd10_code: String,
pub db_icd10_code: String, pub db_icd10_code: String,
} }

85
src/main.rs
View File

@ -156,6 +156,7 @@ fn main() -> Result<(), Box<dyn Error>> {
); );
} }
SubCommand::Compare { SubCommand::Compare {
pat_id,
database, database,
host, host,
password, password,
@ -189,7 +190,7 @@ fn main() -> Result<(), Box<dyn Error>> {
let db = DatabaseSource::new(&database, &host, &password, port, &user); let db = DatabaseSource::new(&database, &host, &password, port, &user);
let db_items = db let db_items = db
.export(&year, false) .export(&year, pat_id)
.map_err(|_e| "Fehler bei Zugriff auf die Datenbank")?; .map_err(|_e| "Fehler bei Zugriff auf die Datenbank")?;
let _ = term.clear_last_lines(1); let _ = term.clear_last_lines(1);
@ -218,7 +219,10 @@ fn main() -> Result<(), Box<dyn Error>> {
.to_string(), .to_string(),
); );
let _ = term.write_line(&format!("{:<64} {:<5}", "Condition-ID", "ICD10")); let _ = term.write_line(&format!(
"{:<64} {:<10} {:<5} {:<5} {}",
"Condition-ID", "Datum", "ICD10", "", "PAT-ID"
));
not_in_csv.sort_by_key(|item| item.condition_id.to_string()); not_in_csv.sort_by_key(|item| item.condition_id.to_string());
@ -227,15 +231,28 @@ fn main() -> Result<(), Box<dyn Error>> {
.for_each(|item| match Check::is_relevant(&item.icd_10_code) { .for_each(|item| match Check::is_relevant(&item.icd_10_code) {
true => { true => {
let _ = term.write_line(&format!( let _ = term.write_line(&format!(
"{} {:<5}", "{:<64} {:<10} {:<5} {:<5} {}",
item.condition_id, item.condition_id,
style(&item.icd_10_code).bold().red() item.diagnosis_date,
style(&item.icd_10_code).bold().red(),
"",
match &item.pat_id {
Some(ref pat_id) => pat_id.to_string(),
_ => "".to_string(),
}
)); ));
} }
false => { false => {
let _ = term.write_line(&format!( let _ = term.write_line(&format!(
"{} {:<5}", "{:<64} {:<10} {:<5} {:<5} {}",
item.condition_id, item.icd_10_code item.condition_id,
item.diagnosis_date,
item.icd_10_code,
"",
match &item.pat_id {
Some(ref pat_id) => pat_id.to_string(),
_ => "".to_string(),
}
)); ));
} }
}); });
@ -261,7 +278,10 @@ fn main() -> Result<(), Box<dyn Error>> {
.to_string(), .to_string(),
); );
let _ = term.write_line(&format!("{:<64} {:<5}", "Condition-ID", "ICD10")); let _ = term.write_line(&format!(
"{:<64} {:<10} {:<5}",
"Condition-ID", "Datum", "ICD10"
));
not_in_db.sort_by_key(|item| item.condition_id.to_string()); not_in_db.sort_by_key(|item| item.condition_id.to_string());
@ -270,42 +290,44 @@ fn main() -> Result<(), Box<dyn Error>> {
.for_each(|item| match Check::is_relevant(&item.icd_10_code) { .for_each(|item| match Check::is_relevant(&item.icd_10_code) {
true => { true => {
let _ = term.write_line(&format!( let _ = term.write_line(&format!(
"{} {:<5}", "{:<64} {:<10} {:<5}",
item.condition_id, item.condition_id,
item.diagnosis_date,
style(&item.icd_10_code).bold().red() style(&item.icd_10_code).bold().red()
)); ));
} }
false => { false => {
let _ = term.write_line(&format!( let _ = term.write_line(&format!(
"{} {:<5}", "{:<64} {:<10} {:<5}",
item.condition_id, item.icd_10_code item.condition_id, item.diagnosis_date, item.icd_10_code
)); ));
} }
}); });
let mut icd10diff = csv_items let mut icd10diff = db_items
.iter() .iter()
.filter(|csv_item| { .filter(|db_item| {
db_items csv_items
.iter() .iter()
.map(|db_item| &db_item.condition_id) .map(|db_item| &db_item.condition_id)
.contains(&csv_item.condition_id) .contains(&db_item.condition_id)
}) })
.filter(|csv_item| { .filter(|db_item| {
!db_items !csv_items
.iter() .iter()
.map(|db_item| format!("{}-{}", db_item.condition_id, db_item.icd_10_code)) .map(|csv_item| {
.contains(&format!( format!("{}-{}", csv_item.condition_id, csv_item.icd_10_code)
"{}-{}",
csv_item.condition_id, csv_item.icd_10_code
))
}) })
.map(|csv_item| DiffRecord { .contains(&format!("{}-{}", db_item.condition_id, db_item.icd_10_code))
condition_id: csv_item.condition_id.to_string(), })
csv_icd10_code: csv_item.icd_10_code.to_string(), .map(|db_item| DiffRecord {
db_icd10_code: db_items pat_id: db_item.pat_id.as_ref().map(|pat_id| pat_id.to_string()),
condition_id: db_item.condition_id.to_string(),
diagnosis_date: db_item.diagnosis_date.to_string(),
csv_icd10_code: db_item.icd_10_code.to_string(),
db_icd10_code: csv_items
.iter() .iter()
.filter(|db_item| db_item.condition_id == csv_item.condition_id) .filter(|csv_item| csv_item.condition_id == db_item.condition_id)
.collect_vec() .collect_vec()
.first() .first()
.unwrap() .unwrap()
@ -326,14 +348,15 @@ fn main() -> Result<(), Box<dyn Error>> {
icd10diff.sort_by_key(|item| item.condition_id.to_string()); icd10diff.sort_by_key(|item| item.condition_id.to_string());
let _ = term.write_line(&format!( let _ = term.write_line(&format!(
"{:<64} {:<5} {:<5}", "{:<64} {:<10} {:<5} {:<5} {}",
"Condition-ID", "CSV", "DB" "Condition-ID", "Datum", "CSV", "DB", "PAT-ID"
)); ));
icd10diff.iter().for_each(|item| { icd10diff.iter().for_each(|item| {
let _ = term.write_line(&format!( let _ = term.write_line(&format!(
"{} {} {}", "{:<64} {:<10} {:<5} {:<5} {}",
item.condition_id, item.condition_id,
item.diagnosis_date,
match Check::is_relevant(&item.csv_icd10_code) { match Check::is_relevant(&item.csv_icd10_code) {
true => style(format!("{:<5}", item.csv_icd10_code)).bold().red(), true => style(format!("{:<5}", item.csv_icd10_code)).bold().red(),
_ => style(format!("{:<5}", item.csv_icd10_code)), _ => style(format!("{:<5}", item.csv_icd10_code)),
@ -341,6 +364,10 @@ fn main() -> Result<(), Box<dyn Error>> {
match Check::is_relevant(&item.db_icd10_code) { match Check::is_relevant(&item.db_icd10_code) {
true => style(format!("{:<5}", item.db_icd10_code)).bold().red(), true => style(format!("{:<5}", item.db_icd10_code)).bold().red(),
_ => style(format!("{:<5}", item.db_icd10_code)), _ => style(format!("{:<5}", item.db_icd10_code)),
},
match &item.pat_id {
Some(ref pat_id) => pat_id.to_string(),
_ => "".to_string(),
} }
)); ));
}); });