Ndryshime ne convert. Trajtimi, vendos nr per cdo entitet

This commit is contained in:
2022-09-22 17:53:49 +02:00
parent 2421651a92
commit c75d4768de
8 changed files with 152 additions and 124541 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,9 +1,17 @@
import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common'; import {
import { KlinikaService } from './klinika.service'; Controller,
import { CreateKlinikaDto } from './dto/create-klinika.dto'; Get,
import { UpdateKlinikaDto } from './dto/update-klinika.dto'; Post,
Body,
Patch,
Param,
Delete,
} from "@nestjs/common";
import { KlinikaService } from "./klinika.service";
import { CreateKlinikaDto } from "./dto/create-klinika.dto";
import { UpdateKlinikaDto } from "./dto/update-klinika.dto";
@Controller('klinika') @Controller("klinika")
export class KlinikaController { export class KlinikaController {
constructor(private readonly klinikaService: KlinikaService) {} constructor(private readonly klinikaService: KlinikaService) {}
@@ -17,18 +25,18 @@ export class KlinikaController {
return this.klinikaService.findAll(); return this.klinikaService.findAll();
} }
@Get(':id') @Get(":id")
findOne(@Param('id') id: string) { findOne(@Param("id") id: string) {
return this.klinikaService.findOne(+id); return this.klinikaService.findOne(+id);
} }
@Patch(':id') @Patch(":id")
update(@Param('id') id: string, @Body() updateKlinikaDto: UpdateKlinikaDto) { update(@Param("id") id: string, @Body() updateKlinikaDto: UpdateKlinikaDto) {
return this.klinikaService.update(+id, updateKlinikaDto); return this.klinikaService.update(+id, updateKlinikaDto);
} }
@Delete(':id') @Delete(":id")
remove(@Param('id') id: string) { remove(@Param("id") id: string) {
return this.klinikaService.remove(+id); return this.klinikaService.remove(+id);
} }
} }

View File

@@ -1,9 +1,10 @@
import { Module } from '@nestjs/common'; import { Module } from "@nestjs/common";
import { KlinikaService } from './klinika.service'; import { KlinikaService } from "./klinika.service";
import { KlinikaController } from './klinika.controller'; import { KlinikaController } from "./klinika.controller";
import { ReadJsonService } from "../read_json/read-json.service";
@Module({ @Module({
controllers: [KlinikaController], controllers: [KlinikaController],
providers: [KlinikaService] providers: [KlinikaService, ReadJsonService],
}) })
export class KlinikaModule {} export class KlinikaModule {}

View File

