fix: 폐기보고 통계 상세 목록 추가 완료

src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml

@@ -19,15 +19,15 @@
 				 , IF(tpi.prtm_se_nm = '비마약류', 1, 0) AS 비마약류
 				 , IF(tpi.prtm_se_nm = '일반관리대상', 1, 0) AS 일반관리대상
 				 , IF(tpi.prtm_se_nm = '중점관리대상', 1, 0) AS 중점관리대상
-				 , IF(tpi.nrcd_se_nm = '대마', tdmd.dsuse_qy, '0') AS 대마qy
-                 , IF(tpi.nrcd_se_nm = '마약', tdmd.dsuse_qy, '0') AS 마약qy
-                 , IF(tpi.nrcd_se_nm = '한외마약', tdmd.dsuse_qy, '0') AS 한외마약qy
-                 , IF(tpi.nrcd_se_nm = '향정', tdmd.dsuse_qy, '0') AS 향정qy
-                 , IF(tpi.nrcd_se_nm = '향정제외', tdmd.dsuse_qy, '0') AS 향정제외qy
-                 , IF(tpi.nrcd_se_nm IS NULL, tdmd.dsuse_qy, '0') AS 기타qy
-                 , IF(tpi.prtm_se_nm = '비마약류', tdmd.dsuse_qy, 0) AS 비마약류qy
-                 , IF(tpi.prtm_se_nm = '일반관리대상', tdmd.dsuse_qy, 0) AS 일반관리대상qy
-                 , IF(tpi.prtm_se_nm = '중점관리대상', tdmd.dsuse_qy, 0) AS 중점관리대상qy
+				 , IF(tpi.nrcd_se_nm = '대마', tdmd.dsuse_qy, '0') AS 대마Qy
+                 , IF(tpi.nrcd_se_nm = '마약', tdmd.dsuse_qy, '0') AS 마약Qy
+                 , IF(tpi.nrcd_se_nm = '한외마약', tdmd.dsuse_qy, '0') AS 한외마약Qy
+                 , IF(tpi.nrcd_se_nm = '향정', tdmd.dsuse_qy, '0') AS 향정Qy
+                 , IF(tpi.nrcd_se_nm = '향정제외', tdmd.dsuse_qy, '0') AS 향정제외Qy
+                 , IF(tpi.nrcd_se_nm IS NULL, tdmd.dsuse_qy, '0') AS 기타Qy
+                 , IF(tpi.prtm_se_nm = '비마약류', tdmd.dsuse_qy, 0) AS 비마약류Qy
+                 , IF(tpi.prtm_se_nm = '일반관리대상', tdmd.dsuse_qy, 0) AS 일반관리대상Qy
+                 , IF(tpi.prtm_se_nm = '중점관리대상', tdmd.dsuse_qy, 0) AS 중점관리대상Qy
 			  FROM tb_dsuse_mgt tdm
 			  JOIN tb_dsuse_mgt_dtl tdmd ON tdm.dscdmng_id = tdmd.dscdmng_id
 			  JOIN tb_prduct_info tpi ON tdmd.prduct_cd = tpi.prduct_cd
@@ -61,15 +61,15 @@
                      , SUM(tgt.비마약류) AS 비마약류
                      , SUM(tgt.일반관리대상) AS 일반관리대상
                      , SUM(tgt.중점관리대상) AS 중점관리대상
-                     , SUM(tgt.대마qy) AS 대마qy
-                     , SUM(tgt.마약qy) AS 마약qy
-                     , SUM(tgt.한외마약qy) AS 한외마약qy
-                     , SUM(tgt.향정qy) AS 향정qy
-                     , SUM(tgt.향정제외qy) AS 향정제외qy
-                     , SUM(tgt.기타qy) AS 기타qy
-                     , SUM(tgt.비마약류qy) AS 비마약류qy
-                     , SUM(tgt.일반관리대상qy) AS 일반관리대상qy
-                     , SUM(tgt.중점관리대상qy) AS 중점관리대상qy
+                     , SUM(tgt.대마Qy) AS 대마Qy
+                     , SUM(tgt.마약Qy) AS 마약Qy
+                     , SUM(tgt.한외마약Qy) AS 한외마약Qy
+                     , SUM(tgt.향정Qy) AS 향정Qy
+                     , SUM(tgt.향정제외Qy) AS 향정제외Qy
+                     , SUM(tgt.기타Qy) AS 기타Qy
+                     , SUM(tgt.비마약류Qy) AS 비마약류Qy
+                     , SUM(tgt.일반관리대상Qy) AS 일반관리대상Qy
+                     , SUM(tgt.중점관리대상Qy) AS 중점관리대상Qy
                   FROM tgt
                  GROUP BY tgt.dept_cd
                  UNION ALL
