代码修改

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);
                        }
                    }
                }