From fdd37d1457a4f0223ce1f64e7f0b912aa623568c Mon Sep 17 00:00:00 2001 From: salmanoe Date: Fri, 2 Sep 2022 01:05:23 +0700 Subject: [PATCH] Update resep dokter Pemasangan no sip dokter order dan judul cetakan --- .../medifirst2000/dao/ResepDokterDao.java | 8 +- .../controller/ReportingController.java | 1 + .../WEB-INF/templates/jrxml/resep.jrxml | 207 ++++++++++++------ 3 files changed, 139 insertions(+), 77 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java index 5599edbb..32a92eec 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java @@ -19,10 +19,10 @@ import com.jasamedika.medifirst2000.entities.ResepDokter; public interface ResepDokterDao extends PagingAndSortingRepository { @Query("select distinct new Map(so.noRec as noRec," + "so.tglOrder as tglOrder," + "so.masalah as alergi," + "so.diagnosis as beratBadan," + "ru.namaRuangan as ruangan," + "pg.namaLengkap as dokter," - + "pd.noRegistrasi as noRegistrasi," + "pd.tglRegistrasi as tglRegistrasi," + "ps.namaPasien as namaPasien," - + "ps.tglLahir as tglLahir," + "ps.noCm as noCm) " + "from ResepDokter rd " + "left join rd.strukOrder so " - + "left join rd.ruangan ru " + "left join so.noRegistrasi pd " + "left join so.noCm ps " - + "inner join so.pegawaiOrder pg " + "where rd.strukOrderId = :strukOrderId") + + "pg.noSip as noSip," + "pd.noRegistrasi as noRegistrasi," + "pd.tglRegistrasi as tglRegistrasi," + + "ps.namaPasien as namaPasien," + "ps.tglLahir as tglLahir," + "ps.noCm as noCm) " + "from ResepDokter rd " + + "left join rd.strukOrder so " + "left join rd.ruangan ru " + "left join so.noRegistrasi pd " + + "left join so.noCm ps " + "inner join so.pegawaiOrder pg " + "where rd.strukOrderId = :strukOrderId") Map findResepHeaderByStrukOrderId(@Param("strukOrderId") String strukOrderId); @Query("select new Map(rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah," diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index c8ee4c70..a0e3d678 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -7802,6 +7802,7 @@ public class ReportingController extends LocaleController m.addObject("beratBadan", headerResep.get("beratBadan")); m.addObject("ruangan", headerResep.get("ruangan")); m.addObject("dokter", headerResep.get("dokter")); + m.addObject("noSip", headerResep.get("noSip")); m.addObject("noRegistrasi", headerResep.get("noRegistrasi")); m.addObject("namaPasien", headerResep.get("namaPasien")); m.addObject("tglLahir", headerResep.get("tglLahir")); diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml index fb3e4b13..82e80511 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml @@ -22,6 +22,7 @@ + @@ -29,49 +30,15 @@ - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -80,7 +47,7 @@ - + @@ -90,7 +57,7 @@ - + @@ -108,7 +75,7 @@ - + @@ -117,7 +84,7 @@ - + @@ -127,7 +94,7 @@ - + @@ -145,7 +112,7 @@ - + @@ -154,7 +121,7 @@ - + @@ -164,7 +131,7 @@ - + @@ -182,7 +149,7 @@ - + @@ -191,7 +158,7 @@ - + @@ -201,7 +168,7 @@ - + @@ -210,7 +177,7 @@ - + @@ -219,7 +186,7 @@ - + @@ -229,7 +196,7 @@ - + @@ -247,7 +214,7 @@ - + @@ -256,7 +223,7 @@ - + @@ -266,7 +233,7 @@ - + @@ -284,16 +251,17 @@ - + + - + - + @@ -303,7 +271,7 @@ - + @@ -316,12 +284,12 @@ - + - + @@ -330,7 +298,7 @@ - + @@ -340,7 +308,7 @@ - + @@ -358,7 +326,7 @@ - + @@ -367,7 +335,7 @@ - + @@ -377,7 +345,7 @@ - + @@ -393,10 +361,103 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -405,7 +466,7 @@ - +