Update ResepDokterService

Penyesuaian cetakan resep baru

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java

@@ -17,12 +17,26 @@ import com.jasamedika.medifirst2000.entities.ResepDokter;
  */
 @Repository("resepDokterDao")
 public interface ResepDokterDao extends PagingAndSortingRepository<ResepDokter, String> {
-	@Query("select new Map(so.noRec as noRec," + "so.tglOrder as tglOrder," + "so.masalah as alergi,"
+	@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," + "ps.namaPasien as namaPasien," + "ps.tglLahir as tglLahir,"
-			+ "ps.noCm as noCm," + "rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah,"
+			+ "ps.noCm as noCm, " + "rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah,"
 			+ "rd.keteranganLainnya as instruksi," + "rd.keteranganPakai as aturanPakai) " + "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")
 	List<Map<String, Object>> findByStrukOrderId(@Param("strukOrderId") String strukOrderId);
+
+	@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," + "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<String, Object> findResepHeaderByStrukOrderId(@Param("strukOrderId") String strukOrderId);
+
+	@Query("select new Map(rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah,"
+			+ "rd.keteranganLainnya as instruksi," + "rd.keteranganPakai as aturanPakai) " + "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")
+	List<Map<String, Object>> findResepBodyByStrukOrderId(@Param("strukOrderId") String strukOrderId);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java

@@ -15,7 +15,9 @@ public interface ResepDokterService extends BaseVoService<ResepDokter, ResepDokt
 	
 	public List<Map<String, Object>> findByStrukOrderId(String strukOrderId);
 	
-	public List<Map<String, Object>> findHeaderResep(String strukOrderId);
+	public Map<String, Object> findHeaderResep(String strukOrderId);
+	
+	public List<Map<String, Object>> findResepSatuan(String strukOrderId);
 	
 	public List<Map<String, Object>> findResepRacikan(String strukOrderId);
 	

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jasamedika.medifirst2000.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -149,31 +150,68 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo
 	}
 
 	@Override
