Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -521,6 +521,7 @@ public class SignWebService extends BaseService {
        object.put("code",doctor.getCode());
        object.put("jobName",doctor.getJobName());
        object.put("name",doctor.getName());
        object.put("evaluateScore",doctor.getEvaluateScore());
        object.put("photo",doctor.getPhoto());
        object.put("sex",doctor.getSex());
        object.put("hospitalName",doctor.getHospitalName());
@@ -693,9 +694,9 @@ public class SignWebService extends BaseService {
            String value = map.get(key)+"";
            if("is_read".equals(key)){
                if("1".equals(value)){
                    resultObject.put("status_name","已完成");
                    resultObject.put("status_name","未读");
                }else{
                    resultObject.put("status_name","进行中");
                    resultObject.put("status_name","已读");
                }
            }
            resultObject.put(key,value);
@@ -709,9 +710,9 @@ public class SignWebService extends BaseService {
            String value = map.get(key)+"";
            if("read_status".equals(key)){
                if("1".equals(value)){
                    resultObject.put("status_name","已完成");
                    resultObject.put("status_name","已读");
                }else{
                    resultObject.put("status_name","进行中");
                    resultObject.put("status_name","未读");
                }
            }
            resultObject.put(key,value);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1033,6 +1033,7 @@ public class DoctorController extends BaseController {
                    json.put("hospital", doctor.getHospital());
                    json.put("hospitalName", doctor.getHospitalName());
                    json.put("dept", doctor.getDept());
                    json.put("evaluateScore", doctor.getEvaluateScore());
                    json.put("deptName", doctor.getDeptName());
                    array.put(json);
                }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalWithoutFilterController.java

@@ -65,6 +65,7 @@ public class HospitalWithoutFilterController extends BaseController {
                    json.put("jobName", doctor.getJobName());
                    json.put("hospital", doctor.getHospital());
                    json.put("hospitalName", doctor.getHospitalName());
                    json.put("evaluateScore", doctor.getEvaluateScore());
                    json.put("dept", doctor.getDept());
                    json.put("deptName", doctor.getDeptName());
                    array.put(json);