|
@ -1690,7 +1690,7 @@ public class MonitorPlatformService {
|
|
|
allCountSql += " and ( device_name like '%血压计%' )";
|
|
|
}
|
|
|
}
|
|
|
// allCountSql += " ";
|
|
|
// allCountSql += " ";
|
|
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(area)) {
|
|
|
allCountSql += " and grant_org_code in (SELECT dh.code from wlyy.dm_hospital dh where dh.town ='" + area + "' and dh.del =1 )";
|
|
|
}
|
|
@ -1829,7 +1829,7 @@ public class MonitorPlatformService {
|
|
|
JSONArray resultArr = new JSONArray();
|
|
|
List<Map<String, String>> list = new ArrayList<>();
|
|
|
try {
|
|
|
JSONObject resultObject = getUrl("/open/noLogin/getDeviceList", null);
|
|
|
JSONObject resultObject = getUrl("/open/noLogin/getDeviceList", null, "obj");
|
|
|
resultArr = resultObject.getJSONArray("usedDeviceList");
|
|
|
for (int i = 0; i < resultArr.size(); i++) {
|
|
|
Map<String, String> resultMap = new HashMap<>();
|
|
@ -1865,7 +1865,7 @@ public class MonitorPlatformService {
|
|
|
public Map<String, Object> getMedicinecabinetCount() {
|
|
|
|
|
|
Map resultMap = new HashMap<>();
|
|
|
JSONObject jsonObject = getUrl("/open/noLogin/getDeviceList", null);
|
|
|
JSONObject jsonObject = getUrl("/open/noLogin/getDeviceList", null, "obj");
|
|
|
//设备总数
|
|
|
String total = jsonObject.get("total").toString();
|
|
|
//库存量
|
|
@ -1891,7 +1891,7 @@ public class MonitorPlatformService {
|
|
|
parameterMap.put("day", day);
|
|
|
String content = com.alibaba.fastjson.JSONObject.toJSONString(parameterMap);
|
|
|
String params = AesEncryptUtils.agEncrypt(content);
|
|
|
JSONObject jsonObject = getUrl("/open/noLogin/getDeviceInfo", params);
|
|
|
JSONObject jsonObject = getUrl("/open/noLogin/getDeviceInfo", params, "obj");
|
|
|
|
|
|
//取药列表获取
|
|
|
List<Map> mediicineorderListMap = new ArrayList<>();
|
|
@ -1954,7 +1954,7 @@ public class MonitorPlatformService {
|
|
|
parameterMap.put("day", day);
|
|
|
String content = com.alibaba.fastjson.JSONObject.toJSONString(parameterMap);
|
|
|
String params = AesEncryptUtils.agEncrypt(content);
|
|
|
JSONObject jsonObject = getUrl("/open/noLogin/getDeviceInfo", params);
|
|
|
JSONObject jsonObject = getUrl("/open/noLogin/getDeviceInfo", params, "obj");
|
|
|
|
|
|
//医保曲线
|
|
|
JSONArray yibaoArray = jsonObject.getJSONArray("yibaoList");
|
|
@ -1977,7 +1977,7 @@ public class MonitorPlatformService {
|
|
|
JSONArray resultArr = new JSONArray();
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
try {
|
|
|
JSONObject resultObject = getUrl("/open/noLogin/getDeviceList", null);
|
|
|
JSONObject resultObject = getUrl("/open/noLogin/getDeviceList", null, "obj");
|
|
|
resultArr = resultObject.getJSONArray("usedDeviceList");
|
|
|
for (int i = 0; i < resultArr.size(); i++) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
@ -2005,13 +2005,21 @@ public class MonitorPlatformService {
|
|
|
* 商品状态:未设商品、已有商品
|
|
|
* 货道状态:货道故障、货道关闭、货道正常
|
|
|
* */
|
|
|
public void ygStockDetection(){
|
|
|
|
|
|
public JSONArray ygStockDetection(String id) throws Exception {
|
|
|
//请求药房 获取参数
|
|
|
String url = "/open/noLogin/findMediicinecabinetInventoryByDeviceId";
|
|
|
Map parameterMap = new HashMap<>();
|
|
|
parameterMap.put("deviceId", id);
|
|
|
String content = com.alibaba.fastjson.JSONObject.toJSONString(parameterMap);
|
|
|
String params = AesEncryptUtils.agEncrypt(content);
|
|
|
JSONObject jsonObject = getUrl(url, params, "detailModelList");
|
|
|
JSONArray jsonArray = jsonObject.getJSONArray("obj");
|
|
|
return jsonArray;
|
|
|
}
|
|
|
|
|
|
|
|
|
/*请求接口*/
|
|
|
public JSONObject getUrl(String url, String parame) {
|
|
|
public JSONObject getUrl(String url, String parame, String obj) {
|
|
|
JSONObject resultObj = new JSONObject();
|
|
|
List<Map<String, String>> list = new ArrayList<>();
|
|
|
try {
|
|
@ -2023,11 +2031,17 @@ public class MonitorPlatformService {
|
|
|
if (resultObject.get("status").equals("200")) {
|
|
|
JSONObject jsonObjectData = JSONObject.parseObject(AesEncryptUtils.agDecrypt(resultObject.get("data").toString()));
|
|
|
if (jsonObjectData.get("status").equals(200)) {
|
|
|
resultObj = jsonObjectData.getJSONObject("obj");
|
|
|
if ("obj".equals(obj)) {
|
|
|
resultObj = jsonObjectData.getJSONObject(obj);
|
|
|
}
|
|
|
if ("detailModelList".equals(obj)) {
|
|
|
JSONArray jsonArray = jsonObjectData.getJSONArray(obj);
|
|
|
resultObj.put("obj", jsonArray);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
return resultObj;
|
|
|
} catch (IOException e) {
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
return null;
|
|
|
}
|