Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/label/PatientLableService.java

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -272,7 +272,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    private String medicareNumber;//医疗保险号
    private Integer archiveStatus;//档案状态【1.未管理 2.死亡 3.正常 4.高危】【必填】
    private Integer archiveType;// 档案类型 1老人 2新生儿
    private Integer archiveType;// 档案类型 1老人 2新生儿 3老人家属
    private String archiveStatusName;
    private String archiveTypeName;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/BaseController.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.base.dict.BaseExceptionDictDO;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import com.yihu.jw.restmodel.exception.dao.BaseExceptionDictDao;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -80,6 +79,24 @@ public class BaseController {
        }
    }
    /**
     * 获取代理人的code
     * 老人亲属
     * @return
     */
    public String getAgentUID() {
        try {
            String userAgent = request.getHeader("userAgent");
            if (StringUtils.isEmpty(userAgent)) {
                userAgent = request.getHeader("User-Agent");
            }
            JSONObject json = new JSONObject(userAgent);
            return json.getString("agent");
        } catch (Exception e) {
            return null;
        }
    }
    /**
     * 获取平台端

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceDetailService.java

@@ -136,6 +136,8 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
		deviceDetail.setOrgName(orgName);
		deviceDetail.setGrantDoctor(doctorCode);
		deviceDetail.setGrantDoctorName(doctorName);
		deviceDetail.setContactStatus(1);
		deviceDetail.setContactStatusTime(new Date());
		if (isBind>0){
			deviceDetail.setIsGrant(1);
			deviceDetail.setIsBinding(1);

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/util/ArtemisPostTest.java

@@ -250,16 +250,16 @@ public class ArtemisPostTest {
//		System.out.println("StringeResult结果示例: "+StringeResult);
//		callPostImgStringApi();
//		getDevice();
		getDevice();
//		getMonitor();
//		subscription_update("980001");
		subscription_update("980002");
		subscription_update("980003");
		subscription_update("980004");
		subscription_update("980005");
		subscription_update("980006");
		subscription_update("980007");
		subscription_update("980008");
//		subscription_update("980002");
//		subscription_update("980003");
//		subscription_update("980004");
//		subscription_update("980005");
//		subscription_update("980006");
//		subscription_update("980007");
//		subscription_update("980008");
//		addDevice("可燃气体探测器","867070036127251",2);
//		addDevice("可燃气体探测器","867070036223175",2);