|
@@ -7,6 +7,7 @@ import com.diagbot.biz.push.entity.Lis;
|
|
import com.diagbot.biz.push.entity.Pacs;
|
|
import com.diagbot.biz.push.entity.Pacs;
|
|
import com.diagbot.client.DataServiceClient;
|
|
import com.diagbot.client.DataServiceClient;
|
|
import com.diagbot.dto.*;
|
|
import com.diagbot.dto.*;
|
|
|
|
+import com.diagbot.entity.DiseaseIcd;
|
|
import com.diagbot.entity.InputInfo;
|
|
import com.diagbot.entity.InputInfo;
|
|
import com.diagbot.facade.*;
|
|
import com.diagbot.facade.*;
|
|
import com.diagbot.util.DateUtil;
|
|
import com.diagbot.util.DateUtil;
|
|
@@ -148,6 +149,8 @@ public class InquiryInfoController {
|
|
if (disease[j] != null && !"".equals(disease[j].trim())) {
|
|
if (disease[j] != null && !"".equals(disease[j].trim())) {
|
|
getDiseaseIcdVO.setDisNames(disease[j]);
|
|
getDiseaseIcdVO.setDisNames(disease[j]);
|
|
if (diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO).size() != 0) {
|
|
if (diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO).size() != 0) {
|
|
|
|
+ List<DiseaseIcd> aa = diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO);
|
|
|
|
+ System.out.println(aa.toString());
|
|
icd = new StringBuffer(diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO).get(0).getIcd());
|
|
icd = new StringBuffer(diseaseIcdFacade.getDiseaseIcds(getDiseaseIcdVO).get(0).getIcd());
|
|
} else {
|
|
} else {
|
|
icd = new StringBuffer("");
|
|
icd = new StringBuffer("");
|
|
@@ -182,7 +185,7 @@ public class InquiryInfoController {
|
|
pushJoinVO.setSymptom(a.getContentList().get(0));
|
|
pushJoinVO.setSymptom(a.getContentList().get(0));
|
|
pushJoinVO.setVital(a.getContentList().get(3));
|
|
pushJoinVO.setVital(a.getContentList().get(3));
|
|
pushJoinVO.setOther(a.getContentList().get(2));
|
|
pushJoinVO.setOther(a.getContentList().get(2));
|
|
- pushJoinVO.setDiag(disease1);
|
|
|
|
|
|
+ pushJoinVO.setDiagOrder(disease1);
|
|
Item item = new Item();
|
|
Item item = new Item();
|
|
item.setName(disease[0]);
|
|
item.setName(disease[0]);
|
|
item.setUniqueName(disease[0]);
|
|
item.setUniqueName(disease[0]);
|
|
@@ -259,6 +262,15 @@ public class InquiryInfoController {
|
|
List<GetDiseaseNameDTO> a;
|
|
List<GetDiseaseNameDTO> a;
|
|
RespDTO<PushDTO> pushDto;
|
|
RespDTO<PushDTO> pushDto;
|
|
pushJoinVO.setFeatureType("22");
|
|
pushJoinVO.setFeatureType("22");
|
|
|
|
+ pushJoinVO.setPasts(pushJoinVO.getPasts() + "," + pushJoinVO.getOperation());
|
|
|
|
+ pushJoinVO.setOther(pushJoinVO.getPasts() + "," + pushJoinVO.getInfectious() + "," + pushJoinVO.getOperation() + "," +
|
|
|
|
+ pushJoinVO.getAllergy() + "," +
|
|
|
|
+ pushJoinVO.getVaccination() + "," +
|
|
|
|
+ pushJoinVO.getPersonal() + "," +
|
|
|
|
+ pushJoinVO.getMarital() + "," +
|
|
|
|
+ pushJoinVO.getFamily() + "," +
|
|
|
|
+ pushJoinVO.getMenstrual());
|
|
|
|
+
|
|
String mrId;
|
|
String mrId;
|
|
String url;
|
|
String url;
|
|
StringBuffer sb3 = new StringBuffer();//放化验细项列表
|
|
StringBuffer sb3 = new StringBuffer();//放化验细项列表
|
|
@@ -292,6 +304,11 @@ public class InquiryInfoController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
pushJoinVO.setDiag(li);
|
|
pushJoinVO.setDiag(li);
|
|
|
|
+ pushJoinVO.setDiagOrder(li);
|
|
|
|
+ if(li.size()>0){
|
|
|
|
+ pushJoinVO.setDiseaseName(li.get(0));
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
//疾病转公表diseaseName
|
|
//疾病转公表diseaseName
|
|
@@ -623,7 +640,7 @@ public class InquiryInfoController {
|
|
inputInfo.setRemark("邵逸夫门诊化验静态知识接口");
|
|
inputInfo.setRemark("邵逸夫门诊化验静态知识接口");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
- return RespDTO.onSuc("暂未维护该项目静态知识!");
|
|
|
|
|
|
+ return RespDTO.onError("暂未维护该项目静态知识!");
|
|
}
|
|
}
|
|
|
|
|
|
} else if (pushJoinVO.getPacsOrder() != null && pushJoinVO.getPacsOrder().size() > 0) {
|
|
} else if (pushJoinVO.getPacsOrder() != null && pushJoinVO.getPacsOrder().size() > 0) {
|
|
@@ -645,7 +662,7 @@ public class InquiryInfoController {
|
|
inputInfo.setRemark("邵逸夫门诊辅检静态知识接口");
|
|
inputInfo.setRemark("邵逸夫门诊辅检静态知识接口");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
- return RespDTO.onSuc("暂未维护该项目静态知识!");
|
|
|
|
|
|
+ return RespDTO.onError("暂未维护该项目静态知识!");
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -664,7 +681,7 @@ public class InquiryInfoController {
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&plan=2"; //配置方案编号
|
|
"&plan=2"; //配置方案编号
|
|
|
|
|
|
- inputInfo.setRemark("邵逸夫首程推送接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院首程推送接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
return RespDTO.onSuc(url);
|
|
return RespDTO.onSuc(url);
|
|
@@ -681,7 +698,7 @@ public class InquiryInfoController {
|
|
"&showTab=0" + //0默认显示治疗方案 1默认显示静态信息
|
|
"&showTab=0" + //0默认显示治疗方案 1默认显示静态信息
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&plan=3";
|
|
"&plan=3";
|
|
- inputInfo.setRemark("邵逸夫大病历推送接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院大病历推送接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
return RespDTO.onSuc(url);
|
|
return RespDTO.onSuc(url);
|
|
@@ -700,12 +717,12 @@ public class InquiryInfoController {
|
|
"&showTab=0" + //0默认显示治疗方案 1默认显示静态信息
|
|
"&showTab=0" + //0默认显示治疗方案 1默认显示静态信息
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&plan=4";
|
|
"&plan=4";
|
|
- inputInfo.setRemark("邵逸夫查阅报告危急值提醒接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院查阅报告危急值提醒接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
return RespDTO.onSuc(url);
|
|
return RespDTO.onSuc(url);
|
|
} else {
|
|
} else {
|
|
- return RespDTO.onSuc("");
|
|
|
|
|
|
+ return RespDTO.onError("");
|
|
}
|
|
}
|
|
|
|
|
|
//住院 开单合理性
|
|
//住院 开单合理性
|
|
@@ -725,7 +742,7 @@ public class InquiryInfoController {
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&plan=5";
|
|
"&plan=5";
|
|
|
|
|
|
- inputInfo.setRemark("邵逸夫化验开单合理性接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院化验开单合理性接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
|
|
|
|
@@ -743,14 +760,14 @@ public class InquiryInfoController {
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&plan=5";
|
|
"&plan=5";
|
|
|
|
|
|
- inputInfo.setRemark("邵逸夫辅检开单合理性接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院辅检开单合理性接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
return RespDTO.onSuc(url);
|
|
return RespDTO.onSuc(url);
|
|
}
|
|
}
|
|
return RespDTO.onError("未传入当前下达化验辅检套餐名称!");
|
|
return RespDTO.onError("未传入当前下达化验辅检套餐名称!");
|
|
} else {
|
|
} else {
|
|
- return RespDTO.onSuc("");
|
|
|
|
|
|
+ return RespDTO.onError("");
|
|
}
|
|
}
|
|
|
|
|
|
//住院 化验辅检静态知识
|
|
//住院 化验辅检静态知识
|
|
@@ -761,13 +778,13 @@ public class InquiryInfoController {
|
|
|
|
|
|
url = "http://192.1.3.116:5446/index.html?" +
|
|
url = "http://192.1.3.116:5446/index.html?" +
|
|
"mrId=" + mrId + //redis保存产生唯一值
|
|
"mrId=" + mrId + //redis保存产生唯一值
|
|
- "&tipsName=" + URLEncoder.encode(sb3.toString(), "UTF-8") + //静态信息名称(化验项名称、辅捡项名称)
|
|
|
|
- "&tipsType=12" +
|
|
|
|
|
|
+ "&tipsInfoList=" + URLEncoder.encode(sb3.toString(), "UTF-8") + //多个提示信息内容
|
|
"&showTab=1" +
|
|
"&showTab=1" +
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
- "&plan=6";
|
|
|
|
|
|
+ "&plan=6" +
|
|
|
|
+ "&tipsMode=2";
|
|
|
|
|
|
- inputInfo.setRemark("邵逸夫化验静态知识接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院化验静态知识接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
return RespDTO.onSuc(url);
|
|
return RespDTO.onSuc(url);
|
|
@@ -775,21 +792,21 @@ public class InquiryInfoController {
|
|
inputInfo.setRemark("邵逸夫化验静态知识接口");
|
|
inputInfo.setRemark("邵逸夫化验静态知识接口");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
- return RespDTO.onSuc("暂未维护该项目静态知识!");
|
|
|
|
|
|
+ return RespDTO.onError("暂未维护该项目静态知识!");
|
|
}
|
|
}
|
|
} else if (pushJoinVO.getPacsOrder() != null && pushJoinVO.getPacsOrder().size() > 0) {
|
|
} else if (pushJoinVO.getPacsOrder() != null && pushJoinVO.getPacsOrder().size() > 0) {
|
|
- if (!sb3.toString().equals("")) {
|
|
|
|
|
|
+ if (!sb4.toString().equals("")) {
|
|
mrId = mrFacade.createMr(pushJoinVO);
|
|
mrId = mrFacade.createMr(pushJoinVO);
|
|
|
|
|
|
url = "http://192.1.3.116:5446/index.html?" +
|
|
url = "http://192.1.3.116:5446/index.html?" +
|
|
"mrId=" + mrId + //redis保存产生唯一值
|
|
"mrId=" + mrId + //redis保存产生唯一值
|
|
- "&tipsName=" + URLEncoder.encode(sb4.toString(), "UTF-8") + //静态信息名称(化验项名称、辅捡项名称)
|
|
|
|
- "&tipsType=6" +
|
|
|
|
|
|
+ "&tipsInfoList=" + URLEncoder.encode(sb4.toString(), "UTF-8") + //多个提示信息内容
|
|
"&showTab=1" +
|
|
"&showTab=1" +
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
"&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
|
|
- "&plan=6";
|
|
|
|
|
|
+ "&plan=6" +
|
|
|
|
+ "&tipsMode=2";
|
|
|
|
|
|
- inputInfo.setRemark("邵逸夫辅检静态知识接口");
|
|
|
|
|
|
+ inputInfo.setRemark("邵逸夫住院辅检静态知识接口");
|
|
inputInfo.setParamOut(url);
|
|
inputInfo.setParamOut(url);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
return RespDTO.onSuc(url);
|
|
return RespDTO.onSuc(url);
|
|
@@ -797,7 +814,7 @@ public class InquiryInfoController {
|
|
inputInfo.setRemark("邵逸夫辅检静态知识接口");
|
|
inputInfo.setRemark("邵逸夫辅检静态知识接口");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfo.setParamOut("暂未维护该项目静态知识!");
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
inputInfoFacade.saveInputInfo(inputInfo);
|
|
- return RespDTO.onSuc("暂未维护该项目静态知识!");
|
|
|
|
|
|
+ return RespDTO.onError("暂未维护该项目静态知识!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return RespDTO.onError("未传入化验辅检套餐名称!");
|
|
return RespDTO.onError("未传入化验辅检套餐名称!");
|