consentApi/bin/main/mybatis/mapper/ConsentMapper.xml

@@ -188,7 +188,7 @@
       
     </if>
     <if test='patientCode != "" and patientCode != null'>
-      <if test='userId == "" and userId == null'>
+      <if test='userId == "" or userId == null'>
         <![CDATA[
           AND CMT.PID = #{patientCode}
         ]]>
@@ -201,6 +201,7 @@
     </if>
     <![CDATA[
           AND TO_CHAR(TO_DATE(CMT.MODIFY_DATETIME, 'YYYY-MM-DD HH24:MI:SS'), 'YYYYMMDD') BETWEEN #{startDt} AND #{endDt}
+          AND CMT.USE_YN = 'Y'
           AND CMT.FORM_CD = CF.FORM_CODE
           AND CF.PRODUCT_ID = 1
           AND CF.FORM_TYPE = 'FORM_TYPE_001'
@@ -218,15 +219,15 @@
     <![CDATA[ 
       UPDATE EMA.CONSENT_MST
          SET MODIFY_USER_ID = #{userId},
-             MODIFY_DATETIME = TO_CHAR(SYSDATE, 'yyyy-mm-dd hh24:mi:ss),
-             USE_YN = N,
+             MODIFY_DATETIME = TO_CHAR(SYSDATE, 'yyyy-mm-dd hh24:mi:ss'),
+             USE_YN = 'N',
              REASON_FOR_USE_N = #{reasonForUseN},
              MODIFY_USER_NAME = COM.FN_ZS_GETUSERNM(#{userId}, TO_CHAR(SYSDATE, 'YYYYMMDD'))
        WHERE CONSENT_MST_RID = #{consentMstRid}
     ]]>
   </update>
 
-  <select id="getConsentMstForDeleteOcrTag" parameterType="java.util.HashMap">
+  <select id="getConsentMstForDeleteOcrTag" parameterType="java.util.HashMap" resultType="string">
     <![CDATA[ 
       SELECT OCR_NUMBER AS OCR_TAG
         FROM EMA.CONSENT_MST
@@ -237,7 +238,7 @@
   <update id="updateMrfhOcrPrntStatCd" parameterType="java.util.HashMap">
     <![CDATA[ 
       UPDATE EMR.MRFHOCRPRNT
-         SET STATCD = 'CP,
+         SET STATCD = 'CP',
              LASTUPDTRID = #{userId},
              LASTUPDTDT = TO_CHAR(SYSDATE, 'yyyyMMdd hh24:mi:ss')
        WHERE OCRTAG = #{ocrTag}

consentApi/src/main/java/com/dbs/consentServer/controller/ConsentSvc.java

@@ -186,7 +186,7 @@ public class ConsentSvc {
     HashMap<String, Object> params = new HashMap<String, Object>();
 
     int rCount = 0;
-    String ocrTag = "";
+    // String ocrTag = "";
 
     params.put("userId", userId);
     params.put("consentMstRid", consentMstRid);
@@ -195,22 +195,29 @@ public class ConsentSvc {
     rCount = consentService.updateConsentMstForDelete(params);
 
     if (rCount == 0) {
-      map.put("code", "01");
+      map.put("code", 01);
     } else {
-      ocrTag = consentService.getConsentMstForDeleteOcrTag(params);
-
-      if (!(ocrTag.equals("") || ocrTag.isEmpty())) {
-        params.put("ocrTag", ocrTag);
-        rCount = consentService.updateMrfhOcrPrntStatCd(params);
-
-        if (rCount == 0) {
-          map.put("code", "02");
-        } else {
-          map.put("code", "00");
-          map.put("data", rCount);
-        }
-      }
+      map.put("code", 00);
+      map.put("data", rCount);
     }
+
+    // if (rCount == 0) {
+    //   map.put("code", "01");
+    // } else {
+    //   ocrTag = consentService.getConsentMstForDeleteOcrTag(params);
+
+    //   if (!(ocrTag.equals("") || ocrTag.isEmpty())) {
+    //     params.put("ocrTag", ocrTag);
+    //     rCount = consentService.updateMrfhOcrPrntStatCd(params);
+
+    //     if (rCount == 0) {
+    //       map.put("code", "02");
+    //     } else {
+    //       map.put("code", "00");
+    //       map.put("data", rCount);
+    //     }
+    //   }
+    // }
     result.add(map);
 
     return result;

consentApi/src/main/java/com/dbs/consentServer/service/ConsentService.java

@@ -6,12 +6,16 @@ import java.util.HashMap;
 import com.dbs.consentServer.VO.consentVO.ConsentFormListVO;
 import com.dbs.consentServer.mapper.ConsentMapper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ConsentService {
 
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
   @Autowired
   public ConsentMapper consentMapper;
 
@@ -28,6 +32,7 @@ public class ConsentService {
   }
 
   public Integer updateConsentMstForDelete(HashMap<String, Object> params) {
+    logger.debug("reason -- > " + params.get("reason"));
     return consentMapper.updateConsentMstForDelete(params);
   }
 

consentApi/src/main/resources/mybatis/mapper/ConsentMapper.xml

@@ -188,7 +188,7 @@
       
     </if>
     <if test='patientCode != "" and patientCode != null'>
-      <if test='userId == "" and userId == null'>
+      <if test='userId == "" or userId == null'>
         <![CDATA[
           AND CMT.PID = #{patientCode}
         ]]>
@@ -201,6 +201,7 @@
     </if>
     <![CDATA[
           AND TO_CHAR(TO_DATE(CMT.MODIFY_DATETIME, 'YYYY-MM-DD HH24:MI:SS'), 'YYYYMMDD') BETWEEN #{startDt} AND #{endDt}
+          AND CMT.USE_YN = 'Y'
           AND CMT.FORM_CD = CF.FORM_CODE
           AND CF.PRODUCT_ID = 1
           AND CF.FORM_TYPE = 'FORM_TYPE_001'
@@ -218,15 +219,15 @@
     <![CDATA[ 
       UPDATE EMA.CONSENT_MST
          SET MODIFY_USER_ID = #{userId},
-             MODIFY_DATETIME = TO_CHAR(SYSDATE, 'yyyy-mm-dd hh24:mi:ss),
-             USE_YN = N,
+             MODIFY_DATETIME = TO_CHAR(SYSDATE, 'yyyy-mm-dd hh24:mi:ss'),
+             USE_YN = 'N',
              REASON_FOR_USE_N = #{reasonForUseN},
              MODIFY_USER_NAME = COM.FN_ZS_GETUSERNM(#{userId}, TO_CHAR(SYSDATE, 'YYYYMMDD'))
        WHERE CONSENT_MST_RID = #{consentMstRid}
     ]]>
   </update>
 
-  <select id="getConsentMstForDeleteOcrTag" parameterType="java.util.HashMap">
+  <select id="getConsentMstForDeleteOcrTag" parameterType="java.util.HashMap" resultType="string">
     <![CDATA[ 
       SELECT OCR_NUMBER AS OCR_TAG
         FROM EMA.CONSENT_MST
@@ -237,7 +238,7 @@
   <update id="updateMrfhOcrPrntStatCd" parameterType="java.util.HashMap">
     <![CDATA[ 
       UPDATE EMR.MRFHOCRPRNT
-         SET STATCD = 'CP,
+         SET STATCD = 'CP',
              LASTUPDTRID = #{userId},
              LASTUPDTDT = TO_CHAR(SYSDATE, 'yyyyMMdd hh24:mi:ss')
        WHERE OCRTAG = #{ocrTag}