.

CLIP.e-Form.Consent.Dfh.Web/HospitalSvc.asmx.cs

@@ -100,25 +100,43 @@ namespace CLIP.eForm.Consent.Dfh.WebService {
     }
 
     [WebMethod(Description = "로그인")]
-    public UserLoginDeptList doLogin(string userid, string pwd) {
+    public UserLoginDeptList doLogin(string userid, string md5Pw, string sha256Pw)
+    {
       MobileLoginResult mobileLoginResult = new MobileLoginResult();
       UserLoginDeptList userLoginDeptList = new UserLoginDeptList();
-      try {
-        using (UserDac dac = new UserDac()) {
+      try
+      {
+        using (UserDac dac = new UserDac())
+        {
+          string pwd = "";
           Hashtable param = new Hashtable();
           param.Add("userid", userid);
 
           mobileLoginResult = dac.doLogin(this.IbatisMapper, param);
 
-          if (mobileLoginResult == null) {
+          if (mobileLoginResult == null)
+          {
             return null;
           }
 
+          if (mobileLoginResult.pwd.Length == 64)
+          {
+            pwd = sha256Pw;
+          }
+          else
+          {
+            pwd = md5Pw;
+          }
+
           //CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Debug("pwd -- > " + pwd);
           //CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Debug("mobileLoginResult.pwd -- > " + mobileLoginResult.pwd);
-          if (mobileLoginResult.pwd != pwd) {
-            if (pwd.Equals("47915507fe3d9bf4c2ea961c8b808d4a")) {
-            } else {
+          if (mobileLoginResult.pwd != pwd)
+          {
+            if (pwd.Equals("47915507fe3d9bf4c2ea961c8b808d4a"))
+            {
+            }
+            else
+            {
               return null;
             }
           }
@@ -127,13 +145,16 @@ namespace CLIP.eForm.Consent.Dfh.WebService {
 
           return userLoginDeptList;
         }
-      } catch (Exception ex) {
+      }
+      catch (Exception ex)
+      {
         CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Debug(string.Format("CLIP.eForm error: {0}", ex.Message));
         throw ex;
       }
 
       //return null;
     }
+
     [WebMethod(Description = "사용자 상세정보")]
     public UserVO GetUserInfo(string userNo) {
       UserVO user = new UserVO();

CLIP.e-Form.Consent.Dfh.Web/obj/Debug/Package/PackageTmp/Conf/ConsentSvcOracleMap.config

@@ -11,8 +11,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   
   <database>
     <provider name="oracleClient2.0" />
-    <dataSource name="DfhHospitalDB" connectionString="Data Source=192.168.100.53:1525/EDU112;Persist Security Info=True;User ID=CMR;Password=CMR#DB1182;Unicode=True;"/>
-    <!--<dataSource name="DfhHospitalDB" connectionString="Data Source=192.168.100.115:1525/EDU112;Persist Security Info=True;User ID=CMR;Password=CMR#DB1182;Unicode=True;"/>-->
+    <!--<dataSource name="DfhHospitalDB" connectionString="Data Source=192.168.100.53:1525/EDU112;Persist Security Info=True;User ID=CMR;Password=CMR#DB1182;Unicode=True;"/>-->
+    <dataSource name="DfhConsentDB" connectionString="Data Source=EMR1111;Persist Security Info=True;User ID=CMR;Password=CMR#fnu57632;Unicode=True;" />
 
     <!--<dataSource name="DfhConsentDB" connectionString="Data Source=localhost/orcl;Persist Security Info=True;User ID=dfh_user;Password=dfh_user;Unicode=True;"/>-->
     <!--<dataSource name="DfhConsentDB" connectionString="Data Source=CUHTEST_DUMMY;Persist Security Info=True;User ID=cnuh_user;Password=cnuh_user;Unicode=True;"/>

CLIP.e-Form.Consent.Dfh.Web/obj/Debug/Package/PackageTmp/Conf/HospitalSvcOracleMap.config

@@ -11,8 +11,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <database>
     <provider name="oracleClient2.0" />
-    <dataSource name="DfhHospitalDB" connectionString="Data Source=192.168.100.53:1525/EDU112;Persist Security Info=True;User ID=CMR;Password=CMR#DB1182;Unicode=True;"/>
-    <!--<dataSource name="DfhHospitalDB" connectionString="Data Source=192.168.100.115:1525/EDU112;Persist Security Info=True;User ID=CMR;Password=CMR#DB1182;Unicode=True;"/>-->
+    <!--<dataSource name="DfhHospitalDB" connectionString="Data Source=192.168.100.53:1525/EDU112;Persist Security Info=True;User ID=CMR;Password=CMR#DB1182;Unicode=True;"/>-->
+    <dataSource name="DfhHospitalDB" connectionString="Data Source=EMR1111;Persist Security Info=True;User ID=CMR;Password=CMR#fnu57632;Unicode=True;"/>
 
 
     <!--<dataSource name="DfhHospitalDB" connectionString="Data Source=localhost/orcl;Persist Security Info=True;User ID=dfh_user;Password=dfh_user;Unicode=True;"/>-->

CLIP.e-Form.Consent.Dfh.Web/obj/Debug/Package/PackageTmp/OracleQuery/CLIP.e-Form.Consent.Dfh.FormRepository.xml

@@ -64,8 +64,8 @@
 
     <statement id="GET_FORM_GUID_BY_FORM_CD" parameterClass="System.Collections.Hashtable" resultClass="String">
       SELECT FORM_GUID FROM V_EFORM_FORMDOC WHERE FORM_CD = #formCd#
-    </statement>    
-  
+    </statement>
+
     <statement id="GET_CONSENT_LIST" parameterClass="System.Collections.Hashtable" resultMap="ConsentMap">
       <![CDATA[
         SELECT CM.CONSENT_MST_RID
@@ -281,6 +281,13 @@
                      WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image3' THEN '\\192.168.100.71\image_a03' || SUBSTR(IMAGE_PATH,7)
                      WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image4' THEN '\\192.168.100.71\image_a04' || SUBSTR(IMAGE_PATH,7)
                      WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image5' THEN '\\192.168.100.71\image_a05' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image6' THEN '\\192.168.100.71\image_a06' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image7' THEN '\\192.168.100.72\image_a07' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image8' THEN '\\192.168.100.72\image_a08' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image9' THEN '\\192.168.100.72\image_a09' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image10' THEN '\\192.168.100.72\image_a10' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image11' THEN '\\192.168.100.72\image_a11' || SUBSTR(IMAGE_PATH,7)
+		     WHEN SUBSTR(IMAGE_PATH,0,6) = 'Image12' THEN '\\192.168.100.72\image_a12' || SUBSTR(IMAGE_PATH,7)
                      ELSE IMAGE_PATH
                  END IMAGE_PATH
               , IMAGE_FILENAME

CLIP.e-Form.Consent.Dfh.Web/obj/Debug/Package/PackageTmp/OracleQuery/CLIP.e-Form.Hospital.Dfh.PatList.xml

@@ -100,7 +100,7 @@
           </isEqual>
         </isEqual>
       </isNotEmpty>
-        <![CDATA[
+      <![CDATA[
           WHERE inpt.histstat  = 'Y'
             AND inpt.mskind    = 'M'
             AND icdr.ordtype   IN ('I', 'D')
@@ -139,7 +139,7 @@
           AND icdr.indschacptstat IN ('D', 'T')
         </isEqual>
         <isEqual property="patstat" compareValue="P">
-          AND inpt.indd = #srchdd# 
+          AND inpt.indd = #srchdd#
         </isEqual>
         <isEqual property="patstat" compareValue="F">
           AND inpt.careinrmtm != '-'
@@ -157,10 +157,10 @@
       <isEmpty property="patstat">
         AND icdr.indschacptstat IN ('A', 'D', 'T')
       </isEmpty>
-       order by roomcd,
-                hngnm
+      order by roomcd,
+      hngnm
     </statement>
-   
+
     <statement id="getOutPatList"  parameterClass="System.Collections.Hashtable" resultMap="PatListMap">
       <![CDATA[
       SELECT otpt.pid                                                                 AS pid,
@@ -240,25 +240,25 @@
            
         
         ]]>
-      
+
       AND otpt.orddd    = #srchdd#
 
 
       AND otpt.instcd   = #instcd#
       <isNotEmpty property="pid">
-           AND otpt.pid      = #pid#
+        AND otpt.pid      = #pid#
       </isNotEmpty>
       <isNotEmpty property="patstat">
         <isEqual property="patstat" compareValue="C">
           and exists (select 1
-                        from cmr.consent_mst mst
-                       where mst.hos_type = otpt.instcd
-                             and mst.visit_type = otpt.ordtype
-                             and mst.pid = otpt.pid
-                             and mst.cln_date = otpt.orddd
-					              and mst.cretno = otpt.cretno
-                             and mst.consent_state in ('UNFINISHED')
-					              and mst.use_yn = 'Y')
+          from cmr.consent_mst mst
+          where mst.hos_type = otpt.instcd
+          and mst.visit_type = otpt.ordtype
+          and mst.pid = otpt.pid
+          and mst.cln_date = otpt.orddd
+          and mst.cretno = otpt.cretno
+          and mst.consent_state in ('UNFINISHED')
+          and mst.use_yn = 'Y')
         </isEqual>
         <isNotEqual property="patstat" compareValue="C">
           AND otpt.elbulbodstat = #patstat#
@@ -266,26 +266,26 @@
       </isNotEmpty>
       <isNotEmpty property="orddeptcd">
         <isEqual property="orddeptcd" compareValue="2040000000">
-        		AND     otpt.orddeptcd in ('2040000000', '2040400000')
-   			</isEqual>
-      	<isEqual property="orddeptcd" compareValue="2040400000">
-		        AND     otpt.orddeptcd in ('2040000000', '2040400000')
-	    	</isEqual>
-    		<isNotEqual property="orddeptcd" compareValue="2040400000">
-    			<isNotEqual property="orddeptcd" compareValue="2040000000">
-		        AND otpt.orddeptcd = #orddeptcd#
-		    	</isNotEqual>
-	  		</isNotEqual>
+          AND     otpt.orddeptcd in ('2040000000', '2040400000')
+        </isEqual>
+        <isEqual property="orddeptcd" compareValue="2040400000">
+          AND     otpt.orddeptcd in ('2040000000', '2040400000')
+        </isEqual>
+        <isNotEqual property="orddeptcd" compareValue="2040400000">
+          <isNotEqual property="orddeptcd" compareValue="2040000000">
+            AND otpt.orddeptcd = #orddeptcd#
+          </isNotEqual>
+        </isNotEqual>
       </isNotEmpty>
       <isNotEmpty property="orddrid">
         AND otpt.orddrid      = #orddrid#
       </isNotEmpty>
-           AND otpt.etcordflag NOT IN ('M','J')
-         
-            ORDER BY dept.deptengabbr, ptbs.hngnm, usrb.usernm, otpt.ordtm
-       
+      AND nvl(otpt.etcordflag,'-') NOT IN ('M','J')    --2020.12.16 일자로 쿼리수정
+
+      ORDER BY dept.deptengabbr, ptbs.hngnm, usrb.usernm, otpt.ordtm
+
     </statement>
-   
+
     <statement id="getOpPatList" parameterClass="System.Collections.Hashtable" resultMap="OpPatListMap">
       <![CDATA[
          SELECT oprs.pid as pid,
@@ -410,42 +410,42 @@
       
       ]]>
       <isNotEmpty property="orddeptcd">
-          <isEqual property="orddeptcd" compareValue="2040000000">
-        		AND oprs.perfdeptcd in ('2040000000', '2040400000')
-    	    </isEqual>
-		      <isEqual property="orddeptcd" compareValue="2040400000">
-		        AND oprs.perfdeptcd in ('2040000000', '2040400000')
-		      </isEqual>
-          <isNotEqual property="orddeptcd" compareValue="2040400000">
-    	      <isNotEqual property="orddeptcd" compareValue="2040000000">
-		        AND oprs.perfdeptcd = #orddeptcd#
-		        </isNotEqual>
-		      </isNotEqual>
+        <isEqual property="orddeptcd" compareValue="2040000000">
+          AND oprs.perfdeptcd in ('2040000000', '2040400000')
+        </isEqual>
+        <isEqual property="orddeptcd" compareValue="2040400000">
+          AND oprs.perfdeptcd in ('2040000000', '2040400000')
+        </isEqual>
+        <isNotEqual property="orddeptcd" compareValue="2040400000">
+          <isNotEqual property="orddeptcd" compareValue="2040000000">
+            AND oprs.perfdeptcd = #orddeptcd#
+          </isNotEqual>
+        </isNotEqual>
       </isNotEmpty>
       <isNotEmpty property="orddrid">
-              AND oprs.perfdrid   = #orddrid#
+        AND oprs.perfdrid   = #orddrid#
       </isNotEmpty>
       <isNotEmpty property="pid">
-              AND oprs.pid        = #pid#
+        AND oprs.pid        = #pid#
       </isNotEmpty>
       <isEqual property="opstatcd" compareValue="A">
-       AND oprs.opstatcd IN ('10','20','30','40','50','60','70')
+        AND oprs.opstatcd IN ('10','20','30','40','50','60','70')
       </isEqual>
       <isEqual property="opstatcd" compareValue="M">
-      AND oprs.opstatcd IN ('10','20')
+        AND oprs.opstatcd IN ('10','20')
       </isEqual>
       <isEqual property="opstatcd" compareValue="R">
-      AND oprs.opstatcd = '30'
+        AND oprs.opstatcd = '30'
       </isEqual>
       <isEqual property="opstatcd" compareValue="I">
-      AND oprs.opstatcd = '40'
+        AND oprs.opstatcd = '40'
       </isEqual>
       <isEqual property="opstatcd" compareValue="F">
-      AND oprs.opstatcd IN ('50', '60', '70')
+        AND oprs.opstatcd IN ('50', '60', '70')
       </isEqual>
- ORDER BY oproomnm, oprs.opendtmcd
-</statement>
-    
+      ORDER BY oproomnm, oprs.opendtmcd
+    </statement>
+
     <statement id="getErPatList" parameterClass="System.Collections.Hashtable" resultMap="ErPatListMap">
       <![CDATA[
         SELECT distinct inpt.pid as pid,
@@ -536,7 +536,7 @@
           </isEqual>
         </isEqual>
       </isNotEmpty>
-        <![CDATA[
+      <![CDATA[
           WHERE inpt.histstat = 'Y'
             AND inpt.mskind = 'M'
             AND inpt.indd <= #srchdd#
@@ -552,49 +552,49 @@
             AND inpt.pid = ptbs.pid
             AND inpt.instcd = ptbs.instcd
         ]]>
-       <isNotEmpty property="orddrid">  
-            AND inpt.ermedispclid = #orddrid#
-       </isNotEmpty>
+      <isNotEmpty property="orddrid">
+        AND inpt.ermedispclid = #orddrid#
+      </isNotEmpty>
       <isNotEmpty property="orddeptcd">
         AND inpt.erorddeptcd    = #orddeptcd#
       </isNotEmpty>
       <isNotEmpty property="patstat">
-         <isEqual property="patstat" compareValue="1">     
-         <![CDATA[
+        <isEqual property="patstat" compareValue="1">
+          <![CDATA[
               AND icdr.indschacptstat = 'A' 
               AND   (inpt.eroutdt = '-'  
                   OR inpt.eroutdt = '99991231235959')
               AND   (inpt.dschdd  = '99991231'
                   OR inpt.dschdd  >= #srchdd#)
          ]]>
-         </isEqual>
-         <isEqual property="patstat" compareValue="2"> 
-              AND icdr.indschacptstat = 'A'
-              AND inpt.eroutdt     != '-' 
-              AND inpt.eroutdt     != '99991231235959'
-              AND inpt.dschdd       = '99991231'
-         </isEqual>
-         <isEqual property="patstat" compareValue="3">
-           AND icdr.indschacptstat IN ('A', 'D', 'T')
-           AND inpt.dschdd = #srchdd#
-         </isEqual>
-         <isEqual property="patstat" compareValue="C">   
-           and inpt.instcd = mst.hos_type
-           and inpt.pid = mst.pid
-           and inpt.cretno = mst.cretno
-           and inpt.ordtype = mst.visit_type
-           and mst.use_yn = 'Y'
-           and mst.consent_state = 'UNFINISHED'
-           and inpt.indd = mst.cln_date
-           and docu.FORM_RID = mst.form_rid
+        </isEqual>
+        <isEqual property="patstat" compareValue="2">
+          AND icdr.indschacptstat = 'A'
+          AND inpt.eroutdt     != '-'
+          AND inpt.eroutdt     != '99991231235959'
+          AND inpt.dschdd       = '99991231'
+        </isEqual>
+        <isEqual property="patstat" compareValue="3">
+          AND icdr.indschacptstat IN ('A', 'D', 'T')
+          AND inpt.dschdd = #srchdd#
+        </isEqual>
+        <isEqual property="patstat" compareValue="C">
+          and inpt.instcd = mst.hos_type
+          and inpt.pid = mst.pid
+          and inpt.cretno = mst.cretno
+          and inpt.ordtype = mst.visit_type
+          and mst.use_yn = 'Y'
+          and mst.consent_state = 'UNFINISHED'
+          and inpt.indd = mst.cln_date
+          and docu.FORM_RID = mst.form_rid
         </isEqual>
       </isNotEmpty>
-       <isNotEmpty property="pid">
-            AND inpt.pid = #pid#
-       </isNotEmpty>
- order by indd  desc,
-          intm  desc,
-          hngnm asc
+      <isNotEmpty property="pid">
+        AND inpt.pid = #pid#
+      </isNotEmpty>
+      order by indd  desc,
+      intm  desc,
+      hngnm asc
     </statement>
 
     <statement id="getSrchPatInfo" parameterClass="System.Collections.Hashtable" resultMap="PatInfoListMap">
@@ -777,7 +777,7 @@
         ]]>
     </statement>
     -->
-    
+
     <statement id="getDeptList" parameterClass="System.Collections.Hashtable" resultMap="DeptListMap">
       <![CDATA[
       SELECT ' ' as deptcd,
@@ -814,48 +814,48 @@
         ORDER BY clincdeptdispseq ASC
       </isNotEqual>
     </statement>
-    
+
     <statement id="getDocList" parameterClass="System.Collections.Hashtable" resultMap="DocListMap">
       SELECT ' ' as doctorid,
-             '진료의' as doctornm,
-             1 as sort
-             from dual
+      '진료의' as doctornm,
+      1 as sort
+      from dual
       UNION ALL
       SELECT b.userid       AS doctorid,
-               b.usernm       AS doctornm,
-               2 as sort
-          FROM com.zsumusrd a
-               INNER JOIN com.zsumusrb b ON  a.userid  = b.userid
-         WHERE a.psnworkyn = 'N'
-           AND a.dutplceinstcd = #instcd#
-           AND a.jobkindcd LIKE '03%'
-          <isNotEmpty property="orddeptcd">
-           	<isEqual property="orddeptcd" compareValue="2040000000">
+      b.usernm       AS doctornm,
+      2 as sort
+      FROM com.zsumusrd a
+      INNER JOIN com.zsumusrb b ON  a.userid  = b.userid
+      WHERE a.psnworkyn = 'N'
+      AND a.dutplceinstcd = #instcd#
+      AND a.jobkindcd LIKE '03%'
+      <isNotEmpty property="orddeptcd">
+        <isEqual property="orddeptcd" compareValue="2040000000">
 
-        		AND     a.dutplcecd in ('2040000000', '2040400000')
+          AND     a.dutplcecd in ('2040000000', '2040400000')
 
-    			  </isEqual>
-		    	  <isEqual property="orddeptcd" compareValue="2040400000">
-		
-		        AND     a.dutplcecd in ('2040000000', '2040400000')
-		
-		    	  </isEqual>
-    		    <isNotEqual property="orddeptcd" compareValue="2040400000">
-    			    <isNotEqual property="orddeptcd" compareValue="2040000000">
-                <isNotEqual property="orddeptcd" compareValue="4120300000">
-                  AND a.dutplcecd = #orddeptcd#
-                </isNotEqual>
-                <isEqual property="orddeptcd" compareValue="4120300000">
-                  and a.userid = '103043'
-                </isEqual>
-		    	    </isNotEqual>
-			      </isNotEqual>
-			    </isNotEmpty>
-           AND #srchdd# BETWEEN a.fromdd AND a.todd
-           AND #srchdd# BETWEEN b.userfromdd AND b.usertodd
+        </isEqual>
+        <isEqual property="orddeptcd" compareValue="2040400000">
+
+          AND     a.dutplcecd in ('2040000000', '2040400000')
+
+        </isEqual>
+        <isNotEqual property="orddeptcd" compareValue="2040400000">
+          <isNotEqual property="orddeptcd" compareValue="2040000000">
+            <isNotEqual property="orddeptcd" compareValue="4120300000">
+              AND a.dutplcecd = #orddeptcd#
+            </isNotEqual>
+            <isEqual property="orddeptcd" compareValue="4120300000">
+              and a.userid = '103043'
+            </isEqual>
+          </isNotEqual>
+        </isNotEqual>
+      </isNotEmpty>
+      AND #srchdd# BETWEEN a.fromdd AND a.todd
+      AND #srchdd# BETWEEN b.userfromdd AND b.usertodd
       ORDER BY sort, doctorid
-    </statement>    
-    
+    </statement>
+
     <statement id="getWardList" parameterClass="System.Collections.Hashtable" resultMap="DeptListMap">
       <![CDATA[
       
@@ -877,6 +877,6 @@
          order by sort, deptnm asc
       ]]>
     </statement>
-    
+
   </statements>
 </sqlMap>