@@ -85,15 +85,15 @@
                      , SUM(tgt.비마약류) AS 비마약류
                      , SUM(tgt.일반관리대상) AS 일반관리대상
                      , SUM(tgt.중점관리대상) AS 중점관리대상
-                     , SUM(tgt.대마qy) AS 대마qy
-                     , SUM(tgt.마약qy) AS 마약qy
-                     , SUM(tgt.한외마약qy) AS 한외마약qy
-                     , SUM(tgt.향정qy) AS 향정qy
-                     , SUM(tgt.향정제외qy) AS 향정제외qy
-                     , SUM(tgt.기타qy) AS 기타qy
-                     , SUM(tgt.비마약류qy) AS 비마약류qy
-                     , SUM(tgt.일반관리대상qy) AS 일반관리대상qy
-                     , SUM(tgt.중점관리대상qy) AS 중점관리대상qy
+                     , SUM(tgt.대마Qy) AS 대마Qy
+                     , SUM(tgt.마약Qy) AS 마약Qy
+                     , SUM(tgt.한외마약Qy) AS 한외마약Qy
+                     , SUM(tgt.향정Qy) AS 향정Qy
+                     , SUM(tgt.향정제외Qy) AS 향정제외Qy
+                     , SUM(tgt.기타Qy) AS 기타Qy
+                     , SUM(tgt.비마약류Qy) AS 비마약류Qy
+                     , SUM(tgt.일반관리대상Qy) AS 일반관리대상Qy
+                     , SUM(tgt.중점관리대상Qy) AS 중점관리대상Qy
                   FROM tgt
                ) T
 		  LEFT JOIN tb_dept td
@@ -129,22 +129,22 @@
              AND tdm.dsuse_mth_cd = tcc.code)
         WHERE tdm.use_yn = 'Y'
         <if test="deptCd != null and deptCd != ''">
-            AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
+          AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
         </if>
         <if test="schDateFrom != null">
-            AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
+          AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
         </if>
         <if test="schDateTo != null">
-            AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
+          AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
         </if>
         <if test="schSttsCd != null">
-            AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
+          AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
         </if>
         <if test="nrcdSeNm != null">
-            AND tpi.nrcd_se_nm = #{nrcdSeNm}        <!-- 진행 상태 -->
+          AND tpi.nrcd_se_nm = #{nrcdSeNm}        <!-- 진행 상태 -->
         </if>
         <if test="prtmSeNm != null">
-            AND tpi.prtm_se_nm = #{prtmSeNm}        <!-- 진행 상태 -->
+          AND tpi.prtm_se_nm = #{prtmSeNm}        <!-- 진행 상태 -->
         </if>
     </select>
 
@@ -225,49 +225,49 @@
     <select id="selectDsuseMgtDsuseQyByPrdStatisticsDtls" parameterType="map" resultType="dataobject">
         /* 제품별 폐기 현황 상세 목록 */
         SELECT ROW_NUMBER() over (ORDER BY tdm.dept_cd, tdm.dsuse_de DESC, tdm.dsuse_mth_cd) AS ROW_NUM
-        , tdm.dept_cd
-        , td.dept_nm
-        , tdm.dsuse_de
-        , tcc.code_val AS prgrs_stts_nm
-        , tcc2.code_val AS dsuse_mth_nm
-        , tbi.bssh_nm
-        , tbi.rprsntv_nm
-        , tdm.dscdmng_id
-        , tdm.rnd_dtl_rpt_cnt
-        , tdmd.prduct_cd
-        , tpi.prduct_nm
-        , tdmd.dsuse_qy
+             , tdm.dept_cd
+             , td.dept_nm
+             , tdm.dsuse_de
+             , tcc.code_val AS prgrs_stts_nm
+             , tcc2.code_val AS dsuse_mth_nm
+             , tbi.bssh_nm
+             , tbi.rprsntv_nm
+             , tdm.dscdmng_id
+             , tdm.rnd_dtl_rpt_cnt
+             , tdmd.prduct_cd
+             , tpi.prduct_nm
+             , tdmd.dsuse_qy
         FROM tb_dsuse_mgt tdm
         JOIN tb_dsuse_mgt_dtl tdmd
-        ON tdm.dscdmng_id = tdmd.dscdmng_id
+          ON tdm.dscdmng_id = tdmd.dscdmng_id
         JOIN tb_prduct_info tpi