-	public List<Map<String, Object>> findHeaderResep(String strukOrderId) {
+	public Map<String, Object> findHeaderResep(String strukOrderId) {
+		Map<String, Object> result = resepDokterDao.findResepHeaderByStrukOrderId(strukOrderId);
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> findResepSatuan(String strukOrderId) {
 		List<Map<String, Object>> result = new ArrayList<>();
-		List<Map<String, Object>> data = resepDokterDao.findByStrukOrderId(strukOrderId);
+		List<Map<String, Object>> data = resepDokterDao.findResepBodyByStrukOrderId(strukOrderId);
 		List<String> listResepKe = new ArrayList<>();
 		for (Map<String, Object> map : data) {
 			if (!listResepKe.contains(map.get("rKe"))) {
 				listResepKe.add(map.get("rKe").toString());
 			}
 		}
-		int jumlahResep = 0;
 		for (String resepKe : listResepKe) {
+			int jumlahResep = 0;
+			Map<String, Object> rsMap = new HashMap<String, Object>();
 			for (Map<String, Object> map : data) {
 				if (resepKe.equals(map.get("rKe"))) {
-					
+					rsMap.putAll(map);
+					jumlahResep++;
 				}
 			}
+			if (jumlahResep == 1) {
+				result.add(rsMap);
 			}
-		return null;
+		}
+		return result;
 	}
 
 	@Override
 	public List<Map<String, Object>> findResepRacikan(String strukOrderId) {
 		List<Map<String, Object>> result = new ArrayList<>();
-		List<Map<String, Object>> data = resepDokterDao.findByStrukOrderId(strukOrderId);
+		List<Map<String, Object>> data = resepDokterDao.findResepBodyByStrukOrderId(strukOrderId);
-		return null;
+		List<String> listResepKe = new ArrayList<>();
+		for (Map<String, Object> map : data) {
+			if (!listResepKe.contains(map.get("rKe"))) {
+				listResepKe.add(map.get("rKe").toString());
+			}
+		}
+		List<String> listRacikan = new ArrayList<>();
+		for (String resepKe : listResepKe) {
+			int jumlahResep = 0;
+			String racikanKe = resepKe;
+			for (Map<String, Object> map : data) {
+				if (resepKe.equals(map.get("rKe"))) {
+					jumlahResep++;
+				}
+			}
+			if (jumlahResep > 1) {
+				listRacikan.add(racikanKe);
+			}
+		}
+		for (String racikanKe : listRacikan) {
+			for (Map<String, Object> map : data) {
+				if (racikanKe.equals(map.get("rKe"))) {
+					result.add(map);
+				}
+			}
+		}
+		return result;
 	}
 
 }

jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java

@@ -130,6 +130,7 @@ import com.jasamedika.medifirst2000.service.RekrutmenService;
 import com.jasamedika.medifirst2000.service.ReportService;
 import com.jasamedika.medifirst2000.service.ReportingPegawaiService;
 import com.jasamedika.medifirst2000.service.ReportingPelayananRekamMedisService;
+import com.jasamedika.medifirst2000.service.ResepDokterService;
 import com.jasamedika.medifirst2000.service.ReturRuanganService;
 import com.jasamedika.medifirst2000.service.RuanganService;
 import com.jasamedika.medifirst2000.service.StokProdukGlobalService;
@@ -337,6 +338,9 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 	@Autowired
 	private CatatanPerkembanganPasienTerintegrasiService cpptService;
 	
+	@Autowired
+	private ResepDokterService resepDokterService;
+
 	@SuppressWarnings("unchecked")
 	@RequestMapping("/instalasiRawatInap")
 	public ModelAndView generateInstalasiRawatInap(ModelAndView m,
@@ -7502,40 +7506,24 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 
 	@RequestMapping("/resep")
 	public ModelAndView generateResep(ModelAndView m, @RequestParam(value = "format", required = false) String format,
-			@RequestParam(value = "startDate", required = true) String startDate,
+			@RequestParam(value = "struk_order_id", required = true) String strukOrderId) {
-			@RequestParam(value = "endDate", required = true) String endDate) {
+		Map<String, Object> headerResep = resepDokterService.findHeaderResep(strukOrderId);
+		List<Map<String, Object>> dsResep = resepDokterService.findResepSatuan(strukOrderId);
+		List<Map<String, Object>> sdsResep = resepDokterService.findResepRacikan(strukOrderId);
 		
-		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		m.addObject("dsResep", dsResep);
-
+		m.addObject("sdsResep", sdsResep);
-		Map<String, Object> kepalaTtdRekap = pegawaiService
+		m.addObject("noRec", headerResep.get("noRec"));
-				.findKepalaPegawai("Kepala Instalasi Loundry dan Sterilisasi Sentral");
+		m.addObject("tglOrder", headerResep.get("tglOrder"));
-		Map<String, Object> grandTarifQty = laundryService.findGrandTarifQtyCuciLinen(startDate, endDate);
+		m.addObject("alergi", headerResep.get("alergi"));
-		List<Map<String, Object>> dsRekapCuciLinen = laundryService.findDepartemenTarifQtyCuciLinen(startDate, endDate);
+		m.addObject("beratBadan", headerResep.get("beratBadan"));
-		List<Map<String, Object>> sdsRekapCuciLinen = laundryService.findRuanganTarifQtyCuciLinen(startDate, endDate);
+		m.addObject("ruangan", headerResep.get("ruangan"));
-
+		m.addObject("dokter", headerResep.get("dokter"));
-		try {
+		m.addObject("noRegistrasi", headerResep.get("noRegistrasi"));
-			Date sd = df.parse(startDate);
+		m.addObject("namaPasien", headerResep.get("namaPasien"));
-			Date ed = df.parse(endDate);
+		m.addObject("tglLahir", headerResep.get("tglLahir"));
-
+		m.addObject("noCm", headerResep.get("noCm"));
-			m.addObject("startDate", sd);
-			m.addObject("endDate", ed);
-
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-
-		m.addObject("dsRekapLayananLaundry", dsRekapCuciLinen);
-		m.addObject("sdsRekapLayananLaundry", sdsRekapCuciLinen);
-		m.addObject("grandSubTotal", grandTarifQty.get("grandSubTotal"));
-		m.addObject("grandTotal", grandTarifQty.get("grandTotal"));
-		m.addObject("grandBerat", grandTarifQty.get("grandBerat"));
-		m.addObject("rataanBeratCucian", grandTarifQty.get("rataanBeratCucian"));
-		m.addObject("rataanLembarCucian", grandTarifQty.get("rataanLembarCucian"));
 		m.addObject("format", "pdf");
-		if (CommonUtil.isNotNullOrEmpty(kepalaTtdRekap)) {
-			m.addObject("nipPegawai", kepalaTtdRekap.get("nipPegawai"));
-			m.addObject("namaPegawai", kepalaTtdRekap.get("namaPegawai"));
-		}
 		if (format != null && !format.isEmpty()) {
 			m.addObject("format", format);
 		}