Ndryshime ne convert. Trajtimi, vendos nr per cdo entitet

Nest/src/std_zh/klinika/klinika.controller.ts

@@ -1,9 +1,17 @@
-import { Controller, Get, 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';
+import {
+  Controller,
+  Get,
+  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 {
   constructor(private readonly klinikaService: KlinikaService) {}
 
@@ -17,18 +25,18 @@ export class KlinikaController {
     return this.klinikaService.findAll();
   }
 
-  @Get(':id')
-  findOne(@Param('id') id: string) {
+  @Get(":id")
+  findOne(@Param("id") id: string) {
     return this.klinikaService.findOne(+id);
   }
 
-  @Patch(':id')
-  update(@Param('id') id: string, @Body() updateKlinikaDto: UpdateKlinikaDto) {
+  @Patch(":id")
+  update(@Param("id") id: string, @Body() updateKlinikaDto: UpdateKlinikaDto) {
     return this.klinikaService.update(+id, updateKlinikaDto);
   }
 
-  @Delete(':id')
-  remove(@Param('id') id: string) {
+  @Delete(":id")
+  remove(@Param("id") id: string) {
     return this.klinikaService.remove(+id);
   }
 }

Nest/src/std_zh/klinika/klinika.module.ts

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

Nest/src/std_zh/klinika/klinika.service.ts

@@ -1,11 +1,17 @@
-import { Injectable } from '@nestjs/common';
-import { CreateKlinikaDto } from './dto/create-klinika.dto';
-import { UpdateKlinikaDto } from './dto/update-klinika.dto';
+import { Injectable } from "@nestjs/common";
+import { ReadJsonService } from "../read_json/read-json.service";
+import { CreateKlinikaDto } from "./dto/create-klinika.dto";
+import { UpdateKlinikaDto } from "./dto/update-klinika.dto";
 
 @Injectable()
 export class KlinikaService {
+  constructor(private readonly readJsonService: ReadJsonService) {}
   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() {

Nest/src/std_zh/read_json/read-json.service.ts

@@ -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;
+  }
+}

Nest/src/std_zh/std_zh.module.ts

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

Node/src/convertToJson.ts

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

Node/src/index.ts

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