zhanjiang2.0
/
EMR_Medical_Record
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复页面病案树加载错误

Browse Source
master
bigbananass 4 years ago
parent 80da70d350
commit bf434c70e1
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/com/emr/controller/FontController.java
Unescape Escape View File

@ -214,10 +214,10 @@ public class FontController {
Set<String> assortList = new LinkedHashSet<>(); Set<String> assortList = new LinkedHashSet<>();
//抽取首次病程记录 //抽取首次病程记录
String strTemp = "首次病程"; String strTemp = "首次病程";
String assortId = "AFB9FBE656D7492C80AEDE6E685A851A"; String assortId = "11";
//定义护理记录里的首次护理记录排前头 //定义护理记录里的首次护理记录排前头
String nurseTemp = "首次护理"; String nurseTemp = "首次护理";
String nurseAssortId = "C70E8C427A3648B79BE80798C08F4D12"; String nurseAssortId = "7";
Archive_Detail detailTemp = new Archive_Detail(); Archive_Detail detailTemp = new Archive_Detail();
Archive_Detail nurseDetailVoTemp = new Archive_Detail(); Archive_Detail nurseDetailVoTemp = new Archive_Detail();
//分类去重 //分类去重
@ -260,6 +260,7 @@ public class FontController {
boolean flag = false; boolean flag = false;
boolean nurseflag = false; boolean nurseflag = false;
for(Archive_Detail detail : list){ for(Archive_Detail detail : list){
if(StringUtils.isNoneBlank(detail.getSubassort()) && assortName.equals(detail.getSubassort())){
String assortid = detail.getAssortid(); String assortid = detail.getAssortid();
if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId)){ if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId)){
//是病程记录 //是病程记录
@ -305,6 +306,7 @@ public class FontController {
treeList.add(tree2); treeList.add(tree2);
id++; id++;
} }
}
} }
tree1.setName(assortName + "("+count+")"); tree1.setName(assortName + "("+count+")");
tree1.setChecked("true"); tree1.setChecked("true");

15
src/main/resources/config/jdbc.properties
Unescape Escape View File

@ -33,16 +33,21 @@ expired=7
#死亡超期天数 #死亡超期天数
deathExpired=7 deathExpired=7
powerUrl=http://127.0.0.1:8081/power/font/getMenusByUserIdAndSysFlag powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
POWER_URLHEAD=http://127.0.0.1:8081/power #powerUrl=http://127.0.0.1:8081/power/font/getMenusByUserIdAndSysFlag
POWER_JSP=http://127.0.0.1:8081/power 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=医院需要这份文档 recallReason=医院需要这份文档
#HomepageDictionary=http://120.27.212.36:9999/WholeCheckInterface/services/HomepageDictionary?wsdl #HomepageDictionary=http://120.27.212.36:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
#HomepageDictionary=http://10.6.1.127: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 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 allAddortIds = 00000000

Write Preview
Loading…
Cancel
Save