CLIP.e-Form.Consent.Dac/PatientDac.cs

@@ -44,6 +44,10 @@ namespace CLIP.eForm.Consent.Dac {
       }
     }
 
+    public string checkPatientSaftyMessage(ISqlMapper mapper, Hashtable param) {
+      return mapper.QueryForObject<String>("checkPatientSaftyMessage", param);
+    }
+
     public string GetOcrTag(ISqlMapper mapper, Hashtable param) {
       return mapper.QueryForObject<String>("getOcrTag", param);
     }

CLIP.e-Form.Consent.UI/CLIP.e-Form.Consent.UI.csproj

@@ -269,12 +269,12 @@
     <Compile Include="WebMethodCommon.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Service References\HospitalSvcRef\HospitalSvc1.disco" />
+    <None Include="Service References\ConsentSvcRef\ConsentSvc.disco" />
+    <None Include="Service References\ConsentSvcRef\ConsentSvc.wsdl" />
     <None Include="Service References\HospitalSvcRef\CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\HospitalSvcRef\HospitalSvc.disco" />
-    <None Include="Service References\ConsentSvcRef\ConsentSvc1.disco" />
-    <None Include="Service References\ConsentSvcRef\ConsentSvc1.wsdl" />
     <None Include="Service References\ConsentSvcRef\CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
@@ -338,7 +338,7 @@
     <None Include="Service References\HospitalSvcRef\CLIP.eForm.Consent.UI.HospitalSvcRef.UserVO.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\HospitalSvcRef\HospitalSvc.wsdl" />
+    <None Include="Service References\HospitalSvcRef\HospitalSvc1.wsdl" />
     <None Include="Service References\HospitalSvcRef\Reference.svcmap">
       <Generator>WCF Proxy Generator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>

CLIP.e-Form.Consent.UI/Service References/ConsentSvcRef/ConsentSvc1.disco

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost:8081/ConsentSvc.asmx?wsdl" docRef="http://localhost:8081/ConsentSvc.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://localhost:8081/ConsentSvc.asmx" xmlns:q1="http://tempuri.org/" binding="q1:ConsentSvcSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://localhost:8081/ConsentSvc.asmx" xmlns:q2="http://tempuri.org/" binding="q2:ConsentSvcSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://localhost:8091/ConsentSvc.asmx?wsdl" docRef="http://localhost:8091/ConsentSvc.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://localhost:8091/ConsentSvc.asmx" xmlns:q1="http://tempuri.org/" binding="q1:ConsentSvcSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://localhost:8091/ConsentSvc.asmx" xmlns:q2="http://tempuri.org/" binding="q2:ConsentSvcSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>

CLIP.e-Form.Consent.UI/Service References/ConsentSvcRef/Reference.svcmap

@@ -18,11 +18,11 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="http://localhost:8081/ConsentSvc.asmx" Protocol="http" SourceId="1" />
+    <MetadataSource Address="http://localhost:8091/ConsentSvc.asmx" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="ConsentSvc1.disco" MetadataType="Disco" ID="2c9ab59e-88b8-4666-b82d-88a09833a5b9" SourceId="1" SourceUrl="http://localhost:8081/ConsentSvc.asmx?disco" />
-    <MetadataFile FileName="ConsentSvc1.wsdl" MetadataType="Wsdl" ID="4a4360a8-b9e8-4de9-ace4-e3f65e7eb268" SourceId="1" SourceUrl="http://localhost:8081/ConsentSvc.asmx?wsdl" />
+    <MetadataFile FileName="ConsentSvc.wsdl" MetadataType="Wsdl" ID="08a1834d-fe65-47d0-9375-c1811a466e5e" SourceId="1" SourceUrl="http://localhost:8091/ConsentSvc.asmx?wsdl" />
+    <MetadataFile FileName="ConsentSvc.disco" MetadataType="Disco" ID="0bcb17e9-b777-4e8e-b22e-7242c4af3d3b" SourceId="1" SourceUrl="http://localhost:8091/ConsentSvc.asmx?disco" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />

CLIP.e-Form.Consent.UI/Service References/ConsentSvcRef/configuration91.svcinfo

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="13KSkPi1wRFOjVE2BpyUW8vqhNw=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="wy6IgyjTZbS+b1SKNJ4oU6CPiaQ=">
   <bindingConfigurations>
     <bindingConfiguration bindingType="basicHttpBinding" name="ConsentSvcSoap">
       <properties>
