Merge branch 'dev' of liubing/wlyy2.0 into dev

common/common-util/src/main/java/com/yihu/jw/util/healthIndex/HealthIndexUtil.java

@@ -55,25 +55,14 @@ public class HealthIndexUtil {
            String value1 = values[0];
            // 餐后
            if (index % 2 == 0) {
                if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueAfter, minValueAfter)) {
                    tmp.put("value1",value1);
                    tmp.put("indexName","血糖");
                    tmp.put("error",true);
                }else {
                    tmp.put("value1",value1);
                    tmp.put("indexName","血糖");
                    tmp.put("error",false);
                }
                tmp.put("value1",value1);
                tmp.put("indexName","血糖");
                tmp.put("error",checkHealthIndex(NumberUtils.toDouble(value1), maxValueAfter, minValueAfter));
            } else { //餐前
                if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueBefore, minValueBefore)) {
                    tmp.put("value1",value1);
                    tmp.put("indexName","血糖");
                    tmp.put("error",true);
                }else {
                    tmp.put("value1",value1);
                    tmp.put("indexName","血糖");
                    tmp.put("error",false);
                }
                tmp.put("value1",value1);
                tmp.put("indexName","血糖");
                tmp.put("error",checkHealthIndex(NumberUtils.toDouble(value1), maxValueBefore, minValueBefore));
            }
            result.add(tmp);
        }
@@ -89,54 +78,30 @@ public class HealthIndexUtil {
            Double maxValueSZY = HEALTH_STANDARD_SZY_MAX;
            Double minValueSZY = HEALTH_STANDARD_SZY_MIN;
            // 收缩压/舒张压校验
            if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueSSY, minValueSSY) ) {
                tmp.put("value1",value1);
                tmp.put("indexName","收缩压");
                tmp.put("error",true);
            }else {
                tmp.put("value1",value1);
                tmp.put("indexName","收缩压");
                tmp.put("error",false);
            }
            tmp.put("value1",value1);
            tmp.put("indexName","收缩压");
            tmp.put("error",checkHealthIndex(NumberUtils.toDouble(value1), maxValueSSY, minValueSSY));
            result.add(tmp);
            //舒张压校验
            tmp = new JSONObject();
            if (!checkHealthIndex(NumberUtils.toDouble(value2), maxValueSZY, minValueSZY)){
                tmp.put("value1",value1);
                tmp.put("indexName","舒张压");
                tmp.put("error",true);
            }else {
                tmp.put("value1",value1);
                tmp.put("indexName","舒张压");
                tmp.put("error",false);
            }
            tmp.put("value1",value1);
            tmp.put("indexName","舒张压");
            tmp.put("error",checkHealthIndex(NumberUtils.toDouble(value2), maxValueSZY, minValueSZY));
            result.add(tmp);
            tmp = new JSONObject();
            //脉搏检验
            if (StringUtils.isNotBlank(value3)){
                if (!checkHealthIndex(NumberUtils.toDouble(value3), HEALTH_STANDARD_HEART_RATE_MAX, HEALTH_STANDARD_HEART_RATE_MIN)){
                    tmp.put("value1",value1);
                    tmp.put("indexName","脉搏");
                    tmp.put("error",true);
                }else {
                    tmp.put("value1",value1);
                    tmp.put("indexName","脉搏");
                    tmp.put("error",false);
                }
                tmp.put("value1",value1);
                tmp.put("indexName","脉搏");
                tmp.put("error",checkHealthIndex(NumberUtils.toDouble(value3), HEALTH_STANDARD_HEART_RATE_MAX, HEALTH_STANDARD_HEART_RATE_MIN));
                result.add(tmp);
            }
        }
        else if (type == 5) {//心率
            String value1 = values[0];//心率
            if (!checkHealthIndex(NumberUtils.toDouble(value1), HEALTH_STANDARD_HEART_RATE_MAX, HEALTH_STANDARD_HEART_RATE_MIN)){
                tmp.put("value1",value1);
                tmp.put("indexName","心率");
                tmp.put("error",true);
            }else {
                tmp.put("value1",value1);
                tmp.put("indexName","心率");
                tmp.put("error",false);
            }
            tmp.put("value1",value1);
            tmp.put("indexName","心率");
            tmp.put("error",checkHealthIndex(NumberUtils.toDouble(value1), HEALTH_STANDARD_HEART_RATE_MAX, HEALTH_STANDARD_HEART_RATE_MIN));
            result.add(tmp);
        }
        return result;
