Merge branch 'main' of https://github.com/miyako/4d-component-ssk-master

.github/workflows/default.yml

@@ -73,7 +73,7 @@ jobs:
       - name: generate
         id: generate
         run: |
-          tool4d.app/Contents/MacOS/tool4d "${PROJECT_PATH}" --skip-onstartup --startup-method=regenerate --user-param="regenereate,export" --create-data
+          tool4d.app/Contents/MacOS/tool4d "${PROJECT_PATH}" --skip-onstartup --startup-method=regenerate --user-param="regenerate,export" --create-data
         env: 
           PROJECT_PATH: ${{ steps.configure.outputs.project_path }} 
 
@@ -145,111 +145,93 @@ jobs:
           release_name: ${{ steps.tag.outputs.release_name }}  
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
-
-      - name: get name
-        id: name
-        run: |  
-          echo "upload_name_1=コメント.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_2=医薬品.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_3=記載事項等.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_4=修飾語.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_5=傷病名.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_6=診療行為.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_7=単位.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_8=地方公費.zip" >> $GITHUB_OUTPUT 
-          echo "upload_name_9=特定器材.zip" >> $GITHUB_OUTPUT 
-          
-      - name: get path
-        id: path
-        run: |     
-          echo "upload_path_1=${GITHUB_WORKSPACE}/${upload_name_1}" >> $GITHUB_OUTPUT 
-          echo "upload_path_2=${GITHUB_WORKSPACE}/${upload_name_2}" >> $GITHUB_OUTPUT 
-          echo "upload_path_3=${GITHUB_WORKSPACE}/${upload_name_3}" >> $GITHUB_OUTPUT 
-          echo "upload_path_4=${GITHUB_WORKSPACE}/${upload_name_4}" >> $GITHUB_OUTPUT 
-          echo "upload_path_5=${GITHUB_WORKSPACE}/${upload_name_5}" >> $GITHUB_OUTPUT 
-          echo "upload_path_6=${GITHUB_WORKSPACE}/${upload_name_6}" >> $GITHUB_OUTPUT 
-          echo "upload_path_7=${GITHUB_WORKSPACE}/${upload_name_7}" >> $GITHUB_OUTPUT 
-          echo "upload_path_8=${GITHUB_WORKSPACE}/${upload_name_8}" >> $GITHUB_OUTPUT 
-          echo "upload_path_9=${GITHUB_WORKSPACE}/${upload_name_9}" >> $GITHUB_OUTPUT 
-        env:
-          upload_name_1: ${{ steps.name.outputs.upload_name_1 }}
-          upload_name_2: ${{ steps.name.outputs.upload_name_2 }}
-          upload_name_3: ${{ steps.name.outputs.upload_name_3 }}
-          upload_name_4: ${{ steps.name.outputs.upload_name_4 }}
-          upload_name_5: ${{ steps.name.outputs.upload_name_5 }}
-          upload_name_6: ${{ steps.name.outputs.upload_name_6 }}
-          upload_name_7: ${{ steps.name.outputs.upload_name_7 }}
-          upload_name_8: ${{ steps.name.outputs.upload_name_8 }}
-          upload_name_9: ${{ steps.name.outputs.upload_name_9 }}
 
       - name: upload 1
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_1 }}
-          asset_name: ${{ steps.name.outputs.upload_name_1 }}
+          asset_path: コメント.zip
+          asset_name: data.1.zip
           asset_content_type: application/zip   
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
 
       - name: upload 2
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_2 }}
-          asset_name: ${{ steps.name.outputs.upload_name_2 }}
+          asset_path: 医薬品.zip
+          asset_name: data.2.zip
           asset_content_type: application/zip  
-
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+
       - name: upload 3
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_3 }}
-          asset_name: ${{ steps.name.outputs.upload_name_3 }}
+          asset_path: 記載事項等.zip
+          asset_name: data.3.zip
           asset_content_type: application/zip  
-
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+
       - name: upload 4
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_4 }}
-          asset_name: ${{ steps.name.outputs.upload_name_4 }}
+          asset_path: 修飾語.zip
+          asset_name: data.4.zip
           asset_content_type: application/zip  
-
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+
       - name: upload 5
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_5 }}
-          asset_name: ${{ steps.name.outputs.upload_name_5 }}
+          asset_path: 傷病名.zip
+          asset_name: data.5.zip
           asset_content_type: application/zip  
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
 
       - name: upload 6
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_6 }}
-          asset_name: ${{ steps.name.outputs.upload_name_6 }}
+          asset_path: 診療行為.zip
+          asset_name: data.6.zip
           asset_content_type: application/zip     
-
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+
       - name: upload 7
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_7 }}
-          asset_name: ${{ steps.name.outputs.upload_name_7 }}
+          asset_path: 単位.zip
+          asset_name: data.7.zip
           asset_content_type: application/zip   
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
 
       - name: upload 8
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_8 }}
-          asset_name: ${{ steps.name.outputs.upload_name_8 }}
+          asset_path: 地方公費.zip
+          asset_name: data.8.zip
           asset_content_type: application/zip   
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
 
       - name: upload 9
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.upload.outputs.upload_url }}
-          asset_path: ${{ steps.path.outputs.upload_path_9 }}
-          asset_name: ${{ steps.name.outputs.upload_name_9 }}
+          asset_path: 特定器材.zip
+          asset_name: data.9.zip
           asset_content_type: application/zip     
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  

package.json

