cry-klikvet-logic 1.0.261 → 1.0.263

package/.vscode/launch.json

@@ -2,10 +2,10 @@
 	// Use IntelliSense to learn about possible attributes.
 	// Hover to view descriptions of existing attributes.
 	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
+	"version": "2.0.0",
 	"configurations": [
 
-		
+
 		{
 			"type": "node",
 			"request": "launch",
@@ -51,9 +51,10 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "dopisiSerijskeNaNapravi",
-			"program": "${workspaceFolder}/dist/dopisiSerijskeNaNapravi.mjs",
+			"name": "pmzIpdate",
+			"preLaunchTask": "npm: build",
+			"program": "${workspaceFolder}/dist/pmzUpdate.mjs",
 			"pauseForSourceMap": true
-		},
+		}
 	]
 }

package/a.txt

@@ -1,98 +1,6 @@
-starting PMZ update mozirje 2025 - terapije
-postavka.pmzZa,novaVrsta ostalo -> undefined
-dni 2155
-po starosti Govedo pitovno -> Govedo pitovno
-dni 2155
-po starosti Govedo pitovno -> Govedo pitovno
-dni 554
-po starosti Govedo pitovno -> Govedo pitovno
-dni 46
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 2055
-po starosti Govedo pitovno -> Govedo pitovno
-dni 12
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 2058
-po starosti Govedo pitovno -> Govedo pitovno
-dni 89
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 30
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 30
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 122
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 90
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 90
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 1086
-po starosti Govedo pitovno -> Govedo pitovno
-dni 75
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 75
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-dni 630
-po starosti Govedo pitovno -> Govedo pitovno
-dni 3385
-po starosti Govedo pitovno -> Govedo pitovno
-dni 1792
-po starosti Govedo pitovno -> Govedo pitovno
-dni 2510
-po starosti Govedo pitovno -> Govedo pitovno
-dni 328
-po starosti Govedo pitovno<1leto -> Govedo pitovno<1leto
-finished PMZ update mozirje 2025 - terapije: 207/207
-starting PMZ update mozirje 2025 - osemenitevGoveda
-finished PMZ update mozirje 2025 - osemenitevGoveda: 0/0
-starting PMZ update mozirje 2025 - obiski
-finished PMZ update mozirje 2025 - obiski: 0/0
-starting PMZ update mozirje 2025 - racuni
-postavka.pmzZa,novaVrsta ostalo -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta drobnica -> undefined
-postavka.pmzZa,novaVrsta drobnica -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta drobnica -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-postavka.pmzZa,novaVrsta null -> undefined
-finished PMZ update mozirje 2025 - racuni: 251/251
-starting PMZ update mozirje 2025 - dobavnice
-postavka.pmzZa,novaVrsta ostalo -> undefined
-finished PMZ update mozirje 2025 - dobavnice: 137/137
-terapije 207
-osemenitevGoveda 0
-obiski 0
-racuni 251
-dobavnice 137
-collection, written.length terapije 207
-collection, written.length osemenitevGoveda 0
-collection, written.length obiski 0
-collection, written.length racuni 251
-collection, written.length dobavnice 137
-pmzUpdateAllForYear mozirje 2025 errors [
-  'Manjka živalska vrsta za zdravilo CLAVASEPTIN, 250 MG (65f0b9e28d1e6937ccf27513).',
-  'Manjka živalska vrsta za zdravilo CLAVASEPTIN, 50 MG (65f0b9e28d1e6937ccf27514).',
-  'Manjka živalska vrsta za zdravilo CLAVASEPTIN, 500 MG (65f0b9e28d1e6937ccf27512).',
-  'Manjka živalska vrsta za zdravilo CLAVASEPTIN, 62,5 MG (65f0b9e28d1e6937ccf2762a).',
-  'Manjka živalska vrsta za zdravilo CONVENIA SOL.INJ.10 ML (65f0b9e28d1e6937ccf27248).',
-  'Manjka živalska vrsta za zdravilo CYLANIC TBL 250 MG + 62,5 MG ZA PSE (65f0b9e28d1e6937ccf271a1).',
-  'Manjka živalska vrsta za zdravilo CYLANIC TBL 500 MG + 125 MG ZA PSE (65f0b9e28d1e6937ccf271a3).',
-  'Manjka živalska vrsta za zdravilo ENROXIL TBL.FLAVOUR 100*150 MG (65f0b9e28d1e6937ccf2740b).',
-  'Manjka živalska vrsta za zdravilo INFECTOGENTA UNG. 15 GR. (65f0b9e28d1e6937ccf27239).',
-  'Manjka živalska vrsta za zdravilo METROVIS 250 MG.,TBL., PSI IN MAČKE, 100X (667f899cc525d321c2fb77f6).',
-  'Manjka živalska vrsta za zdravilo MITEX, GTT. ZA UHO,PSI IN MAČKE (65f0b9e28d1e6937ccf2758e).',
-  'Manjka živalska vrsta za zdravilo NEPTRA KAPLJICE ZA UHO PSI, 1 ML,10X (66669e6a02fb0b643ef48455).',
-  'Manjka živalska vrsta za zdravilo OPHTOCYCLINE, 10 MG/G., MAST.OKO, 5 GR (666295719734ef2ac0acff35).',
-  'Manjka živalska vrsta za zdravilo TOBRADEX, KAPLJ.ZA OKO, 5 ML (65f0b9e28d1e6937ccf276e7).',
-  'Manjka živalska vrsta za zdravilo TOBREX MAZILO 3,5 GR.0,3 % (65f0b9e28d1e6937ccf271d8).'
-]
+pmzUpdate mozirje 2025 terapije 207
+pmzUpdate mozirje 2025 osemenitevGoveda 0
+pmzUpdate mozirje 2025 obiski 0
+pmzUpdate mozirje 2025 racuni 251
+pmzUpdate mozirje 2025 dobavnice 137
+pmzUpdate mozirje 2025 obravnave 0