@@ -112,10 +112,10 @@
     </bindingConfiguration>
   </bindingConfigurations>
   <endpoints>
-    <endpoint name="ConsentSvcSoap" contract="ConsentSvcRef.ConsentSvcSoap" bindingType="basicHttpBinding" address="http://localhost:8081/ConsentSvc.asmx" bindingConfiguration="ConsentSvcSoap">
+    <endpoint name="ConsentSvcSoap" contract="ConsentSvcRef.ConsentSvcSoap" bindingType="basicHttpBinding" address="http://localhost:8091/ConsentSvc.asmx" bindingConfiguration="ConsentSvcSoap">
       <properties>
         <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>http://localhost:8081/ConsentSvc.asmx</serializedValue>
+          <serializedValue>http://localhost:8091/ConsentSvc.asmx</serializedValue>
         </property>
         <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue />

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/HospitalSvc.disco

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost:8081/HospitalSvc.asmx?wsdl" docRef="http://localhost:8081/HospitalSvc.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://localhost:8081/HospitalSvc.asmx" xmlns:q1="http://tempuri.org/" binding="q1:HospitalSvcSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://localhost:8081/HospitalSvc.asmx" xmlns:q2="http://tempuri.org/" binding="q2:HospitalSvcSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://localhost:8091/HospitalSvc.asmx?wsdl" docRef="http://localhost:8091/HospitalSvc.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://localhost:8091/HospitalSvc.asmx" xmlns:q1="http://tempuri.org/" binding="q1:HospitalSvcSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://localhost:8091/HospitalSvc.asmx" xmlns:q2="http://tempuri.org/" binding="q2:HospitalSvcSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/Reference.cs

@@ -3539,6 +3539,10 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/GetDoctorList", ReplyAction="*")]
         CLIP.eForm.Consent.UI.HospitalSvcRef.GetDoctorListResponse GetDoctorList(CLIP.eForm.Consent.UI.HospitalSvcRef.GetDoctorListRequest request);
         
+        // CODEGEN: http://tempuri.org/ 네임스페이스의 요소 이름 type이(가) "nillable"로 표시되지 않았으므로 메시지 계약을 생성합니다.
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/checkPatientSafetyMessage", ReplyAction="*")]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageResponse checkPatientSafetyMessage(CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequest request);
+        
         // CODEGEN: http://tempuri.org/ 네임스페이스의 요소 이름 srchcond이(가) "nillable"로 표시되지 않았으므로 메시지 계약을 생성합니다.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/GetSrchPatInfo", ReplyAction="*")]
         CLIP.eForm.Consent.UI.HospitalSvcRef.GetSrchPatInfoResponse GetSrchPatInfo(CLIP.eForm.Consent.UI.HospitalSvcRef.GetSrchPatInfoRequest request);
