|
@ -584,7 +584,7 @@ public class AsyncService extends BaseService{
|
|
|
* @param deviceType
|
|
|
*/
|
|
|
@Async
|
|
|
public void addIntegral(String deviceSn,String type,String userType,String patientCode,Integer deviceType){
|
|
|
public void addIntegral(String deviceSn,String type,String userType,String patientCode,Integer deviceType,String uploadTime){
|
|
|
try {
|
|
|
SignFamily signFamily = signFamilyDao.findByPatient(patientCode);
|
|
|
String hospital = "";
|
|
@ -601,7 +601,8 @@ public class AsyncService extends BaseService{
|
|
|
PatientDevice patientDevice = patientDeviceDao.findByDeviceSnAndCategoryCodeAndUserType(deviceSn,type,userType);
|
|
|
boolean dataUoloadCount = true;
|
|
|
if (patientDevice!=null){
|
|
|
String today = DateUtil.getStringDateShort();
|
|
|
//String today = DateUtil.getStringDateShort();
|
|
|
uploadTime = uploadTime.substring(0,10);
|
|
|
/*String startTime = today+" 00:00:00";
|
|
|
String endTime = today+" 23:59:59";
|
|
|
int dateType =1;
|
|
@ -616,10 +617,10 @@ public class AsyncService extends BaseService{
|
|
|
//判断今天是否加过体征积分
|
|
|
String urlSearch = wlyyService + "healthBank/selectByDate";
|
|
|
List<NameValuePair> paramsSearch1 = new ArrayList<>();
|
|
|
paramsSearch1.add(new BasicNameValuePair("objectStr", "{\"taskCode\":\"BP_MEASURE\",\"startTime\":\""+today+"\",\"endTime\":\""+today+"\",\"patientId\":\""+patientCode+"\"}"));
|
|
|
paramsSearch1.add(new BasicNameValuePair("objectStr", "{\"taskCode\":\"BP_MEASURE\",\"startTime\":\""+uploadTime+"\",\"endTime\":\""+uploadTime+"\",\"patientId\":\""+patientCode+"\"}"));
|
|
|
String responseSearch1 = HttpClientUtil.post(urlSearch, paramsSearch1, "UTF-8");
|
|
|
List<NameValuePair> paramsSearch2 = new ArrayList<>();
|
|
|
paramsSearch2.add(new BasicNameValuePair("objectStr", "{\"taskCode\":\"GLU_MEASURE\",\"startTime\":\""+today+"\",\"endTime\":\""+today+"\",\"patientId\":\""+patientCode+"\"}"));
|
|
|
paramsSearch2.add(new BasicNameValuePair("objectStr", "{\"taskCode\":\"GLU_MEASURE\",\"startTime\":\""+uploadTime+"\",\"endTime\":\""+uploadTime+"\",\"patientId\":\""+patientCode+"\"}"));
|
|
|
String responseSearch2 = HttpClientUtil.post(urlSearch, paramsSearch2, "UTF-8");
|
|
|
com.alibaba.fastjson.JSONObject object1 = com.alibaba.fastjson.JSONObject.parseObject(responseSearch1);
|
|
|
com.alibaba.fastjson.JSONObject object2 = com.alibaba.fastjson.JSONObject.parseObject(responseSearch2);
|