@@ -1 +1 @@
-{"name":"ssk-master","description":"社会保険診療報酬支払基金マスター","author":"Keisuke Miyako <[email protected]>","license":"MIT","repository":"https://github.com/miyako/4d-component-ssk-master","version":"0.1.9","release_name":"2024年3月6日","tool":{"platform":"macos","branch":"20.x","version":"20.2","build":"latest","arch":"x86"},"医薬品":"y_ALL20240305.csv","一般名処方":"ippanmeishohoumaster_240401.xlsx","後発医薬品":["tp20240401-01_01.xlsx","tp20240401-01_03.xlsx","tp20240401-01_02.xlsx"],"特定器材":"t_ALL20240305.csv","労災特定器材":"rezept-master-03.csv","修飾語":"z_20240101.txt","コメント":"c_ALL20230801.csv","労災コメント":"rezept-master-06.csv","傷病名":"b_20240101.txt","診療行為":"s_ALL20240306.csv","労災診療行為":"rezept-master-01.csv","地方公費":["47. 沖縄県.xlsx","28. 兵庫県.xlsx","32. 島根県.xlsx","27. 大阪府.xlsx","5. 秋田県.xlsx","22. 静岡県.xlsx","43. 熊本県.xlsx","12. 千葉県.xlsx","1. 北海道.xlsx","15. 新潟県.xlsx","20. 長野県.xlsx","46. 鹿児島県.xlsx","23. 愛知県.xlsx","4. 宮城県.xlsx","35. 山口県.xlsx","14. 神奈川県.xlsx","31. 鳥取県.xlsx","24. 三重県.xlsx","33. 山口県.xlsx","41. 佐賀県.xlsx","39. 高知県.xlsx","30. 和歌山県.xlsx","38. 愛媛県.xlsx","40. 福岡県.xlsx","44. 大分県.xlsx","7. 福島県.xlsx","2. 青森県.xlsx","19. 山梨県.xlsx","25. 滋賀県.xlsx","6. 山形県.xlsx","42. 長崎県.xlsx","26. 京都府.xlsx","16. 富山県.xlsx","29. 奈良県.xlsx","13. 東京都.xlsx","45. 宮崎県.xlsx","21. 岐阜県.xlsx","9. 栃木県.xlsx","8. 茨城県.xlsx","11. 埼玉県.xlsx","18. 福井県.xlsx","34. 広島県.xlsx","37. 香川県.xlsx","36. 徳島県.xlsx","3. 岩手県.xlsx","17. 石川県.xlsx","10. 群馬県.xlsx"]}
+{"name":"ssk-master","description":"社会保険診療報酬支払基金マスター","author":"Keisuke Miyako <[email protected]>","license":"MIT","repository":"https://github.com/miyako/4d-component-ssk-master","version":"0.1.15","release_name":"2024年3月6日","tool":{"platform":"macos","branch":"20.x","version":"20.2","build":"latest","arch":"x86"},"医薬品":"y_ALL20240305.csv","一般名処方":"ippanmeishohoumaster_240401.xlsx","後発医薬品":["tp20240401-01_01.xlsx","tp20240401-01_03.xlsx","tp20240401-01_02.xlsx"],"特定器材":"t_ALL20240305.csv","労災特定器材":"rezept-master-03.csv","修飾語":"z_20240101.txt","コメント":"c_ALL20230801.csv","労災コメント":"rezept-master-06.csv","傷病名":"b_20240101.txt","診療行為":"s_ALL20240306.csv","労災診療行為":"rezept-master-01.csv","地方公費":["47. 沖縄県.xlsx","28. 兵庫県.xlsx","32. 島根県.xlsx","27. 大阪府.xlsx","5. 秋田県.xlsx","22. 静岡県.xlsx","43. 熊本県.xlsx","12. 千葉県.xlsx","1. 北海道.xlsx","15. 新潟県.xlsx","20. 長野県.xlsx","46. 鹿児島県.xlsx","23. 愛知県.xlsx","4. 宮城県.xlsx","35. 山口県.xlsx","14. 神奈川県.xlsx","31. 鳥取県.xlsx","24. 三重県.xlsx","33. 山口県.xlsx","41. 佐賀県.xlsx","39. 高知県.xlsx","30. 和歌山県.xlsx","38. 愛媛県.xlsx","40. 福岡県.xlsx","44. 大分県.xlsx","7. 福島県.xlsx","2. 青森県.xlsx","19. 山梨県.xlsx","25. 滋賀県.xlsx","6. 山形県.xlsx","42. 長崎県.xlsx","26. 京都府.xlsx","16. 富山県.xlsx","29. 奈良県.xlsx","13. 東京都.xlsx","45. 宮崎県.xlsx","21. 岐阜県.xlsx","9. 栃木県.xlsx","8. 茨城県.xlsx","11. 埼玉県.xlsx","18. 福井県.xlsx","34. 広島県.xlsx","37. 香川県.xlsx","36. 徳島県.xlsx","3. 岩手県.xlsx","17. 石川県.xlsx","10. 群馬県.xlsx"]}

rezept/Project/Sources/Classes/rezept.4dm → rezept/Project/Sources/Classes/Rezept.4dm

@@ -88,4 +88,4 @@ Function _ds($dataClassName : Text) : Object
 
 		return $export
 
-	End if 
+	End if 

rezept/Project/Sources/Classes/_export.4dm → rezept/Project/Sources/Classes/_Export.4dm

@@ -1145,4 +1145,4 @@ Function setup()
 			This:C1470.file:=$file
 
 		End if 
-	End if 
+	End if 

rezept/Project/Sources/Classes/_params.4dm → rezept/Project/Sources/Classes/_Params.4dm

@@ -2,4 +2,4 @@ Class constructor
 
 	This:C1470.attributes:={}
 	This:C1470.parameters:={}
-	This:C1470.args:={}
+	This:C1470.args:={}