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

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

@@ -2004,7 +2004,7 @@ public class FamilyContractService extends BaseService {
        }
        result.put("ssSign",ssArray);
        result.put("jtSign",ssArray);
        result.put("jtSign",jtSign);
        return result;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -853,8 +853,8 @@ public class ConsultController extends WeixinBaseController {
//            }
            JSONObject obj = new JSONObject();
            JSONObject json = new JSONObject();
            json.put("id", obj.getInt("id"));
            if (!obj.getString("from").equals(getUID())) {
                Doctor doc = doctorService.findDoctorByCode(obj.getString("from"));