@@ -1,11 +1,17 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from "@nestjs/common";
import { CreateKlinikaDto } from './dto/create-klinika.dto'; import { ReadJsonService } from "../read_json/read-json.service";
import { UpdateKlinikaDto } from './dto/update-klinika.dto'; import { CreateKlinikaDto } from "./dto/create-klinika.dto";
import { UpdateKlinikaDto } from "./dto/update-klinika.dto";
@Injectable() @Injectable()
export class KlinikaService { export class KlinikaService {
constructor(private readonly readJsonService: ReadJsonService) {}
create(createKlinikaDto: CreateKlinikaDto) { create(createKlinikaDto: CreateKlinikaDto) {
return 'This action adds a new klinika'; const records = this.readJsonService.getAll();
records.forEach((record: any) => {
console.log(record.klinika);
});
return "This action adds a new klinika";
} }
findAll() { findAll() {

View File

@@ -0,0 +1,16 @@
import { Injectable } from "@nestjs/common";
import { readFileSync } from "fs";
import { join } from "path";
@Injectable()
export class ReadJsonService {
json: any;
constructor() {
const jsonPath = join("..", "JSON", "records.json");
const jsonObj = JSON.parse(readFileSync(jsonPath).toString());
this.json = jsonObj;
}
getAll() {
return this.json;
}
}

View File

@@ -1,12 +1,11 @@
import { Module } from '@nestjs/common'; import { Module } from "@nestjs/common";
import { KlinikaModule } from './klinika/klinika.module'; import { KlinikaModule } from "./klinika/klinika.module";
import { PacientiModule } from './pacienti/pacienti.module'; import { PacientiModule } from "./pacienti/pacienti.module";
import { DiagnozaModule } from './diagnoza/diagnoza.module'; import { DiagnozaModule } from "./diagnoza/diagnoza.module";
import { TrajtimiModule } from './trajtimi/trajtimi.module'; import { TrajtimiModule } from "./trajtimi/trajtimi.module";
@Module({ @Module({
controllers: [], controllers: [],
providers: [],
imports: [KlinikaModule, PacientiModule, DiagnozaModule, TrajtimiModule], imports: [KlinikaModule, PacientiModule, DiagnozaModule, TrajtimiModule],
}) })
export class StdZhModule {} export class StdZhModule {}

View File

@@ -22,52 +22,105 @@ const readExcel = (filePath: string) => {
}; };
const recordsToJson = () => { const recordsToJson = () => {
let i = 0; let pacientiNr = 0;
let klinikaNr = 0;
let diagnozaNr = 0;
let shtrimiNr = 0;
let trajtimiNr = 0;
let errorNr = 0;
let records: any[] = []; let records: any[] = [];
excelFiles.every((file) => { excelFiles.every((file) => {
if (!file.includes("raw_") && !file.includes("lock")) { if (!file.includes("raw_") && !file.includes("lock")) {
const excelFile = join(excelPath, file); const excelFile = join(excelPath, file);
const data = readExcel(excelFile); const data = readExcel(excelFile);
const klinika_emer = file.split("_")[0]; const klinika_emer = file.split("_")[0];
klinikaNr++;
const klinika: any = { const klinika: any = {
nr: klinikaNr,
emer: klinika_emer, emer: klinika_emer,
shtrimi: [], shtrimi: [],
}; };
data.every((record: any) => { data.every((record: any) => {
i++; const emer = record.EMER;
if (record.EMER !== "" && record.MBIEMER !== "") { const mbiemer = record.MBIEMER;
let datelindja = null; const mosha = record.MOSHA;
let data_shtrimit = null; let gjinia = record.GJINIA;
let datelindja = record.DATELINDJA_KORIGJ;
let data_shtrimit = record.DT_SHTRIMI_KORIGJ;
let diagnozaRaw = record.DIAGNOZA;
let kodi_dg_icd_9Raw = record["Kodi DG ICD-9"];
let dite_qendrimiRaw = record["DITE QENDRIMI NE SPITAL"];
let trajtimiRaw =
record["TRAJTIMI SPITALOR Urgjence"] ||
record["TRAJTIMI SPITALOR Pavion"];
if (emer.trim() !== "" && mbiemer.trim() !== "") {
pacientiNr++;
// console.log(trajtimiRaw);
try { try {
datelindja = getJsDateFromExcel(record.DATELINDJA_KORIGJ); datelindja = getJsDateFromExcel(datelindja);
data_shtrimit = getJsDateFromExcel(record.DT_SHTRIMI_KORIGJ); data_shtrimit = getJsDateFromExcel(data_shtrimit);
} catch (error) { } catch (error) {
console.log(i, record.EMER, record.MBIEMER); errorNr++;
// console.log(errorNr, pacientiNr, emer, mbiemer);
// return false; // return false;
} }
const trajtimi = { let trajtimi = {};
trajtimi: if (trajtimiRaw) {
record["TRAJTIMI SPITALOR Urgjence"] || trajtimiRaw = trajtimiRaw.trim();
record["TRAJTIMI SPITALOR Pavion"], let barnatArr = trajtimiRaw.split("\n");
}; barnatArr = barnatArr.map((bar: any) => {
const diagnoza = { bar = bar.trim();
emer: record.DIAGNOZA, let obj: any = {};
kodi_dg_icd_9: record["Kodi DG ICD-9"], let bariRaw = bar.split(",");
}; if (
bariRaw[0] === "??" ||
bariRaw[0] === "???" ||
bariRaw[0] === "????" ||
bariRaw[0] === "---" ||
bariRaw[0] === "----" ||
bariRaw[0] === "-----"
) {
return;
} else {
obj.bari = bariRaw[0];
obj.sasia = null;
return obj;
}
});
trajtimiNr++;
console.log(barnatArr);
trajtimi = {
nr: trajtimiNr,
trajtimi: barnatArr,
};
}
let diagnoza = {};
if (diagnozaRaw.trim()) {
diagnozaNr++;
diagnoza = {
nr: diagnozaNr,
emer: diagnozaRaw.trim(),
kodi_dg_icd_9: kodi_dg_icd_9Raw.trim(),
};
}
const pacienti = { const pacienti = {
emer: record.EMER, nr: pacientiNr,
mbiemer: record.MBIEMER, emer: emer.trim(),
mosha: record.MOSHA, mbiemer: mbiemer.trim(),
mosha: mosha,
datelindja, datelindja,
gjinia: record.GJINIA, gjinia: gjinia,
error: record.ERROR,
}; };
shtrimiNr++;
const shtrimi = { const shtrimi = {
nr: i, nr: shtrimiNr,
data_shtrimit, data_shtrimit,
dite_qendrimi: record["DITE QENDRIMI NE SPITAL"], dite_qendrimi: parseInt(dite_qendrimiRaw),
pacienti, pacienti,
diagnoza, diagnoza: diagnoza,
trajtimi, trajtimi,
}; };
klinika.shtrimi.push(shtrimi); klinika.shtrimi.push(shtrimi);

View File

@@ -1,21 +1,22 @@
import { run } from "./kuzzle"; // import { run } from "./kuzzle";
// import recordsToJson from "./convertToJson"; import recordsToJson from "./convertToJson";
(async () => { recordsToJson();
const kuzzle = await run(); // (async () => {
if (kuzzle) { // const kuzzle = await run();
const credentials = { // if (kuzzle) {
username: "julian.cuni", // const credentials = {
password: "MatraPaPuPa..11", // username: "julian.cuni",
}; // password: "MatraPaPuPa..11",
try { // };
const jwt = await kuzzle.auth.login("local", credentials); // try {
// const apiKey = await kuzzle.auth.createApiKey("Sigfox API key"); // const jwt = await kuzzle.auth.login("local", credentials);
} catch (error: any) { // // const apiKey = await kuzzle.auth.createApiKey("Sigfox API key");
console.error(error.message); // } catch (error: any) {
} // console.error(error.message);
} // }
})(); // }
// })();
// (async () => { // (async () => {
// await login(); // await login();