代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/OnlineContactService.java

@@ -36,6 +36,8 @@ public class OnlineContactService extends BaseJpaService<BasePatientDO, BasePati
    private PatientFamilyMemberService familyMemberService;
    @Autowired
    private ServicePackageService servicePackageService;
    @Autowired
    private BasePatientDao patientDao;
    public JSONObject getOnLineObj(String patient){
        JSONObject obj = new JSONObject();
@@ -140,7 +142,8 @@ public class OnlineContactService extends BaseJpaService<BasePatientDO, BasePati
              tmpObj.put("avatar",tmp.get("photo"));
              tmpObj.put("userType","1");
              tmpObj.put("doctorId",tmp.get("doctor"));
              tmpObj.put("relationName","助老员");
              tmpObj.put("doctorLevel",tmp.get("doctorLevel"));
              tmpObj.put("relationName",null==tmp.get("doctorLevel")?"":"1".equals(tmp.get("doctorLevel").toString())?"社区医生":"助老员");
              doctorResult.add(tmpObj);
          }
        }else {
@@ -167,6 +170,10 @@ public class OnlineContactService extends BaseJpaService<BasePatientDO, BasePati
                for (int i=0;i<participantsTimeArray.size();i++){
                    JSONObject tmpObj = participantsTimeArray.getJSONObject(i);
                    String id =  tmpObj.getString("id");
                    BasePatientDO patientDO = patientDao.findById(id);
                    if (patientDO.getArchiveType()==3){
                        continue;
                    }
                    if (!id.equals(patient)&&familyIds.contains(id)){
                        tmp.put("avatar",tmp.getString("photo"));
                        tmp.put("patientId",id);

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

@@ -663,7 +663,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    public List<Map<String,Object>> getServerDoctorAll(String patient,String onlineFlag,String doctorLevel){
        String sql="SELECT DISTINCT doc.id doctor,doc.name as doctorName,CONCAT(doc.`name`,CASE WHEN doc.doctor_level=1 " +
                " THEN '(社区医生)' ELSE '(助老员)' END) as name,doc.photo,doc.mobile,doc.job_title_name as jobName,doc.job_title_code as job, " +
                " 0 as onLineFlag,org.code,org.name as orgName " +
                " 0 as onLineFlag,org.code,org.name as orgName ,doc.doctor_level doctorLevel " +
                "from base_service_package_sign_record sr,base_service_package_record r,base_team_member m,base_doctor doc, " +
                "base_service_package pack,base_org org " +
                "WHERE sr.patient='"+patient+"' and sr.status=1  and m.team_code = r.team_code and " +