Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -976,7 +976,7 @@ public class PatientDeviceService extends BaseService {
                    if(StringUtils.isNotBlank(type)){
                        //根据icd10过滤数据
                        String icdCode = item.optString("DIAGNOSIS");
                        String icdCode = item.optString("ICD_CODE");
                        String icd10 = icd10DictServcie.getHealthProblemsByIcd10Code(icdCode);
                        if(StringUtils.isNotBlank(icd10)){
                            com.alibaba.fastjson.JSONObject icd = com.alibaba.fastjson.JSONObject.parseObject(icd10);