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

common/common-entity/sql/sql记录

@@ -2426,3 +2426,7 @@ CREATE TABLE `base_check_org` (
-- 2022-12-23   ysj
alter table wlyy_outpatient add column is_positive tinyint(1) DEFAULT NULL comment '是否新冠阳性 1是0否';
-- 2022-12-27 ysj wlyy_specialist
alter table wlyy_patient_rehabilitation_plan add column patient_info_code varchar(50) DEFAULT NULL COMMENT '自动下转关联code';
alter table wlyy_patient_rehabilitation_plan add column third_org_code varchar(50) DEFAULT NULL COMMENT '自动下转的医院code';

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

@@ -62,6 +62,9 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
    private Long adminTeamCode;//家签行政团队Id
    private String patientInfoCode;//自动下转关联code wlyy_rehabilitation_patient_info 的code
    private String thirdOrgCode;//自动下转的医院code wlyy_rehabilitation_patient_info的 hospital_code
    @Column(name = "is_verify")
    public String getIsVerify() {
        return isVerify;
@@ -293,4 +296,22 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntity implements S
    public void setAdminTeamCode(Long adminTeamCode) {
        this.adminTeamCode = adminTeamCode;
    }
    @Column(name = "patient_info_code")
    public String getPatientInfoCode() {
        return patientInfoCode;
    }
    public void setPatientInfoCode(String patientInfoCode) {
        this.patientInfoCode = patientInfoCode;
    }
    @Column(name = "third_org_code")
    public String getThirdOrgCode() {
        return thirdOrgCode;
    }
    public void setThirdOrgCode(String thirdOrgCode) {
        this.thirdOrgCode = thirdOrgCode;
    }
}

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

@@ -686,7 +686,6 @@ public class YsDeviceService {
                                 String gbchannel,HttpServletRequest request) throws Exception {
        JSONObject result = new JSONObject();
        MultiValueMap<String,String> param = new LinkedMultiValueMap<>();
        param.add("accessToken",getIotAccessToken(deviceSerial));
        if (StringUtils.isBlank(deviceSerial)){
            if (StringUtils.isNotBlank(patient)){
                List<DevicePatientDevice> devices = patientDeviceDao.findByUserAndCategoryCode(patient,"12");
@@ -695,6 +694,7 @@ public class YsDeviceService {
                }
            }
        }
        param.add("accessToken",getIotAccessToken(deviceSerial));
        if (StringUtils.isNotBlank(deviceSerial)){
            param.add("deviceSerial",deviceSerial);
        }