diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 1016b95..03e74e5 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -214,10 +214,10 @@ public class FontController {
                 Set<String> assortList = new LinkedHashSet<>();
                 //抽取首次病程记录
                 String strTemp = "首次病程";
-                String assortId = "AFB9FBE656D7492C80AEDE6E685A851A";
+                String assortId = "11";
                 //定义护理记录里的首次护理记录排前头
                 String nurseTemp = "首次护理";
-                String nurseAssortId = "C70E8C427A3648B79BE80798C08F4D12";
+                String nurseAssortId = "7";
                 Archive_Detail detailTemp = new Archive_Detail();
                 Archive_Detail nurseDetailVoTemp = new Archive_Detail();
                 //分类去重
@@ -260,6 +260,7 @@ public class FontController {
                     boolean flag = false;
                     boolean nurseflag = false;
                     for(Archive_Detail detail : list){
+                        if(StringUtils.isNoneBlank(detail.getSubassort()) && assortName.equals(detail.getSubassort())){
                             String assortid = detail.getAssortid();
                             if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId)){
                                 //是病程记录
@@ -305,6 +306,7 @@ public class FontController {
                                 treeList.add(tree2);
                                 id++;
                             }
+                        }
                     }
                     tree1.setName(assortName + "("+count+")");
                     tree1.setChecked("true");
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 3b38ede..336cc9c 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -33,16 +33,21 @@ expired=7
 #������������
 deathExpired=7
 
-powerUrl=http://127.0.0.1:8081/power/font/getMenusByUserIdAndSysFlag
-POWER_URLHEAD=http://127.0.0.1:8081/power
-POWER_JSP=http://127.0.0.1:8081/power
+powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
+#powerUrl=http://127.0.0.1:8081/power/font/getMenusByUserIdAndSysFlag
+POWER_URLHEAD=http://127.0.0.1:8080/power
+#POWER_URLHEAD=http://127.0.0.1:8081/power
+POWER_JSP=http://127.0.0.1:8080/power
+#POWER_JSP=http://127.0.0.1:8081/power
 recallReason=ҽԺ��Ҫ����ĵ�
 #HomepageDictionary=http://120.27.212.36:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
 #HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
-HomepageDictionary=http://127.0.0.1:8081/WholeCheckInterface/services/HomepageDictionary?wsdl
+HomepageDictionary=http://127.0.0.1:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
+#HomepageDictionary=http://127.0.0.1:8081/WholeCheckInterface/services/HomepageDictionary?wsdl
 HomepageMethod=CheckData
 
-powerGetUserList=http://127.0.0.1:8081/power/font/getUserList?userName=admin
+powerGetUserList=http://127.0.0.1:8080/power/font/getUserList?userName=admin
+#powerGetUserList=http://127.0.0.1:8081/power/font/getUserList?userName=admin
 
 allAddortIds = 00000000