-        ON tdmd.prduct_cd = tpi.prduct_cd
+          ON tdmd.prduct_cd = tpi.prduct_cd
         JOIN tb_dept td
-        ON tdm.dept_cd = td.dept_cd
+          ON tdm.dept_cd = td.dept_cd
         JOIN tb_bssh_info tbi
-        ON tdm.bssh_cd = tbi.bssh_cd
+          ON tdm.bssh_cd = tbi.bssh_cd
         LEFT JOIN tb_cmn_code tcc
-        ON (tcc.grp_id = 'ADDS11'
-        AND tdm.prgrs_stts_cd = tcc.code)
+          ON (tcc.grp_id = 'ADDS11'
+         AND tdm.prgrs_stts_cd = tcc.code)
         LEFT JOIN tb_cmn_code tcc2
-        ON (tcc2.grp_id = 'ADDS05'
-        AND tdm.dsuse_mth_cd = tcc2.code)
-        WHERE tdm.use_yn = 'Y'
-          AND tpi.prduct_cd = #{prductCd}
+          ON (tcc2.grp_id = 'ADDS05'
+         AND tdm.dsuse_mth_cd = tcc2.code)
+       WHERE tdm.use_yn = 'Y'
+         AND tpi.prduct_cd = #{prductCd}
         <if test="deptCd != null and deptCd != ''">
-            AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
+         AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
         </if>
         <if test="schDateFrom != null">
-            AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
+         AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
         </if>
         <if test="schDateTo != null">
-            AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
+         AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
         </if>
         <if test="schSttsCd != null">
-            AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
+         AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
         </if>
         <if test="prgrsSttsCd != null">
-            AND tdm.prgrs_stts_cd = #{prgrsSttsCd}        <!-- 진행 상태 -->
+         AND tdm.prgrs_stts_cd = #{prgrsSttsCd}        <!-- 진행 상태 -->
         </if>
     </select>
 
@@ -363,45 +363,45 @@
     <select id="selectDsuseMgtDsuseQyByIndutyStatisticsDtls" parameterType="map" resultType="dataobject">
         /* 취급 업종별 폐기 현황 상세 목록 */
         SELECT ROW_NUMBER() over (ORDER BY tdm.dept_cd, tdm.dsuse_de DESC, tdm.dsuse_mth_cd) AS ROW_NUM
-        , tdm.dept_cd
-        , td.dept_nm
-        , tdm.dsuse_de
-        , tcc.code_val AS dsuse_mth_nm
-        , tbi.bssh_nm
-        , tbi.rprsntv_nm
-        , tbi.induty_nm
-        , tdm.dscdmng_id
-        , tdm.rnd_dtl_rpt_cnt
-        , tdmd.prduct_cd
-        , tpi.prduct_nm
-        , tdmd.dsuse_qy
+             , tdm.dept_cd
+             , td.dept_nm
+             , tdm.dsuse_de
+             , tcc.code_val AS dsuse_mth_nm
+             , tbi.bssh_nm
+             , tbi.rprsntv_nm
+             , tbi.induty_nm
+             , tdm.dscdmng_id
+             , tdm.rnd_dtl_rpt_cnt
+             , tdmd.prduct_cd
+             , tpi.prduct_nm
+             , tdmd.dsuse_qy
         FROM tb_dsuse_mgt tdm
         JOIN tb_dsuse_mgt_dtl tdmd
-        ON tdm.dscdmng_id = tdmd.dscdmng_id
+          ON tdm.dscdmng_id = tdmd.dscdmng_id
         JOIN tb_prduct_info tpi
-        ON tdmd.prduct_cd = tpi.prduct_cd
+          ON tdmd.prduct_cd = tpi.prduct_cd
         JOIN tb_dept td
-        ON tdm.dept_cd = td.dept_cd
+          ON tdm.dept_cd = td.dept_cd
         JOIN tb_bssh_info tbi
-        ON tdm.bssh_cd = tbi.bssh_cd
+          ON tdm.bssh_cd = tbi.bssh_cd
         LEFT JOIN tb_cmn_code tcc
-        ON (tcc.grp_id = 'ADDS05'
-        AND tdm.dsuse_mth_cd = tcc.code)
-        WHERE tdm.use_yn = 'Y'
+          ON (tcc.grp_id = 'ADDS05'
+         AND tdm.dsuse_mth_cd = tcc.code)
+       WHERE tdm.use_yn = 'Y'
         <if test="deptCd != null and deptCd != ''">
-            AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
+         AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
         </if>
         <if test="schDateFrom != null">
-            AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
+         AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
         </if>
         <if test="schDateTo != null">