@@ -4201,6 +4205,90 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         }
     }
     
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(IsWrapped=false)]
+    public partial class checkPatientSafetyMessageRequest {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="checkPatientSafetyMessage", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequestBody Body;
+        
+        public checkPatientSafetyMessageRequest() {
+        }
+        
+        public checkPatientSafetyMessageRequest(CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequestBody Body) {
+            this.Body = Body;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.Runtime.Serialization.DataContractAttribute(Namespace="http://tempuri.org/")]
+    public partial class checkPatientSafetyMessageRequestBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string type;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=1)]
+        public string instCd;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=2)]
+        public string pid;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)]
+        public string orddd;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(Order=4)]
+        public int cretNo;
+        
+        public checkPatientSafetyMessageRequestBody() {
+        }
+        
+        public checkPatientSafetyMessageRequestBody(string type, string instCd, string pid, string orddd, int cretNo) {
+            this.type = type;
+            this.instCd = instCd;
+            this.pid = pid;
+            this.orddd = orddd;
+            this.cretNo = cretNo;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(IsWrapped=false)]
+    public partial class checkPatientSafetyMessageResponse {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="checkPatientSafetyMessageResponse", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageResponseBody Body;
+        
+        public checkPatientSafetyMessageResponse() {
+        }
+        
+        public checkPatientSafetyMessageResponse(CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageResponseBody Body) {
+            this.Body = Body;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.Runtime.Serialization.DataContractAttribute(Namespace="http://tempuri.org/")]
+    public partial class checkPatientSafetyMessageResponseBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string checkPatientSafetyMessageResult;
+        
+        public checkPatientSafetyMessageResponseBody() {
+        }
+        
+        public checkPatientSafetyMessageResponseBody(string checkPatientSafetyMessageResult) {
+            this.checkPatientSafetyMessageResult = checkPatientSafetyMessageResult;
+        }
+    }
+    
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -6397,6 +6485,23 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
             return retVal.Body.GetDoctorListResult;
         }
         
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageResponse CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap.checkPatientSafetyMessage(CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequest request) {
+            return base.Channel.checkPatientSafetyMessage(request);
+        }
+        
+        public string checkPatientSafetyMessage(string type, string instCd, string pid, string orddd, int cretNo) {
+            CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequest inValue = new CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequest();
+            inValue.Body = new CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageRequestBody();
+            inValue.Body.type = type;
+            inValue.Body.instCd = instCd;
+            inValue.Body.pid = pid;
+            inValue.Body.orddd = orddd;
+            inValue.Body.cretNo = cretNo;
+            CLIP.eForm.Consent.UI.HospitalSvcRef.checkPatientSafetyMessageResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).checkPatientSafetyMessage(inValue);
+            return retVal.Body.checkPatientSafetyMessageResult;
+        }
+        
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
         CLIP.eForm.Consent.UI.HospitalSvcRef.GetSrchPatInfoResponse CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap.GetSrchPatInfo(CLIP.eForm.Consent.UI.HospitalSvcRef.GetSrchPatInfoRequest request) {
             return base.Channel.GetSrchPatInfo(request);

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/Reference.svcmap

@@ -18,11 +18,11 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="http://localhost:8081/HospitalSvc.asmx" Protocol="http" SourceId="1" />
+    <MetadataSource Address="http://localhost:8091/HospitalSvc.asmx" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="HospitalSvc.wsdl" MetadataType="Wsdl" ID="6df29b28-7490-481d-b5c4-784809fb1239" SourceId="1" SourceUrl="http://localhost:8081/HospitalSvc.asmx?wsdl" />
-    <MetadataFile FileName="HospitalSvc.disco" MetadataType="Disco" ID="0057f6c0-f676-4956-9200-158f6e9954c6" SourceId="1" SourceUrl="http://localhost:8081/HospitalSvc.asmx?disco" />
+    <MetadataFile FileName="HospitalSvc1.wsdl" MetadataType="Wsdl" ID="496e5ba0-2606-43f6-bc24-82645694d9ff" SourceId="1" SourceUrl="http://localhost:8091/HospitalSvc.asmx?wsdl" />
+    <MetadataFile FileName="HospitalSvc1.disco" MetadataType="Disco" ID="acb7fb96-c445-4c3c-b6c8-b734c52d6c18" SourceId="1" SourceUrl="http://localhost:8091/HospitalSvc.asmx?disco" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/configuration91.svcinfo

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="zG11pdnZAeePrHaWUdT/T6VRaZc=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="+uehglBejlOHixvFKGAYkKyQ+/o=">
   <bindingConfigurations>
     <bindingConfiguration bindingType="basicHttpBinding" name="HospitalSvcSoap">
       <properties>
@@ -112,10 +112,10 @@
     </bindingConfiguration>
   </bindingConfigurations>
   <endpoints>
-    <endpoint name="HospitalSvcSoap" contract="HospitalSvcRef.HospitalSvcSoap" bindingType="basicHttpBinding" address="http://localhost:8081/HospitalSvc.asmx" bindingConfiguration="HospitalSvcSoap">
+    <endpoint name="HospitalSvcSoap" contract="HospitalSvcRef.HospitalSvcSoap" bindingType="basicHttpBinding" address="http://localhost:8091/HospitalSvc.asmx" bindingConfiguration="HospitalSvcSoap">
       <properties>
         <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>http://localhost:8081/HospitalSvc.asmx</serializedValue>
+          <serializedValue>http://localhost:8091/HospitalSvc.asmx</serializedValue>
         </property>
         <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue />

CLIP.e-Form.Consent.UI/SignatureConfig.cs

@@ -105,6 +105,11 @@ namespace CLIP.eForm.Consent.UI {
         CertManX.UnsetMatchedContext();//암호를 새로 물음
         CertManX.SetWrongPasswordLimit(passwordLimitcnt);
 
+        // 공인인증서 유효기간 확인
+        if (kmiAx.Cert_Status(userId, dn) == 2) {
+          return "-35";
+        }
+
         // 비밀번호 입력
         string sPassword = string.Empty;
         SignaturePasswordForm signPasswordForm = new SignaturePasswordForm(userName, userId, dualViewer);

CLIP.e-Form.Consent.UI/UIParts/ConsentCommandCtrl.cs

@@ -971,9 +971,22 @@ namespace CLIP.eForm.Consent.UI {
             string deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
             string hosType = (vo.instCd == null) ? consentMain.ConsentExecuteInfo["dutinstcd"] : vo.instCd;
 
-            if (string.IsNullOrEmpty(userName)) {
-              UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
-              userName = userVo.userName;
+            UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
+            //if (string.IsNullOrEmpty(userName)) {
+            //  var date = CurrentTargetPatient.clnDate;
+            //  userName = userVo.userName;
+            //}
+
+            /**
+            * 선택된 환자의 진료의가 퇴직한 경우 사용자 정보를 가져올 수 없어 로그인 한 사용자의 정보를 매핑하여 준다
+            */
+            var tmpOrddeptcd = CurrentEndUser?.DeptCode ?? String.Empty;
+            if (String.IsNullOrEmpty(tmpOrddeptcd)) {
+              userName = this.consentMain.ConsentExecuteInfo["loginUserName"];
+              deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
+            }
+            else {
+              deptCd = tmpOrddeptcd;
             }
 
             string patientCode = vo.pid;
@@ -1024,7 +1037,7 @@ namespace CLIP.eForm.Consent.UI {
                                                             , userName
                                                             , userName
                                                             , mainDrId
-                                                            , CurrentEndUser.DeptCode
+                                                            , deptCd
                                                             , consentMain.GetTotalPageCount().ToString()
                                                             , "P"
                                                             , "P"
@@ -1068,9 +1081,22 @@ namespace CLIP.eForm.Consent.UI {
           string hosType = consentMain.ConsentExecuteInfo["dutinstcd"];
           string deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
 
-          if (string.IsNullOrEmpty(userName)) {
-            UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
-            userName = userVo.userName;
+          UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
+          //if (string.IsNullOrEmpty(userName)) {
+          //  var date = CurrentTargetPatient.clnDate;
+          //  userName = userVo.userName;
+          //}
+
+          /**
+          * 선택된 환자의 진료의가 퇴직한 경우 사용자 정보를 가져올 수 없어 로그인 한 사용자의 정보를 매핑하여 준다
+          */
+          var tmpOrddeptcd = CurrentEndUser?.DeptCode ?? String.Empty;
+          if (String.IsNullOrEmpty(tmpOrddeptcd)) {
+            userName = this.consentMain.ConsentExecuteInfo["loginUserName"];
+            deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
+          }
+          else {
+            deptCd = tmpOrddeptcd;
           }
 
           string patientCode = CurrentTargetPatient.PatientCode;
@@ -1128,7 +1154,7 @@ namespace CLIP.eForm.Consent.UI {
                                                                  , userName
                                                                  , userName
                                                                  , mainDrId
-                                                                 , currentEndUser.DeptCode
+                                                                 , deptCd /* currentEndUser.DeptCode */
                                                                  , consentMain.GetTotalPageCount().ToString()
                                                                  , "P"
                                                                  , "P"
@@ -1800,9 +1826,22 @@ namespace CLIP.eForm.Consent.UI {
       string deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
       string hosType = this.consentMain.ConsentExecuteInfo["dutinstcd"];
 
-      if (string.IsNullOrEmpty(userName)) {
-        UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
-        userName = userVo.userName;
+      UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
+      //if (string.IsNullOrEmpty(userName)) {
+      //  var date = CurrentTargetPatient.clnDate;
+      //  userName = userVo.userName;
+      //}
+
+      /**
+      * 선택된 환자의 진료의가 퇴직한 경우 사용자 정보를 가져올 수 없어 로그인 한 사용자의 정보를 매핑하여 준다
+      */
+      var tmpOrddeptcd = CurrentEndUser?.DeptCode ?? String.Empty;
+      if (String.IsNullOrEmpty(tmpOrddeptcd)) {
+        userName = this.consentMain.ConsentExecuteInfo["loginUserName"];
+        deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
+      }
+      else {
+        deptCd = tmpOrddeptcd;
       }
 
       string patientCode = CurrentTargetPatient.PatientCode;
@@ -1859,7 +1898,7 @@ namespace CLIP.eForm.Consent.UI {
                                                              , userName
                                                              , userName
                                                              , mainDrId
-                                                             , CurrentEndUser.DeptCode
+                                                             , deptCd
                                                              , consentMain.GetTotalPageCount().ToString()
                                                              , "T"
                                                              , "P"      // 임시저장 시 P 상태로 기록, 스캔 매수 입력 하도록 설정
@@ -2118,9 +2157,22 @@ namespace CLIP.eForm.Consent.UI {
       string deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
       string hosType = consentMain.ConsentExecuteInfo["dutinstcd"];
 
-      if (string.IsNullOrEmpty(userName)) {
-        UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
-        userName = userVo.userName;
+      UserVO userVo = hospitalWebService.GetUserInfo(userId, hosType, deptCd);
+      //if (string.IsNullOrEmpty(userName)) {
+      //  var date = CurrentTargetPatient.clnDate;
+      //  userName = userVo.userName;
+      //}
+
+      /**
+      * 선택된 환자의 진료의가 퇴직한 경우 사용자 정보를 가져올 수 없어 로그인 한 사용자의 정보를 매핑하여 준다
+      */
+      var tmpOrddeptcd = CurrentEndUser?.DeptCode ?? String.Empty;
+      if (String.IsNullOrEmpty(tmpOrddeptcd)) {
+        userName = this.consentMain.ConsentExecuteInfo["loginUserName"];
+        deptCd = this.consentMain.ConsentExecuteInfo["userDeptCd"];
+      }
+      else {
+        deptCd = tmpOrddeptcd;
       }
 
       string patientCode = CurrentTargetPatient.PatientCode;
@@ -2190,7 +2242,7 @@ namespace CLIP.eForm.Consent.UI {
                                                                 , dschdd
                                                                 , consentState
                                                                 , mainDrId
-                                                                , CurrentEndUser.DeptCode
+                                                                , deptCd // CurrentEndUser.DeptCode
                                                                 , consentMain.GetTotalPageCount().ToString()
                                                                 , actKind
                                                                 , "P"

CLIP.e-Form.Consent.UI/UIParts/PatientInfoCtrl.cs

@@ -92,7 +92,7 @@ namespace CLIP.eForm.Consent.UI {
     }
 
     private void GetUserDetailInfo(string userid, string dutinstcd, string dutplcecd, ConsentCommandCtrl commandControl) {
-
+      //var date = this.commandControl.CurrentTargetPatient.clnDate;
       UserVO userVO = (UserVO)this.hospitalWebService.GetUserInfo(userid, dutinstcd, dutplcecd);
 
       if(userVO == null) {
@@ -445,14 +445,8 @@ namespace CLIP.eForm.Consent.UI {
 
     public override void SetConsentUserInfo(string userid, string dutinstcd, string dutplcecd, string temp) {
       ConsentCommandCtrl commandControl = consentMain.ConsentCommandCtrl as ConsentCommandCtrl;
-
       UserVO userVO = (UserVO) this.hospitalWebService.GetUserInfo(userid, dutinstcd, dutplcecd);
 
-      if (userVO == null) {
-        userVO = (UserVO) this.hospitalWebService.GetUserInfo(commandControl.CurrentEndUser.UserNo, dutinstcd, commandControl.CurrentEndUser.DeptCode);
-        
-      }
-
       commandControl.CurrentEndUser = new EndUser();
 
       commandControl.CurrentEndUser.UserNo = this.labelUserNo.Text = userVO.userId;

CLIP.e-Form.Consent.UI/UIParts/PatientListCtrl.cs

@@ -146,6 +146,17 @@ namespace CLIP.eForm.Consent.UI {
           //}
         }
 
+        // 환자 안전관리 메시지 현재 블럭
+        var msg = this.consentMain.getHospitalWebService().checkPatientSafetyMessage("A", vo.instCd, vo.pid, vo.inDd, vo.cretNo);
+        if (!String.IsNullOrEmpty(msg)) {
+          int idx = msg.IndexOf(":");
+          if(idx > 0) {
+            Boolean showMessage = msg.Substring(0, idx).Equals("Y") ? true : false;
+            var msgStr = msg.Substring(idx + 1);
+            MessageBox.Show(msgStr);
+          }          
+        }
+
         var curIdx = tabControlPatientSelect.SelectedIndex;
 
         if(curIdx == 2) {

CLIP.e-Form.Consent.UI/app.config

@@ -3,13 +3,17 @@
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
-                <binding name="HospitalSvcSoap"/>
-                <binding name="ConsentSvcSoap"/>
+                <binding name="HospitalSvcSoap" />
+                <binding name="ConsentSvcSoap" />
             </basicHttpBinding>
         </bindings>
         <client>
-            <endpoint address="http://localhost:8081/ConsentSvc.asmx" binding="basicHttpBinding" bindingConfiguration="ConsentSvcSoap" contract="ConsentSvcRef.ConsentSvcSoap" name="ConsentSvcSoap"/>
-            <endpoint address="http://localhost:8081/HospitalSvc.asmx" binding="basicHttpBinding" bindingConfiguration="HospitalSvcSoap" contract="HospitalSvcRef.HospitalSvcSoap" name="HospitalSvcSoap"/>
+            <endpoint address="http://localhost:8091/ConsentSvc.asmx" binding="basicHttpBinding"
+                bindingConfiguration="ConsentSvcSoap" contract="ConsentSvcRef.ConsentSvcSoap"
+                name="ConsentSvcSoap" />
+            <endpoint address="http://localhost:8091/HospitalSvc.asmx" binding="basicHttpBinding"
+                bindingConfiguration="HospitalSvcSoap" contract="HospitalSvcRef.HospitalSvcSoap"
+                name="HospitalSvcSoap" />
         </client>
     </system.serviceModel>  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

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

@@ -605,6 +605,28 @@ namespace CLIP.eForm.Consent.WebService {
 
     }
 
+    [WebMethod(Description = "환자리스트 안전관리 메시지 확인")]
+    public String checkPatientSafetyMessage(String type, String instCd, String pid, String orddd, int cretNo) {
+      var msg = String.Empty;
+      try {
+        using (PatientDac dac = new PatientDac()) {
+          Hashtable param = new Hashtable{
+            { "type", type },
+            { "instCd", instCd },
+            { "pid", pid },
+            { "orddd", orddd },
+            { "cretNo", cretNo }                        
+           };
+          msg = dac.checkPatientSaftyMessage(this.IbatisMapper, param) ?? String.Empty;
+        }
+      }
+      catch(Exception e) {
+        CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Error(string.Format("CLIP.eForm GetSrchPatInfo error: {0}", e.Message));
+        throw e;
+      }
+      return msg;
+    }
+
     /// <summary>
     /// 환자리스트 조회조건 중 환자 검색 팝업
     /// </summary>

CLIP.e-Form.Consent.Web/OracleQuery/CLIP.e-Form.Hospital.Patient.xml

@@ -746,7 +746,18 @@
         ORDER BY INPT.FSTRGSTDT DESC
       ]]>
     </statement>
-
+    
+    <statement id="checkPatientSaftyMessage" parameterClass="System.Collections.Hashtable" resultClass="System.String">
+      <![CDATA[ 
+        SELECT EMA.FN_EMR_POPUP(
+          #type#,
+          #instCd#,
+          #pid#,
+          #orddd#,
+          #cretNo#)
+		      FROM DUAL]]>
+    </statement>
+    
     <statement id="getOcrTag" parameterClass="System.Collections.Hashtable" resultClass="System.String">
       <![CDATA[ 
         SELECT TO_CHAR(SYSDATE, 'YYYYMMDD') || SUBSTR(LPAD(EMR.SQ_MRFMOCRP_01.NEXTVAL, 10, '0'), 6, 5) AS ocrtag

CLIP.e-Form.Consent.Web/Properties/PublishProfiles/CustomProfile.pubxml

@@ -11,7 +11,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>C:\fatimaConsent\consentServer</publishUrl>
+    <publishUrl>D:\@bin\knuhConsent</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>