package/dist/pmzUpdate.d.mts

@@ -1,5 +1,5 @@
 import { Mongo } from "cry-db";
-import { Dobavnica, Obisk, OsemenitevGoveda, Racun, Terapija, Zdravilo } from "./index.mjs";
+import { Dobavnica, Obisk, Obravnava, OsemenitevGoveda, Pacient, Racun, Terapija, Zdravilo } from "./index.mjs";
 import { RejnaZival } from "./types/stranka.mjs";
 interface Pogostnost {
     vrsta: string;
@@ -7,6 +7,7 @@ interface Pogostnost {
     prc: number;
 }
 type ArtikliPmz = Pick<Zdravilo, "pmzKodaZdravila" | "_id" | "naziv">;
+type PacientVrsteObj = Record<string, Pick<Pacient, "vrsta">>;
 type ArtikliPmzMap = Record<string, ArtikliPmz>;
 interface VrsteZivaliZaZdravilo {
     zdravilo_id: string;
@@ -32,6 +33,9 @@ export declare function pmzUpdateRacuni(mongo: Mongo, tenant: string, year: numb
 export declare function pmzUpdateDobavnice(mongo: Mongo, tenant: string, year: number, artikli: ArtikliPmzMap, zivali: RejnaZival[], znaneVrsteZivali: Record<string, string>, vrsteZivaliZaZdravilo: VrsteZivaliZaZdravilo[], errors: string[]): Promise<{
     dobavnice: Partial<Dobavnica>[];
 }>;
+export declare function pmzUpdateObravnave(mongo: Mongo, tenant: string, year: number, artikli: ArtikliPmzMap, vrsteZivaliZaZdravilo: VrsteZivaliZaZdravilo[], pacientiVrsteObj: PacientVrsteObj, errors: string[]): Promise<{
+    obravnave: Partial<Obravnava>[];
+}>;
 export declare function pmzUpdateAllForYear({ mongo, tenant, year, writeToDb }: {
     tenant: string;
     year: number;
@@ -39,6 +43,7 @@ export declare function pmzUpdateAllForYear({ mongo, tenant, year, writeToDb }:
     writeToDb: boolean;
 }): Promise<{
     updates: {
+        obravnave: Partial<Obravnava>[];
         dobavnice: Partial<Dobavnica>[];
         racuni: Partial<Racun>[];
         obiski: Partial<Obisk>[];

package/dist/pmzUpdate.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"pmzUpdate.d.mts","sourceRoot":"","sources":["../src/pmzUpdate.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pmzUpdate.d.mts","sourceRoot":"","sources":["../src/pmzUpdate.mts"],"names":[],"mappings":"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"}

package/dist/pmzUpdate.mjs

@@ -3,12 +3,8 @@ import dayjs from "dayjs";
 import { jeVeljavnaPmzVrsta, pmzVrstaGledeNaStarost, pmzVrstaOdvisnaOdStarosti, poisciPmzVrstoZivali } from "cry-pmz";
 import { arrayToObject, dedup, jn, leftOfFirst } from "cry-helpers";
 import { dolociMesnostAliRejnostPasmeGoveda } from "./dolociMesnostAliRejnostPasmeGoveda.mjs";
-// function wholeYear(year: number) {
-// 	return [
-// 		dayjs(`${year}-06-06`).startOf("year"),
-// 		dayjs(`${year}-06-06`).endOf("year"),
-// 	];
-// };
+;
+const DEBUG = !!process.dev;
 function wholeYearQ(year) {
     return {
         $gt: dayjs(`${year}-06-06`).startOf("year").toDate(),
@@ -16,7 +12,19 @@ function wholeYearQ(year) {
     };
 }
 ;
-;
+function starostZivaliDni(stZivali, zivali, naDan) {
+    if (!naDan || !(stZivali === null || stZivali === void 0 ? void 0 : stZivali.length) || !zivali)
+        return undefined;
+    for (let zival of stZivali || []) {
+        let animal = zivali === null || zivali === void 0 ? void 0 : zivali.find(z => jn(z.state, z.idAnimal) === zival);
+        if (animal === null || animal === void 0 ? void 0 : animal.DBirth) {
+            let dni = dayjs(naDan).diff(animal.DBirth, "days");
+            if (dni)
+                return dni;
+        }
+    }
+    return undefined;
+}
 /**
  * Iz vseh obstoječih terapij pridobi PMZ vrste živali za vse živali, kjer je bila vpisana
  * @param mongo
@@ -26,7 +34,7 @@ async function pridobiVrsteZivaliIzTerapij(mongo) {
     var _a, _b, _c;
     try {
         let temp = await mongo.aggregate("terapije", [
-            { $match: { "postavke.pmzZa": { $exists: 1 } } },
+            { $match: { "postavke.pmzZa": { $exists: 1 }, } },
             { $unwind: "$postavke" },
             { $match: { "postavke.pmzZa": { $exists: true } } },
             { $set: { "postavke.stZivali": { $ifNull: ["$postavke.karencaZa", "$stevilkeZivali"] } } },
@@ -52,31 +60,11 @@ async function pridobiVrsteZivaliIzTerapij(mongo) {
     ;
     return {};
 }
-//
-// Funkcija poišče terapije, ki nimajo gmida, ima ga pa 
-//
-// async function pripisManjkajociGmidTerapijam(mongo: Mongo, year: number) {
-// 	let manjkajoce = await mongo.find<Terapija & { _gmids?: string[] }>("terapije", {
-// 		datumTerapije: wholeYearQ(year),
-// 		gmid: { $exists: false }
-// 	}, { project: { _gmids: true, obisk_id: true } });
-// 	console.log(`manjkajoce.length`,manjkajoce.length);
-// 	let obiskiTerapij: Obisk[] = await mongo.find<Obisk>("obiski", {
-// 		_id: { $in: manjkajoce.map(a => a.obisk_id?.toString()).filter(a => !!a) },
-// 		gmid: { $exists: true }
-// 	}, { project: { gmid: 1 } });
-// 	console.log(`obiskiTerapij`,obiskiTerapij);
-// 	let obiskiTerapijObj = arrayToObject(obiskiTerapij, "_id");
-// 	let updates: { _id: string, gmid: string }[] = []
-// 	for (let terapija of manjkajoce) {
-// 		let gmid = (terapija.obisk_id && obiskiTerapijObj[terapija.obisk_id]?.gmid) ||
-// 			(terapija._gmids?.length === 1 && terapija._gmids[0]);
-// 		if (gmid) updates.push({ _id: terapija._id, gmid });
-// 	}
-// 	console.log(`TERAPIUE updates`,updates);
-// }
+async function pacientiZivalskeVrste(mongo) {
+    return arrayToObject(await mongo.find("pacienti", { _deleted: { $ne: "hack" } }), "_id");
+}
 async function pridobiPMZArtikle(mongo) {
-    let pmzArtikli = (await mongo.find("artikli", { skupine: "PMZ" }, { project: { _id: true, pmzKodaZdravila: true, naziv: true } })).filter(a => a);
+    let pmzArtikli = (await mongo.find("artikli", { skupine: "PMZ", _deleted: { $ne: "hack" } }, { project: { _id: true, pmzKodaZdravila: true, naziv: true } })).filter(a => a);
     pmzArtikli.forEach(a => a._id = a._id.toString());
     pmzArtikli = pmzArtikli.filter(a => a.pmzKodaZdravila && typeof a.pmzKodaZdravila === "number");
     let pmzArtikliMap = arrayToObject(pmzArtikli, "_id");
@@ -133,7 +121,7 @@ function zdraviluPrimernaVrsta(vrsteZivaliZaZdravilo, zdravilo_id) {
     if (!moznosti)
         return;
     let prva = (_a = moznosti.za.sort((a, b) => b.n - a.n)) === null || _a === void 0 ? void 0 : _a[0];
-    return (prva === null || prva === void 0 ? void 0 : prva.pmzZa) || prva.vrsta;
+    return poisciPmzVrstoZivali((prva === null || prva === void 0 ? void 0 : prva.pmzZa) || prva.vrsta);
 }
 function vrstaUstrezaZdravilu(vrsteZivaliZaZdravilo, vrsta, zdravilo_id) {
     var _a, _b, _c, _d;
@@ -181,36 +169,45 @@ async function poisciNovoVrstoZivali(pmzZa, gmid, stZivali, zivali, znaneVrsteZi
     let primerna = zdraviluPrimernaVrsta(vrsteZivaliZaZdravilo, zdravilo_id);
     if (primerna)
         return primerna;
-    errors.push(`Manjka živalska vrsta za zdravilo ${artikli[zdravilo_id].naziv} (${zdravilo_id}).`);
+    errors.push(`Manjka živalska vrsta za zdravilo na terenu ${artikli[zdravilo_id].naziv} (${zdravilo_id}).`);
     return undefined;
 }
 ;
-// TODO: implementiraj za obravnave
-// async function mogocePopraviPostavkoKoraka(artikli: ArtikliPmzMap, postavka: {artikel_id: string, pmzZa?: string, pmzKodaZdravila?: number}, mongo: Mongo, tenant: string, year: number, vrsteZivaliZaZdravilo: VrsteZivaliZaZdravilo[], errors: string[]) {
-// 	if (!postavka) return true;
-// 	const pmzKodaZdravilaNova = artikli[postavka.artikel_id]?.pmzKodaZdravila;
-// 	if (!pmzKodaZdravilaNova) return false;
-// 	let updated = false;
-// 	// let update: Partial<PostavkaRacuna> = {};
-// 	// let novaVrsta = await poisciNovoVrstoZivali(postavka.pmzZa, gmid, stZivali, zivali, znaneVrsteZivali, mongo, tenant, year, artikli, vrsteZivaliZaZdravilo, postavka.artikel_id, errors);
-// 	// if (postavka.pmzZa !== novaVrsta) {
-// 	// 	update.pmzZa_izvorna = postavka.pmzZa;
-// 	// 	update.pmzZaAuto = novaVrsta;
-// 	// }
-// 	// if (postavka.pmzKodaZdravila !== pmzKodaZdravilaNova) {
-// 	// 	// console.log(`novo zdravilo`,pmzKodaZdravilaNova, update.pmzZaAuto);
-// 	// 	update.pmzKodaZdravila_izvorna = postavka.pmzKodaZdravila;
-// 	// 	update.pmzKodaZdravila = pmzKodaZdravilaNova;
-// 	// }
-// 	// if (Object.keys(update).length > 0) {
-// 	// 	update.pmz_popravek = new Date();
-// 	// 	updated = true;
-// 	// }
-// 	// if (updated) {
-// 	// 	for (let key in update) (postavka as any)[key] = update[key as keyof PostavkaRacuna]
-// 	// }
-// 	return updated;
-// }
+function mogocePopraviPostavkoKoraka(artikli, postavka, pacient_id, pacientiVrsteObj, vrsteZivaliZaZdravilo, errors) {
+    var _a, _b;
+    if (!postavka)
+        return true;
+    const pmzKodaZdravilaNova = (_a = artikli[postavka.artikel_id]) === null || _a === void 0 ? void 0 : _a.pmzKodaZdravila;
+    if (!pmzKodaZdravilaNova)
+        return false;
+    let updated = false;
+    let update = {};
+    let novaVrsta = poisciPmzVrstoZivali(postavka.pmzZa_izvorna || postavka.pmzZa || ((_b = pacientiVrsteObj[pacient_id]) === null || _b === void 0 ? void 0 : _b.vrsta) || "");
+    // sicer vrni vrsto, primerno za to zdravilo
+    let primerna = zdraviluPrimernaVrsta(vrsteZivaliZaZdravilo, postavka.artikel_id);
+    if (primerna)
+        novaVrsta = primerna;
+    else
+        errors.push(`Manjka živalska vrsta za zdravilo na terenu ${artikli[postavka.artikel_id].naziv} (${postavka.artikel_id}).`);
+    if (postavka.pmzZa !== novaVrsta) {
+        update.pmzZa_izvorna = postavka.pmzZa;
+        update.pmzZaAuto = novaVrsta;
+    }
+    if (postavka.pmzKodaZdravila !== pmzKodaZdravilaNova) {
+        // console.log(`novo zdravilo`,pmzKodaZdravilaNova, update.pmzZaAuto);
+        update.pmzKodaZdravila_izvorna = postavka.pmzKodaZdravila;
+        update.pmzKodaZdravila = pmzKodaZdravilaNova;
+    }
+    if (Object.keys(update).length > 0) {
+        update.pmz_popravek = new Date();
+        updated = true;
+    }
+    if (updated) {
+        for (let key in update)
+            postavka[key] = update[key];
+    }
+    return updated;
+}
 async function mogocePopraviPostavko(artikli, postavka, gmid, stZivali, zivali, znaneVrsteZivali, mongo, tenant, year, vrsteZivaliZaZdravilo, errors, naDan) {
     var _a;
     if (!postavka)
@@ -246,8 +243,8 @@ async function mogocePopraviPostavko(artikli, postavka, gmid, stZivali, zivali,
         update.pmz_popravek = new Date();
         updated = true;
     }
-    if (!jeVeljavnaPmzVrsta(postavka.pmzZa) && postavka.pmzZa !== undefined) {
-        console.log(`postavka.pmzZa,novaVrsta`, postavka.pmzZa, "->", update.pmzZa);
+    if (!jeVeljavnaPmzVrsta(update.pmzZa) && update.pmzZa !== undefined) {
+        console.error(`mogocePopraviPostavko: vrsta ni veljavna`, postavka.pmzZa, "->", update.pmzZa);
     }
     if (updated) {
         for (let key in update)
@@ -271,7 +268,8 @@ async function gmidZapisa(zapis, mongo) {
 //#region VRSTE DOKUMENTOV
 export async function pmzUpdateTerapije(mongo, tenant, year, artikli, zivali, znaneVrsteZivali, vrsteZivaliZaZdravilo, errors) {
     const collection = "terapije";
-    console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
+    if (DEBUG)
+        console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
     let updates = [];
     try {
         const terapije = (await mongo.find(collection, {
@@ -292,7 +290,8 @@ export async function pmzUpdateTerapije(mongo, tenant, year, artikli, zivali, zn
                 });
             }
         }
-        console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${terapije.length}`);
+        if (DEBUG)
+            console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${terapije.length}`);
     }
     catch (err) {
         console.error(`pmzUpdateTerapije ${tenant} ${year}: ${err.message || err}`);
@@ -304,7 +303,8 @@ export async function pmzUpdateTerapije(mongo, tenant, year, artikli, zivali, zn
 ;
 export async function pmzUpdateOsemenitevGoveda(mongo, tenant, year, artikli, zivali, znaneVrsteZivali, vrsteZivaliZaZdravilo, errors) {
     const collection = "osemenitevGoveda";
-    console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
+    if (DEBUG)
+        console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
     let updates = [];
     try {
         const osemenitve = (await mongo.find(collection, {
@@ -325,7 +325,8 @@ export async function pmzUpdateOsemenitevGoveda(mongo, tenant, year, artikli, zi
                 });
             }
         }
-        console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${osemenitve.length}`);
+        if (DEBUG)
+            console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${osemenitve.length}`);
     }
     catch (err) {
         console.error(`pmzUpdateOsemenitevGoveda ${tenant} ${year}: ${err.message || err}`);
@@ -337,7 +338,8 @@ export async function pmzUpdateOsemenitevGoveda(mongo, tenant, year, artikli, zi
 ;
 export async function pmzUpdateObiski(mongo, tenant, year, artikli, zivali, znaneVrsteZivali, vrsteZivaliZaZdravilo, errors) {
     const collection = "obiski";
-    console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
+    if (DEBUG)
+        console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
     let updates = [];
     try {
         const obiski = (await mongo.find(collection, {
@@ -358,7 +360,8 @@ export async function pmzUpdateObiski(mongo, tenant, year, artikli, zivali, znan
                 });
             }
         }
-        console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${obiski.length}`);
+        if (DEBUG)
+            console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${obiski.length}`);
     }
     catch (err) {
         console.error(`pmzUpdateObiski ${tenant} ${year}: ${err.message || err}`);
@@ -369,7 +372,8 @@ export async function pmzUpdateObiski(mongo, tenant, year, artikli, zivali, znan
 ;
 export async function pmzUpdateRacuni(mongo, tenant, year, artikli, zivali, znaneVrsteZivali, vrsteZivaliZaZdravilo, errors) {
     const collection = "racuni";
-    console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
+    if (DEBUG)
+        console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
     let updates = [];
     try {
         const racuni = (await mongo.find(collection, {
@@ -390,7 +394,8 @@ export async function pmzUpdateRacuni(mongo, tenant, year, artikli, zivali, znan
                 });
             }
         }
-        console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${racuni.length}`);
+        if (DEBUG)
+            console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${racuni.length}`);
     }
     catch (err) {
         console.error(`pmzUpdateRacuni ${tenant} ${year}: ${err.message || err}`);
@@ -401,7 +406,8 @@ export async function pmzUpdateRacuni(mongo, tenant, year, artikli, zivali, znan
 ;
 export async function pmzUpdateDobavnice(mongo, tenant, year, artikli, zivali, znaneVrsteZivali, vrsteZivaliZaZdravilo, errors) {
     const collection = "dobavnice";
-    console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
+    if (DEBUG)
+        console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
     let updates = [];
     try {
         const dobavnice = (await mongo.find(collection, {
@@ -422,7 +428,8 @@ export async function pmzUpdateDobavnice(mongo, tenant, year, artikli, zivali, z
                 });
             }
         }
-        console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${dobavnice.length}`);
+        if (DEBUG)
+            console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${dobavnice.length}`);
     }
     catch (err) {
         console.error(`pmzUpdateDobavnice ${tenant} ${year}: ${err.message || err}`);
@@ -431,48 +438,50 @@ export async function pmzUpdateDobavnice(mongo, tenant, year, artikli, zivali, z
     return { dobavnice: updates };
 }
 ;
-// TODO - implementiraj za obravnave
-// export async function pmzUpdateObravnave(mongo: Mongo, tenant: string, year: number, artikli: ArtikliPmzMap, zivali: RejnaZival[], znaneVrsteZivali: Record<string,string>, vrsteZivaliZaZdravilo: VrsteZivaliZaZdravilo[], errors: string[])
-// {
-// 	const collection="obravnave";
-// 	console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
-// 	let updates: Partial<Obravnava>[] = [];
-// 	try {
-// 		const obravnave = (await mongo.find<Obravnava>(collection,
-// 			{
-// 				datum: wholeYearQ(year),
-// 				"koraki.postavke.artikel_id": { $in: Object.values(artikli).map(a => a._id) }
-// 			} as any,
-// 			{ project: { _id: true, postavke: true, stevilkeZivali: true, gmid: true } })
-// 		);
-// 		for (let obravnava of obravnave) {
-// 			let updated = false;
-// 			for (let korak of obravnava.koraki || []) {
-// 				for (let postavka of korak.postavke || []) {
-// 					updated ||= await mogocePopraviPostavkoKoraka(artikli,postavka,mongo,tenant,year,vrsteZivaliZaZdravilo,errors);
-// 				}
-// 				korak.postavke = (korak.postavke || []).filter(a => !!a);
-// 			}
-// 			if (updates) {
-// 				updates.push({
-// 					_id: obravnava._id,
-// 					pmzAutoUpdated: new Date(),
-// 					koraki: obravnava.koraki!.filter(a => !!a)
-// 				})
-// 			}
-// 		}
-// 		console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${obravnave.length}`);
-// 	} catch(err: any) {
-// 		console.error(`pmzUpdateObravnave ${tenant} ${year}: ${err.message||err}`);
-// 	};
-// 	return { obravnave: updates }
-// };
+export async function pmzUpdateObravnave(mongo, tenant, year, artikli, vrsteZivaliZaZdravilo, pacientiVrsteObj, errors) {
+    const collection = "obravnave";
+    if (DEBUG)
+        console.log(`starting PMZ update ${tenant} ${year} - ${collection}`);
+    let updates = [];
+    try {
+        const obravnave = (await mongo.find(collection, {
+            datum: wholeYearQ(year),
+            "koraki.postavke.artikel_id": { $in: Object.values(artikli).map(a => a._id) }
+        }, { project: { _id: true, postavke: true, stevilkeZivali: true, pacient_id: true, gmid: true } }));
+        for (let obravnava of obravnave) {
+            let updated = false;
+            for (let korak of obravnava.koraki || []) {
+                for (let postavka of korak.postavke || []) {
+                    updated || (updated = mogocePopraviPostavkoKoraka(artikli, postavka, obravnava.pacient_id, pacientiVrsteObj, vrsteZivaliZaZdravilo, errors));
+                }
+                korak.postavke = (korak.postavke || []).filter(a => !!a);
+            }
+            if (updates) {
+                updates.push({
+                    _id: obravnava._id,
+                    pmzAutoUpdated: new Date(),
+                    koraki: obravnava.koraki.filter(a => !!a)
+                });
+            }
+        }
+        if (DEBUG)
+            console.log(`finished PMZ update ${tenant} ${year} - ${collection}: ${updates.length}/${obravnave.length}`);
+    }
+    catch (err) {
+        console.error(`pmzUpdateObravnave ${tenant} ${year}: ${err.message || err}`);
+        console.error(`err`, err);
+    }
+    ;
+    return { obravnave: updates };
+}
+;
 //#region 
 export async function pmzUpdateAllForYear({ mongo, tenant, year, writeToDb }) {
     var _a;
     mongo || (mongo = new Mongo(tenant));
     let pmzArtikliMap = await pridobiPMZArtikle(mongo);
     let zdraviloZaVrste = await vrsteZivaliZaZdravilo(mongo);
+    let pacientiVrsteObj = await pacientiZivalskeVrste(mongo);
     // console.log(await pmzPogostnostVrstZivali(mongo, tenant, year, pmzArtikliMap));
     // if (1===1) process.exit(0)
     let zivali = await mongo.find("zivali", {});
@@ -483,17 +492,17 @@ export async function pmzUpdateAllForYear({ mongo, tenant, year, writeToDb }) {
     let obiski = await pmzUpdateObiski(mongo, tenant, year, pmzArtikliMap, zivali, znaneVrsteZivali, zdraviloZaVrste, errors);
     let racuni = await pmzUpdateRacuni(mongo, tenant, year, pmzArtikliMap, zivali, znaneVrsteZivali, zdraviloZaVrste, errors);
     let dobavnice = await pmzUpdateDobavnice(mongo, tenant, year, pmzArtikliMap, zivali, znaneVrsteZivali, zdraviloZaVrste, errors);
-    // let obravnave = await pmzUpdateObravnave(mongo, tenant, year, pmzArtikliMap, zivali, znaneVrsteZivali, zdraviloZaVrste, errors);
+    let obravnave = await pmzUpdateObravnave(mongo, tenant, year, pmzArtikliMap, zdraviloZaVrste, pacientiVrsteObj, errors);
     let updates = {
         ...terapije,
         ...osemenitevGoveda,
         ...obiski,
         ...racuni,
         ...dobavnice,
-        // ...obravnave,
+        ...obravnave,
     };
     for (let collection in updates) {
-        console.log(collection, (_a = updates[collection]) === null || _a === void 0 ? void 0 : _a.length);
+        console.log("pmzUpdate", tenant, year, collection, (_a = updates[collection]) === null || _a === void 0 ? void 0 : _a.length);
     }
     if (writeToDb) {
         for await (let collection of Object.keys(updates)) {
@@ -504,31 +513,15 @@ export async function pmzUpdateAllForYear({ mongo, tenant, year, writeToDb }) {
                 delete update._id;
                 return { query, update };
             });
-            let written = await mongo.upsertBatch(collection, batch);
-            console.log(`collection, written.length`, collection, written.length);
+            await mongo.upsertBatch(collection, batch);
         }
     }
     errors = dedup(errors).sort();
-    console.log(`pmzUpdateAllForYear ${tenant} ${year} errors`, errors);
     return { updates, errors };
 }
-function starostZivaliDni(stZivali, zivali, naDan) {
-    if (!naDan || !(stZivali === null || stZivali === void 0 ? void 0 : stZivali.length) || !zivali)
-        return undefined;
-    for (let zival of stZivali || []) {
-        let animal = zivali === null || zivali === void 0 ? void 0 : zivali.find(z => jn(z.state, z.idAnimal) === zival);
-        if (animal === null || animal === void 0 ? void 0 : animal.DBirth) {
-            let dni = dayjs(naDan).diff(animal.DBirth, "days");
-            console.log(`dni`, dni);
-            if (dni)
-                return dni;
-        }
-    }
-    return undefined;
-}
-// (async function () {
-// 	await pmzUpdateAllForYear({ tenant: "mozirje", year: 2025, writeToDb: true });
-// 	// console.dir(res, { depth:4});
-// 	process.exit(0)
-// })();
+(async function () {
+    await pmzUpdateAllForYear({ tenant: "mozirje", year: 2025, writeToDb: true });
+    // console.dir(res, { depth:4});
+    process.exit(0);
+})();
 //# sourceMappingURL=pmzUpdate.mjs.map