|
@ -3003,7 +3003,7 @@ public class DsyyEntranceService {
|
|
|
}
|
|
|
WlyyHttpLogDO httpLogDO = new WlyyHttpLogDO();
|
|
|
httpLogDO.setCode("selectEmrInfo");
|
|
|
httpLogDO.setName("查下电子病历");
|
|
|
httpLogDO.setName("查询电子病历");
|
|
|
httpLogDO.setRequest(xml);
|
|
|
httpLogDO.setResponse(response);
|
|
|
httpLogDO.setStatus("1");
|
|
@ -3013,39 +3013,41 @@ public class DsyyEntranceService {
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 查询电子病历
|
|
|
*
|
|
|
* 查询出院小结、门诊病历
|
|
|
* 门诊病历 :JHIDS-USD-HLWMZBL-014 出院小结:JHIDS-USD-HLWCYXJ-013
|
|
|
* @param serverCode
|
|
|
* @param patientId
|
|
|
* @param visitNo
|
|
|
* @return
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
public JSONArray selectReportInfo(String serverCode,String patientId,String visitNo) throws Exception {
|
|
|
String url = "HTTP://10.95.8.41:51221";
|
|
|
String xml = "{\n" +
|
|
|
" \"serverCode\": \""+serverCode+"\",\n" +
|
|
|
" \"sysCode\": \"HLW\",\n" +
|
|
|
" \"pageSize\": \"10\",\n" +
|
|
|
" \"pageNo\": \"1\",\n" +
|
|
|
" \t\"orders\": [\n" +
|
|
|
"\t\n" +
|
|
|
"\t],\n" +
|
|
|
"\t\"condition\": [\n" +
|
|
|
"\t\t{\n" +
|
|
|
"\t\t\t\"column\": \"PATIENT_ID\",\n" +
|
|
|
"\t\t\t\"type\": \"eq\",\n" +
|
|
|
"\t\t\t\"value\": \""+patientId+"\"\n" +
|
|
|
"\t\t},\n" +
|
|
|
" \t{\n" +
|
|
|
"\t\t\t\"column\": \"VISIT_ID\",\n" +
|
|
|
"\t\t\t\"type\": \"eq\",\n" +
|
|
|
"\t\t\t\"value\": \""+visitNo+"\"\n" +
|
|
|
"\t\t}\n" +
|
|
|
"\t]\n" +
|
|
|
"}";
|
|
|
public JSONArray selectReportInfo(String serverCode,String patientId,String visitNo,int page,int size) throws Exception {
|
|
|
String url = "http://10.95.8.41:51225";
|
|
|
JSONObject data = new JSONObject();
|
|
|
JSONArray orders = new JSONArray();
|
|
|
JSONArray condition = new JSONArray();
|
|
|
data.put("serverCode",serverCode);
|
|
|
data.put("sysCode","HLW");
|
|
|
data.put("pageSize",size);
|
|
|
data.put("pageNo",page);
|
|
|
data.put("orders",orders);
|
|
|
JSONObject item = new JSONObject();
|
|
|
if (StringUtils.isNoneBlank(patientId)){
|
|
|
item.put("column","PATIENT_ID");
|
|
|
item.put("type","eq");
|
|
|
item.put("value",patientId);
|
|
|
condition.add(item);
|
|
|
}
|
|
|
if (StringUtils.isNoneBlank(visitNo)){
|
|
|
item.put("column","VISIT_NO");
|
|
|
item.put("type","eq");
|
|
|
item.put("value",visitNo);
|
|
|
condition.add(item);
|
|
|
}
|
|
|
data.put("condition",condition);
|
|
|
String xml = data.toJSONString();
|
|
|
logger.info("xml"+xml);
|
|
|
String response = httpClientUtil.postHeadBodyText(url,xml);
|
|
|
String response = httpClientUtil.postHeadBodyText2(url,xml);
|
|
|
logger.info("response===="+response);
|
|
|
JSONArray jsonArray =new JSONArray();
|
|
|
Object json = JSON.parse(response);
|
|
@ -3057,19 +3059,12 @@ public class DsyyEntranceService {
|
|
|
} else if (json instanceof JSONArray) {
|
|
|
JSONArray array = (JSONArray) json;
|
|
|
array = JSONArray.parseArray(response);
|
|
|
for (int i=0;i<array.size();i++){
|
|
|
JSONObject object = array.getJSONObject(i);
|
|
|
String EMRPDF=object.getString("EMRPDF");
|
|
|
byte[] emrByte = Base64.decodeBase64(EMRPDF);
|
|
|
String emrDecode = new String(emrByte, "GBK");
|
|
|
object.put("EMRPDFHTMl", emrDecode);
|
|
|
}
|
|
|
jsonArray = array;
|
|
|
|
|
|
}
|
|
|
WlyyHttpLogDO httpLogDO = new WlyyHttpLogDO();
|
|
|
httpLogDO.setCode("selectEmrInfo");
|
|
|
httpLogDO.setName("查下电子病历");
|
|
|
httpLogDO.setCode(serverCode);
|
|
|
httpLogDO.setName(serverCode);
|
|
|
httpLogDO.setRequest(xml);
|
|
|
httpLogDO.setResponse(response);
|
|
|
httpLogDO.setStatus("1");
|
|
@ -3078,6 +3073,9 @@ public class DsyyEntranceService {
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 检验报告列表接口
|
|
|
*
|
|
@ -3110,13 +3108,13 @@ public class DsyyEntranceService {
|
|
|
}
|
|
|
if (StringUtils.isNoneBlank(startTime)){
|
|
|
item.put("column","startTime");
|
|
|
item.put("type","eq");
|
|
|
item.put("type","ge");
|
|
|
item.put("value",startTime);
|
|
|
condition.add(item);
|
|
|
}
|
|
|
if (StringUtils.isNoneBlank(endTime)){
|
|
|
item.put("column","endTime");
|
|
|
item.put("type","eq");
|
|
|
item.put("type","le");
|
|
|
item.put("value",endTime);
|
|
|
condition.add(item);
|
|
|
}
|
|
@ -3187,13 +3185,13 @@ public class DsyyEntranceService {
|
|
|
}
|
|
|
if (StringUtils.isNoneBlank(startTime)){
|
|
|
item.put("column","startTime");
|
|
|
item.put("type","eq");
|
|
|
item.put("type","ge");
|
|
|
item.put("value",startTime);
|
|
|
condition.add(item);
|
|
|
}
|
|
|
if (StringUtils.isNoneBlank(endTime)){
|
|
|
item.put("column","endTime");
|
|
|
item.put("type","eq");
|
|
|
item.put("type","le");
|
|
|
item.put("value",endTime);
|
|
|
condition.add(item);
|
|
|
}
|