ออกคำสั่งถึงแก่กรรม

.idea/.idea.BMA.EHR.Solution/.idea/projectSettingsUpdater.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="vcsConfiguration" value="3" />
   </component>
 </project>

.idea/.idea.BMA.EHR.Solution/.idea/workspace.xml

@@ -6,6 +6,7 @@
     <projectFile kind="Docker">BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj</projectFile>
     <projectFile profileName="http">BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj</projectFile>
     <projectFile profileName="https">BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj</projectFile>
+    <projectFile kind="Docker">BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj</projectFile>
     <projectFile profileName="http">BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj</projectFile>
     <projectFile profileName="https">BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj</projectFile>
     <projectFile kind="Docker">BMA.EHR.Insignia/BMA.EHR.Insignia.csproj</projectFile>
@@ -31,17 +32,14 @@
     <projectFile kind="Docker">BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj</projectFile>
     <projectFile profileName="http">BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj</projectFile>
     <projectFile profileName="https">BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj</projectFile>
+    <projectFile kind="Docker">LinkageResponseTest/LinkageResponseTest.csproj</projectFile>
+    <projectFile profileName="LinkageResponseTest">LinkageResponseTest/LinkageResponseTest.csproj</projectFile>
   </component>
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="85fddeb6-44fd-40a4-864f-89daec07db75" name="Changes" comment="">
+    <list default="true" id="85fddeb6-44fd-40a4-864f-89daec07db75" name="Changes" comment="" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Insignia/appsettings.json" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Insignia/appsettings.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Leave/appsettings.json" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Leave/appsettings.json" afterDir="false" />
-    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -53,10 +51,16 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
+  <component name="HighlightingSettingsPerFile">
-  "customColor": "",
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/784cd69e10484e988569506bb4e7688b1c2588/44/2a408f3d/SingleQueryingEnumerable`1.cs" root0="FORCE_HIGHLIGHTING" />
-  "associatedIndex": 2
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/79e4164404d2be7b9d0cd51036b545bd14f5807c558d20f7cd375d4fd8ff23/ConnectionFactory.cs" root0="FORCE_HIGHLIGHTING" />
-}]]></component>
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/bf9021a960b74107a7e141aa06bc9d8a0a53c929178c2fb95b1597be8af8dc/ExceptionDispatchInfo.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs" root0="SKIP_HIGHLIGHTING" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 2
+}</component>
   <component name="ProjectId" id="2lB1pnEIkATarPnZkJ5vo5hUlwn" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -65,8 +69,10 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     ".NET Launch Settings Profile.BMA.EHR.Leave: https.executor": "Debug",
+    ".NET Launch Settings Profile.BMA.EHR.Placement.Service: http.executor": "Run",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "working",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "develop",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -74,16 +80,9 @@
     "nodejs_package_manager_path": "npm",
     "settings.editor.selected.configurable": "preferences.lookFeel",
     "vue.rearranger.settings.migration": "true"
-  },
-  "keyToStringList": {
-    "rider.external.source.directories": [
-      "/Users/suphonchai/Library/Application Support/JetBrains/Rider2024.1/resharper-host/DecompilerCache",
-      "/Users/suphonchai/Library/Application Support/JetBrains/Rider2024.1/resharper-host/SourcesCache",
-      "/Users/suphonchai/Library/Application Support/Symbols/src"
-    ]
   }
 }]]></component>
-  <component name="RunManager" selected=".NET Launch Settings Profile.BMA.EHR.Leave: https">
+  <component name="RunManager" selected=".NET Launch Settings Profile.BMA.EHR.Placement.Service: http">
     <configuration name="BMA.EHR.CheckInConsumer" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
       <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj" />
       <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
@@ -399,6 +398,21 @@
         <option name="Build" />
       </method>
     </configuration>
+    <configuration name="LinkageResponseTest" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/LinkageResponseTest/LinkageResponseTest.csproj" />
+      <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+      <option name="LAUNCH_PROFILE_NAME" value="LinkageResponseTest" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+      <option name="SEND_DEBUG_REQUEST" value="1" />
+      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
     <configuration name="BMA.EHR.CheckInConsumer/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
       <deployment type="dockerfile">
         <settings>
@@ -422,6 +436,17 @@
       <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
       <method v="2" />
     </configuration>
+    <configuration name="BMA.EHR.Discipline.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+      <deployment type="dockerfile">
+        <settings>
+          <option name="containerName" value="bma.ehr.discipline.service" />
+          <option name="contextFolderPath" value="$PROJECT_DIR$" />
+          <option name="sourceFilePath" value="BMA.EHR.Discipline.Service/Dockerfile" />
+        </settings>
+      </deployment>
+      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
+      <method v="2" />
+    </configuration>
     <configuration name="BMA.EHR.Insignia/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
       <deployment type="dockerfile">
         <settings>
@@ -506,8 +531,22 @@
       <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
       <method v="2" />
     </configuration>
+    <configuration name="LinkageResponseTest/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+      <deployment type="dockerfile">
+        <settings>
+          <option name="containerName" value="linkageresponsetest" />
+          <option name="contextFolderPath" value="$PROJECT_DIR$" />
+          <option name="sourceFilePath" value="LinkageResponseTest/Dockerfile" />
+        </settings>
+      </deployment>
+      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
+      <method v="2" />
+    </configuration>
     <configuration default="true" type="docker-deploy" factoryName="dockerfile" temporary="true">
-      <deployment type="dockerfile" />
+      <deployment type="dockerfile">
+        <settings />
+      </deployment>
+      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
       <method v="2" />
     </configuration>
   </component>
@@ -520,6 +559,7 @@
       <option name="presentableId" value="Default" />
       <updated>1724638841465</updated>
       <workItem from="1724638842250" duration="4068000" />
+      <workItem from="1750388252688" duration="1877000" />
     </task>
     <servers />
   </component>
@@ -535,13 +575,13 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs</url>
-          <line>1152</line>
+          <line>1159</line>
-          <properties documentPath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" containingFunctionPresentation="Method 'GetTimeRecordAsync'">
+          <properties documentPath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" containingFunctionPresentation="Method 'CheckInHistoryAsync'">
             <startOffsets>
-              <option value="52378" />
+              <option value="50795" />
             </startOffsets>
             <endOffsets>
-              <option value="52431" />
+              <option value="50887" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="1" />

BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs

@@ -353,7 +353,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     var _res = await client.PostAsJsonAsync(_apiUrl, new
                     {
                         isLeave = true,
-                        leaveReason = "ถึงแก่กรรม",
+                        leaveReason = retirementDeceased.Reason,
                         dateLeave = req.Date,
                     });
                     var _result = await _res.Content.ReadAsStringAsync();
@@ -420,7 +420,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     var _res = await client.PostAsJsonAsync(_apiUrl, new
                     {
                         isLeave = true,
-                        leaveReason = "ถึงแก่กรรม",
+                        leaveReason = retirementDeceased.Reason,
                         dateLeave = req.Date,
                     });
                     var _result = await _res.Content.ReadAsStringAsync();

BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs

@@ -541,7 +541,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpPost("command/report")]
         public async Task<ActionResult<ResponseObject>> PostReport([FromBody] ReportPersonRequest req)
         {
-            var placementProfiles = await _context.RetirementResigns
+            var placementProfiles = await _context.RetirementOuts
                                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                                             .ToListAsync();
             placementProfiles.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
@@ -560,7 +560,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpPost("command/report/delete")]
         public async Task<ActionResult<ResponseObject>> PostDeleteReport([FromBody] ReportPersonRequest req)
         {
-            var placementProfiles = await _context.RetirementResigns
+            var placementProfiles = await _context.RetirementOuts
                                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                                             // .Where(x => x.Status.ToUpper() == "REPORT")
                                             .ToListAsync();