-            AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
+         AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
         </if>
         <if test="schSttsCd != null">
-            AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
+         AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
         </if>
         <if test="indutyNm != null">
-            AND tbi.induty_nm = #{indutyNm}        <!-- 진행 상태 -->
+         AND tbi.induty_nm = #{indutyNm}        <!-- 진행 상태 -->
         </if>
     </select>
 
@@ -486,49 +486,49 @@
     <select id="selectDsuseMgtDsuseQyByBsshStatisticsDtls" parameterType="map" resultType="dataobject">
         /* 마약류 취급자별 상세 목록 */
         SELECT ROW_NUMBER() over (ORDER BY tdm.dept_cd, tdm.dsuse_de DESC, tdm.dsuse_mth_cd) AS ROW_NUM
-        , tdm.dept_cd
-        , td.dept_nm
-        , tdm.dsuse_de
-        , tcc.code_val AS prgrs_stts_nm
-        , tcc2.code_val AS dsuse_mth_nm
-        , tbi.bssh_nm
-        , tbi.rprsntv_nm
-        , tdm.dscdmng_id
-        , tdm.rnd_dtl_rpt_cnt
-        , tdmd.prduct_cd
-        , tpi.prduct_nm
-        , tdmd.dsuse_qy
+             , tdm.dept_cd
+             , td.dept_nm
+             , tdm.dsuse_de
+             , tcc.code_val AS prgrs_stts_nm
+             , tcc2.code_val AS dsuse_mth_nm
+             , tbi.bssh_nm
+             , tbi.rprsntv_nm
+             , tdm.dscdmng_id
+             , tdm.rnd_dtl_rpt_cnt
+             , tdmd.prduct_cd
+             , tpi.prduct_nm
+             , tdmd.dsuse_qy
         FROM tb_dsuse_mgt tdm
         JOIN tb_dsuse_mgt_dtl tdmd
-        ON tdm.dscdmng_id = tdmd.dscdmng_id
+          ON tdm.dscdmng_id = tdmd.dscdmng_id
         JOIN tb_prduct_info tpi
-        ON tdmd.prduct_cd = tpi.prduct_cd
+          ON tdmd.prduct_cd = tpi.prduct_cd
         JOIN tb_dept td
-        ON tdm.dept_cd = td.dept_cd
+          ON tdm.dept_cd = td.dept_cd
         JOIN tb_bssh_info tbi
-        ON tdm.bssh_cd = tbi.bssh_cd
+          ON tdm.bssh_cd = tbi.bssh_cd
         LEFT JOIN tb_cmn_code tcc
-        ON (tcc.grp_id = 'ADDS11'
-        AND tdm.prgrs_stts_cd = tcc.code)
+          ON (tcc.grp_id = 'ADDS11'
+         AND tdm.prgrs_stts_cd = tcc.code)
         LEFT JOIN tb_cmn_code tcc2
-        ON (tcc2.grp_id = 'ADDS05'
-        AND tdm.dsuse_mth_cd = tcc2.code)
-        WHERE tdm.use_yn = 'Y'
-        AND tdm.bssh_cd = #{bsshCd}
+          ON (tcc2.grp_id = 'ADDS05'
+         AND tdm.dsuse_mth_cd = tcc2.code)
+       WHERE tdm.use_yn = 'Y'
+         AND tdm.bssh_cd = #{bsshCd}
         <if test="deptCd != null and deptCd != ''">
-            AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
+         AND tdm.dept_cd = #{deptCd}    <!-- 관할 관청 -->
         </if>
         <if test="schDateFrom != null">
-            AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
+         AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom}    <!-- 폐기 일자 시작 -->
         </if>
         <if test="schDateTo != null">
-            AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
+         AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo}      <!-- 폐기 일자 종료 -->
         </if>
         <if test="schSttsCd != null">
-            AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
+         AND tdm.prgrs_stts_cd = #{schSttsCd}        <!-- 진행 상태 -->
         </if>
         <if test="prgrsSttsCd != null">
-            AND tdm.prgrs_stts_cd = #{prgrsSttsCd}        <!-- 진행 상태 -->
+         AND tdm.prgrs_stts_cd = #{prgrsSttsCd}        <!-- 진행 상태 -->
         </if>
     </select>
 </mapper>

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp

@@ -146,6 +146,18 @@
 			, dataGetter: obj => obj.${infoPrefix}List
 			, appendData: true
 			, infoSize: "xl"
