diff --git a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
index 1c18e124..2a5abdc8 100644
--- a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
@@ -1686,16 +1686,16 @@
-
+
-
-
-
-
+
+
+
+
@@ -1728,23 +1728,18 @@
class="com.jasamedika.medifirst2000.entities.RiwayatPerkembanganDetail" />
-
-
-
-
-
+
-
-
+
@@ -1786,7 +1781,7 @@
+ class="com.jasamedika.medifirst2000.entities.SitogenetikaAnalisaKromoson" />
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_OrderDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_OrderDao.java
index dc1b7e62..e8f4d275 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_OrderDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_OrderDao.java
@@ -1,35 +1,35 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.Date;
-
+import com.jasamedika.medifirst2000.entities.RISOrder;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.RIS_Order;
+
+import java.util.Date;
@Repository("RIS_OrderDao")
-public interface RIS_OrderDao extends PagingAndSortingRepository{
+public interface RIS_OrderDao extends PagingAndSortingRepository{
- @Query("select model from RIS_Order model where model.EXTENSION6=:noRec")
- RIS_Order getOneByNoOrder(@Param("noRec") String noRec);
+ @Query("select model from RISOrder model where model.extension6=:noRec")
+ RISOrder getOneByNoOrder(@Param("noRec") String noRec);
- @Query("select model from RIS_Order model where model.ACCESSION_NUM=:accessionNum")
- RIS_Order getOneByAccessionNum(@Param("accessionNum") String accessionNum);
+ @Query("select model from RISOrder model where model.accessionNum=:accessionNum")
+ RISOrder getOneByAccessionNum(@Param("accessionNum") String accessionNum);
@Query("select "
- + "a.ACCESSION_NUM "
- + "from RIS_Order a "
- + "where a.ORDER_MODALITY=:kode and a.ORDER_KEY="
- + "(select max(b.ORDER_KEY) "
- + "from RIS_Order b "
- + "where b.ORDER_MODALITY=:kode)")
- String AccessionNumCode(@Param("kode") String kode);
+ + "a.accessionNum "
+ + "from RISOrder a "
+ + "where a.orderModality=:kode and a.orderKey="
+ + "(select max(b.orderKey) "
+ + "from RISOrder b "
+ + "where b.orderModality=:kode)")
+ String accessionNumCode(@Param("kode") String kode);
- @Query("select max(a.ACCESSION_NUM) "
- + "from RIS_Order a where "
- + "substring(a.ACCESSION_NUM, 1, 1)=:kode and "
- + "month(date(substring(a.CREATE_DATE, 1, 8)))=month(date(:dateNow)) and "
- + "year(date(substring(a.CREATE_DATE, 1, 8)))=year(date(:dateNow))")
+ @Query("select max(a.accessionNum) "
+ + "from RISOrder a where "
+ + "substring(a.accessionNum, 1, 1)=:kode and "
+ + "month(date(substring(a.createDate, 1, 8)))=month(date(:dateNow)) and "
+ + "year(date(substring(a.createDate, 1, 8)))=year(date(:dateNow))")
String countAccessionNum(@Param("kode") String kode, @Param("dateNow") Date dateNow);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_ReportDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_ReportDao.java
index 6754fb65..995f58a4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_ReportDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RIS_ReportDao.java
@@ -1,27 +1,26 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.RISReport;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.RIS_Report;
+import java.util.List;
+import java.util.Map;
@Repository("RIS_ReportDao")
-public interface RIS_ReportDao extends PagingAndSortingRepository{
+public interface RIS_ReportDao extends PagingAndSortingRepository{
- @Query("select new Map ( report.CONFIRM_DATE as confirmDate, "+
- "report.CONFIRM_DOC_NAME as confirmDoctor, "+
- "report.REPORT_TEXT as reportText, "+
- "report.CONCLUSION as conclusion, "+
- "report.CREATE_DATE as createDate, "+
- "report.ACCESSION_NUM as accesion_num, "+
- "report.READ_DATE as readDate) "+
- "from RIS_Report report "+
- "where substring(report.CREATE_DATE,1,8) between :startDate and :endDate")
+ @Query("select new Map ( report.confirmDate as confirmDate, "+
+ "report.confirmDocName as confirmDoctor, "+
+ "report.reportText as reportText, "+
+ "report.conclusion as conclusion, "+
+ "report.createDate as createDate, "+
+ "report.accessionNum as accesion_num, "+
+ "report.readDate as readDate) "+
+ "from RISReport report "+
+ "where substring(report.createDate,1,8) between :startDate and :endDate")
List