|
@ -627,19 +627,21 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
|
|
|
}
|
|
|
obj.put("state", "1");//0 :未处理;1:已同意;2:已拒绝
|
|
|
Integer onLineFlag =0;
|
|
|
switch (map.get("archive_type").toString()){
|
|
|
case "1":
|
|
|
//老人
|
|
|
if(map.get("openid")!=null||"1".equals(map.get("on_line")+"")){
|
|
|
onLineFlag=1;
|
|
|
}
|
|
|
break;
|
|
|
case "2":
|
|
|
//新生儿
|
|
|
if(map.get("openid")!=null){
|
|
|
onLineFlag=1;
|
|
|
}
|
|
|
break;
|
|
|
if (map.get("archive_type")!=null&&!StringUtils.isNotBlank(map.get("archive_type").toString())){
|
|
|
switch (map.get("archive_type").toString()){
|
|
|
case "1":
|
|
|
//老人
|
|
|
if(map.get("openid")!=null||"1".equals(map.get("on_line")+"")){
|
|
|
onLineFlag=1;
|
|
|
}
|
|
|
break;
|
|
|
case "2":
|
|
|
//新生儿
|
|
|
if(map.get("openid")!=null){
|
|
|
onLineFlag=1;
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
obj.put("onLineFlag", onLineFlag);
|
|
|
resultArray.add(obj);
|