@@ -145,10 +110,14 @@ public class HealthIndexUtil {
    /**
     * 判断当前值是否在区间内
     */
    private boolean checkHealthIndex(Double current, Double max, Double min) {
        if (current > max || current < min || current < 0) {
            return false;
    private Integer checkHealthIndex(Double current, Double max, Double min) {
        if (current > max  ) {
            return 1;//指标过高
        }else if(current < min || current < 0) {
            return -1;//指标过低
        }
        else {//正常
            return 0;
        }
        return true;
    }
}

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

@@ -204,7 +204,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
     */
    @RequestMapping(value = "/membersWithOnLineFlag", method = RequestMethod.GET)
    @ApiOperation(value = "家庭成员查询带是否在线标识")
    public ObjEnvelop getPatientFamilyMembersmembersWithOnLineFlag(@RequestParam(required = false) String patient) {
    public ObjEnvelop membersWithOnLineFlag(@RequestParam(required = false) String patient) {
        try {
            JSONObject data = new JSONObject();
            JSONArray result = new JSONArray();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -494,7 +494,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                }
                obj.put("state", "1");//0 ：未处理；1：已同意；2：已拒绝
                String archive_type = null;
                Integer oneLineFlag =0;
                Integer onLineFlag =0;
                switch (map.get("archive_type").toString()){
                    case "1":
                        archive_type = "older";//老人
@@ -508,11 +508,11 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                    JSONObject oneLineObj = JSONObject.parseObject(onLineStr);
                    if (200 == oneLineObj.getInteger("status")){
                        if (oneLineObj.getInteger("data")>0){
                            oneLineFlag=1;
                            onLineFlag=1;
                        }
                    }
                }
                obj.put("oneLineFlag", oneLineFlag);
                obj.put("onLineFlag", onLineFlag);
                resultArray.add(obj);
            }
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -524,7 +524,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    }
    public List<Map<String,Object>> getServerDoctorAll(String patient,String onlineFlag){
        String sql="select DISTINCT doc.id doctor,CONCAT(doc.`name`,CASE WHEN doc.doctor_level=1 THEN '(社区医生)' ELSE '(助老员)' END) as name,doc.photo,doc.mobile,0 as oneLineFlag\n" +
        String sql="select DISTINCT doc.id doctor,CONCAT(doc.`name`,CASE WHEN doc.doctor_level=1 THEN '(社区医生)' ELSE '(助老员)' END) as name,doc.photo,doc.mobile,0 as onLineFlag\n" +
                "from base_service_package_item item ,base_service_package pack,base_team_member mem,base_doctor doc\n" +
                "where item.service_package_id in (\n" +
                "SELECT spc.service_package_id FROM base_service_package_record spc ,base_service_package_sign_record spsr\n" +
@@ -541,7 +541,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
                    String doctorCode = tmp.get("doctor").toString();
                    if (oneLineInfo.containsKey(doctorCode)){
                        if (oneLineInfo.getInteger(doctorCode)>0){
                            tmp.put("oneLineFlag",1);
                            tmp.put("onLineFlag",1);
                        }
                    }
                }

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

@@ -393,7 +393,7 @@ public class DeviceService {
                    String content_notice = null;
                    for (int i=0;i<errorIndex.size();i++){
                        com.alibaba.fastjson.JSONObject tmp = errorIndex.getJSONObject(i);
                        if (tmp.getBooleanValue("error")){
                        if (1 == tmp.getInteger("error")){
                            content_notice += tmp.getString("indexName"+"、");
                        }
                    }
@@ -477,7 +477,7 @@ public class DeviceService {
                    String content_notice = null;
                    for (int i=0;i<errorIndex.size();i++){
                        com.alibaba.fastjson.JSONObject tmp = errorIndex.getJSONObject(i);
                        if (tmp.getBooleanValue("error")){
                        if (1 == tmp.getInteger("error")){
                            content_notice += tmp.getString("indexName"+"、");
                        }
                    }

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

@@ -160,7 +160,7 @@ public class DeviceUploadService {
                    String content_notice = null;
                    for (int i=0;i<errorIndex.size();i++){
                        com.alibaba.fastjson.JSONObject tmp = errorIndex.getJSONObject(i);
                        if (tmp.getBooleanValue("error")){
                        if (1 == tmp.getInteger("error")){
                            content_notice += tmp.getString("indexName"+"、");
                        }
                    }