+			, formats: {
+				receiptCnt: numberFormat
+				, receiptQy: numberFormat
+				, rsltCnt: numberFormat
+				, rsltQy: numberFormat
+				, mappingCnt: numberFormat
+				, mappingQy: numberFormat
+				, cpltCnt: numberFormat
+				, cpltQy: numberFormat
+				, dsuseCnt: numberFormat
+				, dsuseQy: numberFormat
+			}
 		});
 		// $P.control 설정
 		$P.control.defaultFetchSize = FETCH_XXS;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp

@@ -150,6 +150,24 @@
 			, dataGetter: obj => obj.${infoPrefix}List
 			, appendData: true
 			, infoSize: "xl"
+			, formats: {
+				마약류취급의료업: numberFormat
+				, 마약류취급의료업Qy: numberFormat
+				, 마약류소매업: numberFormat
+				, 마약류소매업Qy: numberFormat
+				, 마약류도매업: numberFormat
+				, 마약류도매업Qy: numberFormat
+				, 마약류제조업: numberFormat
+				, 마약류제조업Qy: numberFormat
+				, 마약류수출입업: numberFormat
+				, 마약류수출입업Qy: numberFormat
+				, 마약류원료사용: numberFormat
+				, 마약류원료사용Qy: numberFormat
+				, 마약류취급학술연구: numberFormat
+				, 마약류취급학술연구Qy: numberFormat
+				, dsuseCnt: numberFormat
+				, dsuseQy: numberFormat
+			}
 		});
 		// $P.control 설정
 		$P.control.defaultFetchSize = FETCH_XXS;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp

@@ -145,6 +145,16 @@
 			, appendData: true
 			, infoSize: "xl"
 			, formats: {
+				receiptCnt: numberFormat
+				, receiptQy: numberFormat
+				, rsltCnt: numberFormat
+				, rsltQy: numberFormat
+				, mappingCnt: numberFormat
+				, mappingQy: numberFormat
+				, cpltCnt: numberFormat
+				, cpltQy: numberFormat
+				, dsuseCnt: numberFormat
+				, dsuseQy: numberFormat
 			}
 		});
 		// $P.control 설정

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp

@@ -94,15 +94,15 @@
 				<template id="${infoPrefix}Row--${pageName}">
 					<tr data-key="{dept_cd}" class="{fw-bold-if-total}">
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dept_nm}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="대마">{대마} / {대마qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="마약">{마약} / {마약qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="한외마약">{한외마약} / {한외마약qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="향정">{향정} / {향정qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="향정제외">{향정제외} / {향정제외qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="기타">{기타} / {기타qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="prtmSeNm" data-val="비마약류">{비마약류} / {비마약류qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="prtmSeNm" data-val="일반관리대상">{일반관리대상} / {일반관리대상qy}</td>
-						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="prtmSeNm" data-val="중점관리대상">{중점관리대상} / {중점관리대상qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="대마">{대마} / {대마Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="마약">{마약} / {마약Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="한외마약">{한외마약} / {한외마약Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="향정">{향정} / {향정Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="향정제외">{향정제외} / {향정제외Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="NrcdSeNm" data-val="기타">{기타} / {기타Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="prtmSeNm" data-val="비마약류">{비마약류} / {비마약류Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="prtmSeNm" data-val="일반관리대상">{일반관리대상} / {일반관리대상Qy}</td>
+						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="prtmSeNm" data-val="중점관리대상">{중점관리대상} / {중점관리대상Qy}</td>
 						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="" data-val="dsuseCnt">{dsuseCnt}</td>
 						<td class="text-end text-blue" onclick="{onclick}" ondblclick="{ondblclick}" data-div="" data-val="dsuseQy">{dsuseQy}</td>
 					</tr>
@@ -157,8 +157,26 @@
 			, appendData: true
 			, infoSize: "xl"
 			, formats: {
-				마약향정계: numberFormat
-				, 마약향정계Qy: numberFormat
+				대마: numberFormat
+				, 대마Qy: numberFormat
+				, 마약: numberFormat
+				, 마약Qy: numberFormat
+				, 한외마약: numberFormat
+				, 한외마약Qy: numberFormat
+				, 향정: numberFormat
+				, 향정Qy: numberFormat
+				, 향정제외: numberFormat
+				, 향정제외Qy: numberFormat
+				, 기타: numberFormat
+				, 기타Qy: numberFormat
+				, 비마약류: numberFormat
+				, 비마약류Qy: numberFormat
+				, 일반관리대상: numberFormat
+				, 일반관리대상Qy: numberFormat
+				, 중점관리대상: numberFormat
+				, 중점관리대상Qy: numberFormat
+				, dsuseCnt: numberFormat
+				, dsuseQy: numberFormat
 			}
 		});
 		// $P.control 설정