diff --git a/client/src/main/java/open/dolphin/impl/login/AbstractLoginDialog.java b/client/src/main/java/open/dolphin/impl/login/AbstractLoginDialog.java index a4ee1dd..d53299b 100755 --- a/client/src/main/java/open/dolphin/impl/login/AbstractLoginDialog.java +++ b/client/src/main/java/open/dolphin/impl/login/AbstractLoginDialog.java @@ -1,7 +1,6 @@ package open.dolphin.impl.login; import java.awt.Dimension; -import java.awt.Frame; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; @@ -33,7 +32,7 @@ */ public abstract class AbstractLoginDialog implements ILoginDialog { - protected JDialog dialog; + protected JFrame dialog; protected BlockGlass blockGlass; // 認証制御用 @@ -141,7 +140,8 @@ public void actionPerformed(ActionEvent ae) { String title = ClientContext.getString("loginDialog.title"); String windowTitle = ClientContext.getFrameTitle(title); - dialog = new JDialog((Frame)null, windowTitle, true); + dialog = new JFrame(windowTitle); + dialog.setResizable(false); dialog.setTitle(windowTitle); dialog.getRootPane().setDefaultButton(getLoginButton()); blockGlass = new BlockGlass(); diff --git a/client/src/main/java/open/dolphin/order/ClaimResource.java b/client/src/main/java/open/dolphin/order/ClaimResource.java index dcc8984..f8df27f 100755 --- a/client/src/main/java/open/dolphin/order/ClaimResource.java +++ b/client/src/main/java/open/dolphin/order/ClaimResource.java @@ -204,7 +204,7 @@ protected Object[][] getContents() { {"SHIN_LABO_TEST", "^6"}, {"SHIN_RADIOLOGY_ORDER", "^7"}, {"SHIN_OTHER_ORDER", "^8"}, - {"SHIN_GENERAL_ORDER", "\\\\d"}, + {"SHIN_GENERAL_ORDER", "\\d{3}"}, // エディタに表示する名前 {"NAME_BASE_CHARGE", "Base Fee"}, {"NAME_INSTRACTION_CHARGE", "Instraction"}, // 指導・在宅 diff --git a/client/src/main/java/open/dolphin/order/ClaimResource_ja.java b/client/src/main/java/open/dolphin/order/ClaimResource_ja.java index 5824e2e..867f664 100644 --- a/client/src/main/java/open/dolphin/order/ClaimResource_ja.java +++ b/client/src/main/java/open/dolphin/order/ClaimResource_ja.java @@ -204,7 +204,7 @@ protected Object[][] getContents() { {"SHIN_LABO_TEST", "^6"}, {"SHIN_RADIOLOGY_ORDER", "^7"}, {"SHIN_OTHER_ORDER", "^8"}, - {"SHIN_GENERAL_ORDER", "\\\\d"}, + {"SHIN_GENERAL_ORDER", "\\d{3}"}, // エディタに表示する名前 {"NAME_BASE_CHARGE", "診断料"}, {"NAME_INSTRACTION_CHARGE", "管理料"}, // 指導・在宅