develop/xl_20241113_cfdpbb

切换登录机构和科室界面：1、可双击切换。2、按科室类型、科室名称排序。
客户端地址获取ApiUrl：服务器URL为空时，输出defaultUrl。

WEB-INF/conf/sysds_main.xml

@@ -556,7 +556,7 @@
 		</parameter>
 	</dao>
 	<dao id="userdlksdao" cache="true" type="1" memo="用户指定的科室">
-		<sql>select a.KSBM,b.DPTZJM,b.DPTID,b.DPTNAME KSMC,b.DPTTYPE,b.DPTGPID from MAIN_YHGLKS a left join MAIN_KS b on a.JGID=b.JGID and a.KSBM=b.DPTID where a.JGID=? and a.EMPID=? and a.SCBZ=0</sql>
+		<sql>select a.KSBM,b.DPTZJM,b.DPTID,b.DPTNAME KSMC,b.DPTTYPE,b.DPTGPID from MAIN_YHGLKS a left join MAIN_KS b on a.JGID=b.JGID and a.KSBM=b.DPTID where a.JGID=? and a.EMPID=? and a.SCBZ=0 order by DPTTYPE,KSMC</sql>
 		<tables>
 			<table name="MAIN_YHGLKS" insert="false" update="false" delete="false">
 				<primary>KSBM</primary>

WEB-INF/src/com/main/LoginSelectYljgAndKsWindow.java

@@ -5,6 +5,7 @@ import com.util.MainUtil;
 import com.wat.component.DxDataCheckBox;
 import com.wat.component.DxPanelBar;
 import com.wat.component.datagrid.DxDataGrid;
+import com.wat.component.datagrid.event.DxDblCellFocusListener;
 import com.wat.component.datagrid.event.DxSelectRowListener;
 import com.wat.core.component.AppInstance;
 import com.wat.core.component.WatForm;
@@ -148,5 +149,12 @@ public class LoginSelectYljgAndKsWindow extends WatSDIWindow {
 				dbcheckbox1Action();
 			}
 		});
+		dbgrid2.addDblCellFocusListener(new DxDblCellFocusListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				//双击切换科室
+				panelBarAction("select");
+			}
+		});
+		
 	}
 }

WEB-INF/src/com/main/LoginSelectYljgAndKsWindow.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <window size="827,453" title="切换登录机构和科室" sourcefile="TForm11" controlbutton="false,false,true">
+ <window size="827,453" title="切换登录机构和科室（双击科室信息进行快捷切换）" sourcefile="TForm11" controlbutton="false,false,true">
     <DxDataCheckBox id="dbcheckbox1"  size="329,17"  location="252,392"  checkvalue="1" ds="MRDLJG:MRDLJG@"  uncheckvalue="0" title="默认以选中的机构为下次登陆机构"  tabindex="0" ></DxDataCheckBox>
     <DxDataCheckBox id="dbcheckbox2"  size="329,17"  location="532,392"  checkvalue="1" ds="MRDLKS:MRDLKS@"  uncheckvalue="0" title="默认以选中的科室为下次登录科室"  tabindex="0" ></DxDataCheckBox>
     <DxDataGrid id="dbgrid1"  size="245,374"  location="4,35" jsfunction="dbgrid2,13,setFocus"  tabindex="1" >

WEB-INF/src/com/util/ApiUrlUtil.java

@@ -42,16 +42,19 @@ public class ApiUrlUtil {
 	 */
 	public static String getApiUrl(ServerType serverType, String clientIp, String defaultUrl) {
 		String serverurl = (String) AppInstance.getInstance().getAttribute("serverurl");//服务器URL 登录界面赋值 就是浏览器地址栏中部分内容 ”http://127.0.0.1:8083/klhis/kl“ 获取”http://127.0.0.1:8083/klhis“
-		if (Delphi.isNullString(serverurl)) {
-			System.out.println("ApiUrlUtil地址获取：服务器URL 登录界面赋值 就是浏览器地址栏中部分内容 ”http://127.0.0.1:8083/klhis/kl“ 获取”http://127.0.0.1:8083/klhis“");
-			return null;
-		}
-		DxNormalDataManager dao = DaoCreator.getNormalDao("daoSysdsMainForApiUrl");
-		dao.reload(new Object[] { serverType.getCode(), serverurl, "%" });
 		System.out.println("ApiUrlUtil地址获取：ServerType : " + serverType.getCode());
 		System.out.println("ApiUrlUtil地址获取：ServerUrl : " + serverurl);
 		System.out.println("ApiUrlUtil地址获取：ClientIp : " + clientIp);
 		System.out.println("ApiUrlUtil地址获取：DefaultUrl : " + defaultUrl);
+		if (Delphi.isNullString(serverurl)) {
+			System.out.println("serverType:	" + serverType);
+			System.out.println("clientIp:	" + clientIp);
+			System.out.println("defaultUrl:	" + defaultUrl);
+			System.out.println("ApiUrlUtil地址获取：未获取到服务器URL 登录界面赋值 就是浏览器地址栏中部分内容 ”http://127.0.0.1:8083/klhis/kl“ 获取”http://127.0.0.1:8083/klhis“");
+			return defaultUrl;
+		}
+		DxNormalDataManager dao = DaoCreator.getNormalDao("daoSysdsMainForApiUrl");
+		dao.reload(new Object[] { serverType.getCode(), serverurl, "%" });
 		String apiurl = dao.getColumnValueAsString("APIURL");
 		if (Delphi.isNullString(apiurl)) {
 			System.out.println("ApiUrlUtil地址获取：使用默认地址 " + defaultUrl);

release/20241113_1022.text

@@ -21,6 +21,10 @@ develop/xl_20241114_zydjxz
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/xl_20241113_cfdpbb
+
+切换登录机构和科室界面：1、可双击切换。2、按科室类型、科室名称排序。
+客户端地址获取ApiUrl：服务器URL为空时，输出defaultUrl。
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<